0
Commit Graph

43 Commits

Author SHA1 Message Date
Andrew Brown
d1f13cadc5 Revert "Picks the right protocal based on what is being used. This fixes ssl errors on sites that use https."
Reason: breaks local viewing. Tries to access file://maps.google.com
etc.

This reverts commit da663dadb3.
2012-02-25 19:23:47 -05:00
Lucas Hereld
da663dadb3 Picks the right protocal based on what is being used. This fixes ssl errors on sites that use https. 2012-02-23 11:46:26 -08:00
Andrew Chin
19fcee24f7 Split up overviewer.js into several files 2012-02-08 21:07:53 -05:00
Aaron Griffith
302e1d592a Merge branch 'master' into rewrite 2012-02-06 21:41:11 -05:00
Andrew Chin
728351f9a3 Display the coord box on index.html 2012-01-16 19:50:50 -05:00
Andrew Chin
514e99dcd2 overviewer.js now uses backbone.js for much of it's multiworld handling 2012-01-14 23:33:34 -05:00
Carter Charbonneau
2003267f35 optimize the images used in the UI an otherwise bundled 2012-01-11 22:35:01 -07:00
Andrew Chin
9f6a4ee698 More updates to overviewer.js 2012-01-08 15:12:40 -05:00
Andrew Chin
4255b26fc7 Fixed some crashes in assetManager
Copy in the rest of the web assets
2012-01-07 23:56:08 -05:00
Andrew Chin
25db39463f The AssetManager will now create a kinda working html output 2012-01-07 23:04:42 -05:00
Aaron Griffith
d0032ac9ff Merge remote-tracking branch 'ion1/master' 2011-12-30 13:22:54 -05:00
Andrew Brown
e5fed90d04 fixed up comments in googlemap.py, moved region.js to web_assets 2011-12-17 21:49:08 -05:00
Aaron Griffith
6fb96ca8ab fixed crash when strftime returns non-ascii characters
also generally better unicode handling on web_assets (all files are UTF-8)
2011-12-16 19:48:46 -05:00
Johan Kiviniemi
abf643e3ae Switch to autoupdated cacheTag from constant cacheMinutes 2011-12-13 19:24:41 +02:00
Alex Headley
350cc70749 add proper title to generated html 2011-12-07 11:17:39 -05:00
Aaron Griffith
92b8cd33ed Merge branch 'master' into smooth-lighting 2011-10-28 13:07:01 -04:00
Andrew Chin
02c30c6f8e Update URL hash on double-click 2011-10-26 23:06:52 -04:00
Aaron Griffith
4fb0dac3fd the position anchor tag now uses rendermode name, not label 2011-10-26 17:08:35 -04:00
Zach McCullough
d77673f406 Fixed the tabbing in overviewerConfig.js 2011-10-24 19:16:03 -05:00
Andrew Brown
e61291de4f changed reference url in overviewerConfig comments 2011-10-19 19:20:11 -04:00
Michael Writhe
73ace48c71 comment clarity to alleviate confusion regarding cacheMinutes. 2011-10-19 16:46:01 -06:00
Michael Writhe
67dd795e60 issue #513, fixed spelling of color vs colour. >_< canadian spelling. 2011-10-12 15:24:28 -06:00
Aaron Griffith
e7e0f526ea renamed "Signposts" button to "Markers" to be more generic 2011-10-10 15:17:11 -04:00
Andrew Chin
4e86d38b23 Removed extra comma. Fixes #496 2011-09-22 11:20:33 -04:00
Ryan Rector
b442e7704e Merge remote-tracking branch 'upstream/master' into configurable-north 2011-08-13 10:58:22 -06:00
Andrew Chin
f5399b78cc Made searchbox text gray if inactive 2011-08-05 09:18:14 -04:00
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