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
Tom Hughes
52611a5bfa Merge branch 'master' into notes 2013-04-16 18:22:47 +01:00
Saman Bemel-Benrud
7614534bdb Diary cleanup 
This commit includes a few basic changes to make the user diaries
friendlier and easier to read. I adjusted the text styles and added
a maximum width, to keep the line length under control.
 2013-04-14 17:26:27 +01:00
Siebrand Mazeland
466af52ca4 Localisation updates from http://translatewiki.net. 2013-04-14 11:59:21 +00:00
Tom Hughes
7f598ab412 Merge branch 'master' into notes 
Conflicts:
	Gemfile.lock
	app/views/diary_entry/list.html.erb
 2013-04-08 22:34:37 +01:00
Tom Hughes
979822f697 Add a "Hide" button to notes when viewed by moderators 2013-04-08 22:32:20 +01:00
Tom Hughes
4b669ec1ae Return an updated copy of the note from the delete call 2013-04-08 22:00:26 +01:00
Tom Hughes
030bb31ec1 Allow a comment to be supplied when hiding a note 2013-04-08 21:29:41 +01:00
Tom Hughes
f4b599e8fd Restriction note deletion to moderators 2013-04-08 21:21:31 +01:00
Tom Hughes
22760a3cc8 Update Potlatch 2 to 2.3-584-g996bb4d build 2013-04-08 10:36:10 +01:00
Tom Hughes
c9ec4895ea Fix next/previous links on diary pages properly 2013-04-07 23:09:19 +01:00
Tom Hughes
8baddcb26c Correct next/previous links on diary list page 2013-04-07 18:41:00 +01:00
Siebrand Mazeland
f48d3f9736 Localisation updates from http://translatewiki.net. 2013-04-07 10:41:38 +00:00
Matt Amos
3822e8de77 Added database, API and GPX status to capabilities. 2013-04-02 15:05:20 +01:00
Tom Hughes
10a7e1a5f0 Update bundle 2013-04-01 14:40:52 +01:00
Siebrand Mazeland
93b1a8e1d6 Localisation updates from http://translatewiki.net. 2013-04-01 14:18:21 +01:00
Tom Hughes
0defbf60e6 Mark CORS responses as uncacheable 2013-04-01 14:18:21 +01:00
Tom Hughes
f1a325684d Wait until after rails has initialise I18n to preload the resources 2013-04-01 14:18:21 +01:00
Tom Hughes
7bb267caec Force translations to be preloaded during startup 2013-04-01 14:18:21 +01:00
Tom Hughes
b92a2de9ec Use changeset and user caches in Changeset#download 2013-04-01 14:18:21 +01:00
Tom Hughes
e6a1003509 Avoid reading nodes twice in WayController#full 2013-04-01 14:18:21 +01:00
Tom Hughes
369d5a0bfd Optimise database reads in DiaryEntry#list 2013-04-01 14:18:21 +01:00
Tom Hughes
4fd89f9f23 Improve selection logic in DiaryEntry#rss 2013-04-01 14:18:21 +01:00
Tom Hughes
8ed6d80b0d Reimplement User#is_friends_with? in a non-insane way 2013-04-01 14:18:21 +01:00
Tom Hughes
a5121f8910 Preload sender/recipient details for messages 2013-04-01 14:18:20 +01:00
Siebrand Mazeland
5a7b0fac98 Localisation updates from http://translatewiki.net. 2013-04-01 14:18:20 +01:00
Tom Hughes
97e0d5ad1f Add a new write_notes permission needed for OAuth access to notes 2013-03-28 18:50:18 +00:00
Tom Hughes
544113affa Test that closing and deleting notes require authentication 2013-03-28 15:58:03 +00:00
Tom Hughes
0a4b860480 Focus on the text field when a note is opened 2013-03-28 15:12:53 +00:00
Tom Hughes
d00994d151 Fix display of updates on newly loaded notes 2013-03-28 14:43:07 +00:00
Tom Hughes
84f7d322d0 Don't try and use OAuth if we don't have a token 2013-03-28 14:29:38 +00:00
Tom Hughes
00a4d9fe49 Tidy up javascript OAuth code 2013-03-28 11:18:58 +00:00
Tom Hughes
15be6b3ffc Add missing padding at right hand end of greeting menu 2013-03-28 00:40:07 +00:00
Tom Hughes
898cc828dd Merge branch 'master' into notes 
Conflicts:
	Gemfile.lock
 2013-03-28 00:36:07 +00:00
Tom Hughes
38255f9f8d Use OAuth for notes API calls and require authentication to close 2013-03-28 00:34:23 +00:00
Tom Hughes
e8d32637c1 Add javascript OAuth support 2013-03-28 00:34:09 +00:00
Tom Hughes
d53bbe53f4 Mark CORS responses as uncacheable 2013-03-25 21:50:26 +00:00
Tom Hughes
30f8e412bc Wait until after rails has initialise I18n to preload the resources 2013-03-25 12:50:18 +00:00
Tom Hughes
652b09b4d1 Force translations to be preloaded during startup 2013-03-25 10:49:58 +00:00
Tom Hughes
78e8828741 Use changeset and user caches in Changeset#download 2013-03-24 09:52:03 +00:00
Tom Hughes
6300fa2a4f Avoid reading nodes twice in WayController#full 2013-03-24 09:52:03 +00:00
Tom Hughes
9717b81a47 Optimise database reads in DiaryEntry#list 2013-03-24 09:52:03 +00:00
Tom Hughes
9d23b0d00c Improve selection logic in DiaryEntry#rss 2013-03-24 09:52:03 +00:00
Tom Hughes
abd29001a3 Reimplement User#is_friends_with? in a non-insane way 2013-03-24 09:52:03 +00:00
Tom Hughes
3a06235b02 Preload sender/recipient details for messages 2013-03-24 09:52:03 +00:00
Tom Hughes
471bc10c0c Lock iconv to version 0.1 as later ones need ruby 1.9 2013-03-24 09:52:00 +00:00
Siebrand Mazeland
9b1c869995 Localisation updates from http://translatewiki.net. 2013-03-18 00:53:42 +00:00
Siebrand Mazeland
0935978414 Localisation updates from http://translatewiki.net. 2013-03-11 04:56:47 +00:00
Siebrand Mazeland
cda5009e17 Localisation updates from http://translatewiki.net. 2013-03-04 11:46:14 +00:00
Eric Theise
dce2bb9a54 Extend geocoder to support additional lat/lon formats 2013-03-03 19:39:53 +00:00
Tom Hughes
b2721f3207 Map Serbian locales to Potlatch 2 correctly 2013-02-25 09:58:45 +00:00