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

5563 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
bc1b4d53e3 Use the OSM map marker icons on the home page 2012-11-20 21:52:40 +00:00
Tom Hughes
a0c9cc7d0a Use the OSM map marker icons when adding a new diary entry 2012-11-20 21:48:50 +00:00
Tom Hughes
1ffb6d2687 Make vendored asset definitions consistent 2012-11-20 21:24:03 +00:00
Tom Hughes
fd6abf41bf Get the notes tests working again 2012-11-20 21:05:26 +00:00
Tom Hughes
129d505d91 Fix formatting of comments in the notes RSS feed 2012-11-20 21:01:59 +00:00
Tom Hughes
7599f98957 Merge branch 'master' into notes 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/common.css.scss
	app/helpers/application_helper.rb
 2012-11-20 19:08:30 +00:00
Tom Hughes
bd8713f42b Update Potlatch 2 to 2.3-534-g63a3364 build 2012-11-20 18:59:36 +00:00
Tom Hughes
115341f7ae Potlatch 2 localisation updates 2012-11-20 18:59:05 +00:00
Siebrand Mazeland
de1988d2cc Localisation updates from http://translatewiki.net. 2012-11-20 12:49:40 +00:00
Siebrand Mazeland
735af4cd2b Localisation updates from http://translatewiki.net. 2012-11-20 12:06:12 +00:00
Tom Hughes
d68368e0d5 Rework RTL handling to keep rules together 2012-11-19 10:39:30 +00:00
Tom Hughes
6f9ad2eab6 Fix rendering of PanZoom control in RTL mode 2012-11-18 19:20:53 +00:00
Tom Hughes
2cecfa7d01 Configure CORS to allow GET and POST to /oauth 2012-11-16 22:28:52 +00:00
Tom Hughes
1c5db113e2 Always use the canonical host name in diary RSS feeds 2012-11-16 17:03:48 +00:00
Tom Hughes
44528ffe0f Don't use hard coded value in "one" pluralization rule 
French uses the "one" rule for zero as well as one (if there is no
explicit zero rule) so make sure we use %{count} there.

Also made the same change to English, and added an explcit zero rul.
 2012-11-15 15:22:56 +00:00
Tom Hughes
7ffd7f10ff Updated Potlatch 2 to 2.3-529-g5446b49 build 2012-11-13 15:32:16 +00:00
Tom Hughes
0472e6cad4 Only call force_encoding on ruby 1.9 2012-11-12 20:19:07 +00:00
Tom Hughes
461e39f4a5 Fix bogus test 2012-11-12 19:27:09 +00:00
Tom Hughes
9bc3196dee Monkey patch field_changed? support until CPK is updated 2012-11-12 19:15:20 +00:00
Tom Hughes
dee70e8daa Update to rails 3.2.9 2012-11-12 19:13:54 +00:00
Eric Theise
789e0dffd0 Fixing typo and outdated information 2012-11-12 09:47:17 +00:00
Tom Hughes
ec6f14df0c Use counter caches to improve spam scoring 
Now that we have the counter caches we can take all edits and traces
into account without incurring the cost of having to scan the database
to count them all.
 2012-11-12 09:39:44 +00:00
Tom Hughes
4cf82d1baa Fix interpolation variables 2012-11-10 19:52:30 +00:00
Tom Hughes
f15c5a3647 Update Potlatch 2 to 2.3-515-gd4558d1 build 2012-11-10 19:43:54 +00:00
Tom Hughes
0f9e1fa05e Potlatch 2 localisation updates 2012-11-10 19:43:18 +00:00
Eric Theise
72eb395e1d Fixing two typos 2012-11-10 19:29:20 +00:00
John Firebaugh
078da130b7 Update Leaflet 2012-11-09 16:01:29 -08:00
John Firebaugh
9bd48640ad Move popup anchor definition to icon 2012-11-09 15:57:31 -08:00
John Firebaugh
f913b7d8a5 Use nicer markers 2012-11-09 13:31:29 -08:00
John Firebaugh
f4c64084a6 Update leaflet.locationfilter 2012-11-09 13:13:56 -08:00
John Firebaugh
5b42c683f5 Don't zoom map when enabling location filter 2012-11-09 13:13:44 -08:00
John Firebaugh
ed84516db2 Fix user popup styles 2012-11-09 12:59:31 -08:00
John Firebaugh
1927bc6ca8 Fix user map icon and offset 2012-11-09 12:59:31 -08:00
John Firebaugh
648f232596 Inline map.js marker functions 2012-11-09 12:59:31 -08:00
John Firebaugh
a457189880 Update leaflet.osm.js 2012-11-09 12:59:30 -08:00
John Firebaugh
43bfebdd9e Use leaflet css for print 2012-11-09 12:59:30 -08:00
John Firebaugh
753c179085 Update some print styles for Leaflet 2012-11-09 12:59:30 -08:00
John Firebaugh
66f0a4da04 Fix L.Icon.Default.imagePath in production 2012-11-09 12:59:30 -08:00
John Firebaugh
eefc0b5a0d Fix bbox params on browse area links 2012-11-09 12:59:30 -08:00
John Firebaugh
cc7753896c Move non-vendor leaflet assets into app 2012-11-09 12:59:30 -08:00
John Firebaugh
8435b1bf60 Remove OL SimpleLayerSwitcher 
Consensus was to use the default Leaflet layer switcher
and rather than port SimpleLayerSwitcher to Leaflet.
 2012-11-09 12:59:30 -08:00
John Firebaugh
39006baf33 Fix left pan button position in RTL 2012-11-09 12:59:29 -08:00
John Firebaugh
3e2e62b123 Fix zoom control positioning 2012-11-09 12:59:29 -08:00
Saman Bemel-Benrud
5f8047991b properly positioned leaflet controls and removed old open layers style rules. 2012-11-09 12:59:29 -08:00
John Firebaugh
e6afda8764 Update Leaflet 2012-11-09 12:59:29 -08:00
John Firebaugh
cd28b8dac5 Match pan/zoom control style better 
Thanks @ajashton
 2012-11-09 12:59:29 -08:00
John Firebaugh
378d08f2c9 Update leaflet.locationfilter 2012-11-09 12:59:29 -08:00
John Firebaugh
6054eea238 Bundle leaflet css in a single asset 2012-11-09 12:59:29 -08:00
John Firebaugh
915fca8862 Add Vendorfile 
See https://github.com/grosser/vendorer
 2012-11-09 12:59:29 -08:00
John Firebaugh
6f793e1b21 Pan/zoom controls that look like the OL ones 2012-11-09 12:59:28 -08:00