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

2992 commits

Author SHA1 Message Date
Andy Allan
a3a10237f7 Use CanCanCan for user_roles auth 2018-11-28 21:39:26 +01:00
Andy Allan
3fd083d9d4 Remove the unused require_moderator filter 
Use of this filter has been refactored to use CanCanCan
 2018-11-28 15:59:47 +01:00
translatewiki.net
fb299a0601 Localisation updates from https://translatewiki.net. 2018-11-26 08:03:14 +01:00
translatewiki.net
84339e9216 Localisation updates from https://translatewiki.net. 2018-11-22 07:38:17 +01:00
Mikel Maron
98262d3ab1 Add links to Welcome Mat on /welcome and /help 
Closes #2056
 2018-11-20 18:46:22 +00:00
translatewiki.net
9869f97548 Localisation updates from https://translatewiki.net. 2018-11-19 08:48:39 +01:00
Tom Hughes
85802048a7 Fix issues with renaming of diary entry controller 2018-11-17 17:47:51 +00:00
translatewiki.net
3db0994f3c Localisation updates from https://translatewiki.net. 2018-11-15 08:24:40 +01:00
Andy Allan
252b9ef08a Pluralize changesets controller 2018-11-14 10:34:28 +01:00
translatewiki.net
3790dd2aba Localisation updates from https://translatewiki.net. 2018-11-12 08:48:53 +01:00
Tom Hughes
70d6880e10 Merge remote-tracking branch 'upstream/pull/2052' 2018-11-08 17:44:57 +00:00
Tom Hughes
10294f4849 Merge remote-tracking branch 'upstream/pull/2050' 2018-11-08 17:31:30 +00:00
translatewiki.net
9d5beba1d4 Localisation updates from https://translatewiki.net. 2018-11-08 10:08:59 +01:00
Andy Allan
26777c4464 Pluralize diary entries controller 2018-11-07 16:31:04 +01:00
Andy Allan
e85c56d151 Pluralize old_ controllers 2018-11-07 16:05:56 +01:00
Andy Allan
05117aa928 Pluralize nodes, ways and relations controllers 2018-11-07 15:55:26 +01:00
Andy Allan
5cd417f8e8 Use relative translations for changeset comments 2018-11-07 11:07:29 +01:00
Andy Allan
04afeeb32f Rename hide_comment and unhide_comment to destroy and restore 
This preserves the API endpoints and HTTP methods, which could be changed in the next API version
 2018-11-07 10:51:43 +01:00
Andy Allan
4b0d56f7e1 Rename comments_feed to index 2018-11-07 10:22:07 +01:00
Andy Allan
b7e871cb46 Rename comment to create 2018-11-07 10:22:07 +01:00
Andy Allan
19c2b92fb7 Split changeset comment handling into a changeset_comments controller 2018-11-07 10:20:14 +01:00
Tom Hughes
56f7e692cd Improve character validator error messages 2018-11-05 21:16:21 +00:00
J Guthrie
e091246ffc Converted invalid_chars validator to use locale 2018-11-05 14:27:07 +00:00
J Guthrie
c2f23fea6a Create invalid_char validators and apply to models 2018-11-05 14:27:03 +00:00
J Guthrie
c3254b7e93 Added trailing/leading whitespace errors to locale 2018-11-05 14:24:25 +00:00
J Guthrie
88e048deea Specifiy invalid chars in username error message 
- Refactored list of invalid chars out to constant
 2018-11-05 14:24:24 +00:00
translatewiki.net
c42900f538 Localisation updates from https://translatewiki.net. 2018-11-05 08:57:46 +01:00
Tom Hughes
16bef0c8ec Merge remote-tracking branch 'upstream/pull/2023' 2018-11-03 14:34:18 +00:00
Tom Hughes
391fb933f5 Merge remote-tracking branch 'upstream/pull/2038' 2018-11-03 11:58:56 +00:00
Tom Hughes
422afdbae3 Only use DelayedJob in production 
In development just let the default async adaptor be used so
that people don't need to run a daemon.
 2018-11-03 11:57:25 +00:00
Tom Hughes
2e14b1106e Update to sassc 2.x 2018-11-01 22:41:06 +00:00
Tom Hughes
0e7cc08c7b Merge remote-tracking branch 'upstream/pull/2037' 2018-11-01 18:01:25 +00:00
translatewiki.net
052fa33fb5 Localisation updates from https://translatewiki.net. 2018-11-01 08:19:56 +01:00
Andy Allan
b54362d458 Use deliver_later for all email sending 2018-10-31 16:38:12 +01:00
Andy Allan
801522c5c3 Set up Delayed Job as the backend for Active Job 
This persists jobs into the database, and uses locking to ensure that
workers from multiple machines avoid treading on each other.

Jobs can be run by using `bundle exec rake jobs:work`

Fixes #2015
 2018-10-31 15:31:32 +01:00
Andy Allan
f11221f05b Merge branch 'master' into cancancan 2018-10-31 11:16:47 +01:00
translatewiki.net
d75a09f5bb Localisation updates from https://translatewiki.net. 2018-10-29 08:12:55 +01:00
translatewiki.net
03419e1cc4 Localisation updates from https://translatewiki.net. 2018-10-25 10:31:58 +02:00
Andy Allan
a50ad1c895 Rework the default denied access handler to give different responses to tokens, logged in users and other users 2018-10-24 09:39:02 +02:00
translatewiki.net
4f67b43388 Localisation updates from https://translatewiki.net. 2018-10-22 08:08:50 +02:00
translatewiki.net
51b82a34f8 Localisation updates from https://translatewiki.net. 2018-10-18 08:27:45 +02:00
translatewiki.net
766b53c397 Localisation updates from https://translatewiki.net. 2018-10-15 09:35:52 +02:00
Andrew Harvey
9da461cc2e add australia copyright notice for PSMA Australia 2018-10-14 23:10:30 +11:00
Tom Hughes
5e76ec80ce Enable automatic translation export in the test environment 
Fixes #2016
 2018-10-11 19:14:55 +01:00
translatewiki.net
883e5e17b9 Localisation updates from https://translatewiki.net. 2018-10-11 09:13:43 +02:00
translatewiki.net
1c59d4a776 Localisation updates from https://translatewiki.net. 2018-10-09 10:29:33 +02:00
Tom Hughes
eacbcefb2e Remove temorary routes 2018-10-03 22:50:43 +01:00
translatewiki.net
76b18775ea Localisation updates from https://translatewiki.net. 2018-10-03 22:18:47 +02:00
Tom Hughes
b8a8a88004 Merge remote-tracking branch 'upstream/pull/2014' 2018-10-03 18:59:33 +01:00
Andy Allan
3ec67ea2d3 Rename user_controller to users_controller 2018-10-03 15:31:10 +02:00