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

1836 commits

Author SHA1 Message Date
Tom Hughes
fecc643c4e Fixed some "lego" messages in plain text emails 2013-05-07 18:59:12 +01:00
Tom Hughes
6659fb9b33 Rename the ugly "id_iframe" to just plain "id" 2013-05-07 14:50:31 +01:00
Tom Hughes
1779347849 Merge remote-tracking branch 'osmlab/id-editor-embed' 2013-05-07 14:43:45 +01:00
Tom Hughes
621cb8a1ef Fix double escaping of date markup in note feed 2013-05-07 11:23:56 +01:00
Tom MacWright
7a98913d0c Add iD editor 
iD sources live in vendor/assets/iD, and are managed with
vendorer, using the "rewrite" functionality to replace relative
paths in the CSS with <%= asset_path(…) %> directives.

To avoid needing to namespace all of its CSS classes, iD
is embedded via an iframe.

To setup, edit application.yml to include an `id_key` key.
(It can use the same consumer key as P2 if you like.)
 2013-05-03 10:52:41 -07:00
Tom Hughes
9f5787fd20 Make the notification mails for notes show when a note is resolved 2013-04-29 19:26:03 +01:00
Siebrand Mazeland
de0e879a25 Localisation updates from http://translatewiki.net. 2013-04-28 17:55:31 +00:00
Tom Hughes
d48b1ccdf2 Replace the title in the note popup with a permalink 2013-04-27 11:51:51 +01:00
Tom Hughes
5dda4196d5 Rework the generation of descriptions in the notes RSS feed 2013-04-26 19:34:32 +01:00
Tom Hughes
1b22299777 Correct a couple of strings 2013-04-24 09:20:01 +01:00
Tom Hughes
4ff5db34c0 Add strings for the allow_write_notes permission 2013-04-24 09:09:15 +01:00
Tom Hughes
0c8ad2f86e Merge branch 'notes' 
Conflicts:
	Vendorfile
 2013-04-23 22:40:21 +01:00
Siebrand Mazeland
8cef78f341 Localisation updates from http://translatewiki.net. 2013-04-21 12:37:45 +00:00
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
Siebrand Mazeland
f48d3f9736 Localisation updates from http://translatewiki.net. 2013-04-07 10:41:38 +00: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
Siebrand Mazeland
5a7b0fac98 Localisation updates from http://translatewiki.net. 2013-04-01 14:18:20 +01:00
Tom Hughes
898cc828dd Merge branch 'master' into notes 
Conflicts:
	Gemfile.lock
 2013-03-28 00:36:07 +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
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
Tom Hughes
fd79c41f49 Correct interpolation variables 2013-02-24 19:48:00 +00:00
Siebrand Mazeland
5a265f5aae Localisation updates from http://translatewiki.net. 2013-02-24 16:57:32 +00:00
Sarah Hoffmann
4fc0049361 Add description for mountain passes 2013-02-17 16:15:20 +00:00
Siebrand Mazeland
7f07c8b4e4 Localisation updates from http://translatewiki.net. 2013-02-16 05:20:17 +00:00
Tom Hughes
5bb55c2315 Update "new note" messaging to provide more guidance 2013-02-12 10:04:55 +00:00
Siebrand Mazeland
39b46132fe Localisation updates from http://translatewiki.net. 2013-02-10 19:31:44 +00:00
Tom Hughes
9374888b60 Correctly report which OAuth signature algorithms are supported 2013-02-08 19:19:59 +00:00
Tom Hughes
8090e086da Merge branch 'master' into notes 2013-02-05 19:03:28 +00:00
Tom Hughes
9f025130fd Change "Close" button to "Resolve" in notes popup 2013-02-05 18:56:59 +00:00
Tom Hughes
a51509c668 Add link to show a note on the map to the note browser page 2013-02-03 17:44:05 +00:00
Tom Hughes
fa86ea0187 Remove unused messages 2013-02-03 12:29:18 +00:00
Tom Hughes
3374f50a5d Drop secret_token as we don't use it and it confuses people 2013-02-03 12:23:37 +00:00
Tom Hughes
7f83692317 Improve date display in user notes list 2013-02-03 11:10:24 +00:00
Tom Hughes
ff73d12255 Make notes RSS feeds work 2013-02-02 17:48:56 +00:00
Tom Hughes
5ad45549e1 Add anonymous comment warning to note popup 2013-02-02 16:18:35 +00:00
Tom Hughes
9d3b419aad Improve styling of the per-user notes list view 2013-02-02 14:29:45 +00:00
Tom Hughes
2ef58f47a2 Improve display of anonymous note comments 2013-02-02 13:04:27 +00:00
Tom Hughes
e957aaacb6 Localise dates and times in notes popups 2013-02-02 12:11:46 +00:00