Ryan Rector
|
4ee15e8f44
|
Code cleanup to simplify upstream merge
|
2011-08-04 12:49:49 -06:00 |
|
Ryan Rector
|
1b25f187ff
|
Merge remote-tracking branch 'upstream/master' into configurable-north
|
2011-08-03 20:41:09 -06:00 |
|
but2002
|
5e10ff1a30
|
Fixed indentation style to match the rest of the code.
|
2011-07-31 17:41:57 -05:00 |
|
but2002
|
3ccb188a11
|
Fixed an error in my original change, moved code to original location.
|
2011-07-31 17:39:56 -05:00 |
|
but2002
|
f36cb98911
|
Fixed undefined variable.
|
2011-07-31 17:37:59 -05:00 |
|
Aaron Griffith
|
30a8b851b6
|
added separate 'zoomLevels' JS config var for marker positioning use (closes #401)
|
2011-07-31 12:50:41 -04:00 |
|
Aaron Griffith
|
ebd3497a5f
|
made forcerender and regionlist work together (closes #444)
|
2011-07-31 12:50:41 -04:00 |
|
Aaron Griffith
|
fde647bfdf
|
Merge branch 'py-package'
Conflicts:
setup.py
|
2011-07-10 18:14:20 -04:00 |
|
Aaron Griffith
|
c10074e87f
|
Merge branch 'master' into py-package
|
2011-06-04 20:05:31 -04:00 |
|
Aaron Griffith
|
2b7fce9bce
|
Merge branch 'master' into py-package
|
2011-05-28 15:15:06 -04:00 |
|
Aaron Griffith
|
383b01859f
|
Merge branch 'master' into py-package
Conflicts:
overviewer_core/data/config.js
overviewer_core/data/web_assets/functions.js
overviewer_core/data/web_assets/style.css
setup.py
web_assets/overviewer.css
web_assets/style.css
|
2011-05-10 20:19:10 -04:00 |
|
Aaron Griffith
|
299f15a312
|
Merge branch 'dtt-c-render' into py-package
|
2011-04-13 02:42:22 -04:00 |
|
Aaron Griffith
|
115c36ad5e
|
Merge branch 'dtt-c-render' into py-package
Conflicts:
overviewer.py
|
2011-04-01 22:00:45 -04:00 |
|
Aaron Griffith
|
42596416d9
|
sdist and install now work
next step is using a custom data dir, and falling back on the package
data dir. Also, fixing --version.
|
2011-03-29 13:49:50 -04:00 |
|