cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5373 commits 4 branches 1 tag 499 MiB
Commit graph

5373 commits

This branch
This branch
All branches
Author SHA1 Message Date
Paweł Paprota
bdc536d126 Autofocus the search field on the index page 2012-12-13 19:16:41 +00:00
Tom Hughes
00548468ac Remove unused permalink styles 2012-12-13 19:12:07 +00:00
Siebrand Mazeland
780bf71fe5 Localisation updates from http://translatewiki.net. 2012-12-08 18:48:40 +00:00
Tom Hughes
ee530d8111 Don't try and add a note when the control is disabled 2012-12-04 14:31:08 +00:00
Tom Hughes
0d11ad7415 Style disabled permalinks appropriately 2012-12-04 14:29:42 +00:00
Tom Hughes
37bf8e2f6e Update Potlatch 2 to 2.3-547-g4a8c109 build 2012-12-03 14:58:44 +00:00
Tom Hughes
b4abc4ca17 Potlatch 2 localisation updates 2012-12-03 14:58:43 +00:00
Tom Hughes
31a031be26 Convert author_ip to a proper INET field 2012-12-03 14:50:55 +00:00
Tom Hughes
c533fb4b74 Display formatted notes in the web UI 2012-12-03 14:50:55 +00:00
Tom Hughes
2ddd667910 Return note comments as formatted HTML as well as text 2012-12-03 14:50:55 +00:00
Tom Hughes
c3cb1de73e Format note comments correctly in the data browser 2012-12-03 14:50:55 +00:00
Tom Hughes
dbc523bf34 Link user names to their pages 2012-12-03 14:50:54 +00:00
Tom Hughes
9477d7a65e Include a user URL in JSON and XML responses 2012-12-03 14:50:54 +00:00
Tom Hughes
ba5107ebb5 Remove the author_name field from notes 2012-12-03 14:50:54 +00:00
Tom Hughes
7ec003dd01 Abort any existing load before starting a new one 2012-12-02 15:04:19 +00:00
Tom Hughes
7f89545b2c Police the MAX_NOTE_REQUEST_AREA limit on the client 2012-12-02 14:55:56 +00:00
Tom Hughes
146e9877e5 Make sure popups don't overlay controls or the top bar 2012-12-02 14:14:17 +00:00
Tom Hughes
98475075c7 Add a scrollbar when a note gets too big 2012-12-02 14:14:16 +00:00
Tom Hughes
de78176e04 Rework notes UI using leaflet 2012-12-02 14:13:54 +00:00
Siebrand Mazeland
cd05e1892b Localisation updates from http://translatewiki.net. 2012-12-01 19:43:57 +00:00
Tom Hughes
78f608b114 Merge branch 'master' into notes 
Conflicts:
	app/assets/javascripts/browse.js
	app/assets/javascripts/map.js.erb
	app/assets/stylesheets/common.css.scss
	app/views/site/index.html.erb
 2012-12-01 18:22:30 +00:00
Tom Hughes
5fe5777a58 Move caching of reverse geocodes to describe_location 2012-12-01 18:18:10 +00:00
Kai Krueger
0a3aba7f89 Remove nearby_place from the note model 
Instead of storing the auto-generated meta information nearby_place
in the database, just look up the information on the fly when needed
and cache it for performance.
 2012-12-01 18:18:09 +00:00
Tom Hughes
9dfb2729ab Revert "Use Redcarpet::Render::XHTML instead of our custom renderer" 
This reverts commit 4bb95b3773.
 2012-11-29 22:22:22 +00:00
Tom Hughes
d3b2a12266 Don't try and compile the (non-existent) openlayers theme 2012-11-29 21:29:40 +00:00
Tom Hughes
4bb95b3773 Use Redcarpet::Render::XHTML instead of our custom renderer 
Now that my :link_attributes patch has been merged we don't need
the custom renderer to add the rel=nofollow attributes.
 2012-11-29 18:59:43 +00:00
John Firebaugh
394dcd7316 Avoid multiple click bindings on data layer 2012-11-29 18:31:17 +00:00
John Firebaugh
6255c96130 Use jQuery chaining 2012-11-29 18:29:50 +00:00
John Firebaugh
05eba79008 Move "Browse Map Data" to layers control 
Fixes https://trac.openstreetmap.org/ticket/4680
 2012-11-29 18:23:41 +00:00
John Firebaugh
fde2744f74 Sort changeset rectangles by size 
This should help make more changesets accessible on the
map, without requiring precision cursor placement on the
changeset boundary (#169).
 2012-11-29 05:50:03 -08:00
Tom Hughes
6041012cd7 Update Potlatch 2 to 2.3-538-gb4f7198 build 2012-11-27 09:40:19 +00:00
Tom Hughes
593e3af303 Potlatch 2 localisation updates 2012-11-27 09:39:22 +00:00
Siebrand Mazeland
a65efc1927 Localisation updates from http://translatewiki.net. 2012-11-26 08:18:45 +00:00
Tom Hughes
08283b9a33 Change map placement in small screen mode 
This mirrors the way the map is now handled in large screen mode, and
makes it display properly in the Android browser.
 2012-11-25 18:36:55 +00:00
John Firebaugh
3758930e18 Fix "Edit Area" remote control link 
Fixes https://trac.openstreetmap.org/ticket/4699
 2012-11-25 17:36:48 +00:00
Tom Hughes
7a334bd3fe Hide +/- signs, take three 2012-11-24 14:13:58 +00:00
Tom Hughes
d9352f16a8 Set the z-index on the top bar to keep it in front 2012-11-23 19:38:55 +00:00
Tom Hughes
f978642a58 Revert "Stop the map overlapping the top bar" 
This reverts commit 2ef2d7c876.
 2012-11-23 19:36:56 +00:00
Tom Hughes
8e27c78d3c Fall back to the mapnik layer 
If there are no known layers in the layers string, then fall back to
showing the standard mapnik layer.
 2012-11-23 19:00:51 +00:00
Tom Hughes
dc0ada9515 Set size and anchor position for embedded markers 2012-11-23 17:57:47 +00:00
Tom Hughes
3d40181f87 Improve hiding of text on zoom icons 2012-11-23 15:26:00 +00:00
Tom Hughes
31a6d20728 Set icon paths for markers on the embedded map 2012-11-23 15:06:13 +00:00
Tom Hughes
af35527c72 Add missing units 2012-11-23 15:00:04 +00:00
Tom Hughes
e951c6b4b0 Stop active link boxes appearing on the zoom in/out icons 2012-11-23 14:58:10 +00:00
Tom Hughes
4a26107560 Stop spurious +/- signs appearing in the zoom slider 2012-11-23 14:57:54 +00:00
Tom Hughes
8f079fe4ea Revert "Stop spurious +/- signs appearing in the zoom slider" 
This reverts commit 5edb4bf4e5.
 2012-11-23 14:56:44 +00:00
Tom Hughes
5edb4bf4e5 Stop spurious +/- signs appearing in the zoom slider 2012-11-23 14:50:39 +00:00
Tom Hughes
799b6d4cc7 Update the leaflet zoom slider plugin to fix IE8 2012-11-23 13:12:51 +00:00
Tom Hughes
2ef2d7c876 Stop the map overlapping the top bar 2012-11-23 12:23:38 +00:00
Tom Hughes
7d92ec7047 Merge branch 'leaflet' 2012-11-23 10:41:45 +00:00