Commit Graph
117 Commits
Author SHA1 Message Date
CounterPillow 3e4b7b4cd7 Added title field for sign search box, added default value which sets to nothing when focussed and resets when box is empty and blured. 2011-08-05 13:38:09 +02:00
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
Aaron Griffith 30a8b851b6 added separate 'zoomLevels' JS config var for marker positioning use (closes #401) 2011-07-31 12:50:41 -04:00
but2002 154cd2c1fd The "querypos" marker that appears when linked to a location on the map will be removable by a click. 2011-07-29 17:23:33 -05:00
Aaron Griffith ef6ad96080 fixed region group handling to actually use matcher, and to show non-matched regions 2011-07-22 08:19:18 -04:00
Aaron Griffith f7015396ab added options to overviewerConfig.js for search box, coords box, overlay menu 2011-07-14 23:07:32 -04:00
Andrew Chin 173e662457 Adding ?debug=1 to a map URL enables debug mode 2011-07-14 22:22:58 -04:00
Aaron Griffith fde647bfdf Merge branch 'py-package'
Conflicts:
	setup.py
2011-07-10 18:14:20 -04:00
Aaron Griffith 71bd38a8aa Merge branch 'master' into py-package
Conflicts:
	overviewer_core/googlemap.py
2011-06-08 15:59:09 -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 e84ef2c1d2 Merge branch 'master' into py-package
Conflicts:
	overviewerConfig.js
	overviewer_core/data/overviewerConfig.js
	setup.py
	web_assets/overviewerConfig.js
2011-05-13 21:37:35 -04:00
Aaron Griffith e64af5baef Merge branch 'master' into py-package 2011-05-12 19:21:46 -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 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