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

2864 commits

Author SHA1 Message Date
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
Andy Allan
5e407dfb34
Merge branch 'master' into messages 2018-10-03 14:04:12 +02:00
Tom Hughes
86fcb272e5 Update wiki page data 2018-09-26 23:28:40 +01:00
Tom Hughes
6c2093b29d Fix new rubocop warnings 2018-09-22 17:12:29 +01:00
Tom Hughes
ad3ca54e28 Remove Imperial from hosting credits 
Fixes #1944
 2018-09-22 16:57:53 +01:00
translatewiki.net
a3b094cc09 Localisation updates from https://translatewiki.net. 2018-09-20 11:16:54 +02:00
Tom Hughes
1ebd7ca9b0 Remove bogus translation 2018-09-17 17:16:20 +01:00
translatewiki.net
797a249b07 Localisation updates from https://translatewiki.net. 2018-09-17 08:17:04 +02:00
Tom Hughes
f84fe0006c Remove bogus translation 2018-09-13 19:41:22 +01:00
translatewiki.net
9cd74649fb Localisation updates from https://translatewiki.net. 2018-09-13 11:04:58 +02:00
Tom Hughes
0e0c89b95c Merge remote-tracking branch 'upstream/pull/1985' 2018-09-10 18:58:27 +01:00
Tom Hughes
995a5f89c2 Merge remote-tracking branch 'upstream/pull/1984' 2018-09-10 18:53:13 +01:00
translatewiki.net
29eb778043 Localisation updates from https://translatewiki.net. 2018-09-10 08:30:56 +02:00
Andy Allan
3f2ba044e5 Rename diary_entry#list to #index 2018-09-10 10:26:28 +08:00
Andy Allan
a3606e00b4 Rename user#list to user#index 2018-09-10 10:03:34 +08:00
translatewiki.net
5cead9d5ab Localisation updates from https://translatewiki.net. 2018-09-06 21:37:01 +02:00
Tom Hughes
983e21db2e Merge remote-tracking branch 'upstream/pull/1974' 2018-09-05 19:06:16 +01:00
Tom Hughes
70cca71f38 Merge remote-tracking branch 'upstream/pull/1973' 2018-09-05 19:01:24 +01:00
Tom Hughes
a0dc300840 Merge remote-tracking branch 'upstream/pull/1972' 2018-09-05 18:41:17 +01:00
Andy Allan
84e19eba83 Remove temporary routes 
These were preserved to avoid users hitting errors, if we deployed
while they were filling in the related forms.
 2018-09-05 15:40:05 +08:00
Andy Allan
de6aa3f015 Rename changeset#list to changeset#index 2018-09-05 15:17:11 +08:00
Andy Allan
5a06a3dffe Rename diary_entry#view to diary_entry#show 2018-09-05 14:52:36 +08:00
Andy Allan
19c26e70a3 Rename user#view to user#show 2018-09-05 14:21:01 +08:00
Andy Allan
dfe21fec82 Use resourceful routing for message replies 2018-09-05 13:22:43 +08:00
Andy Allan
db30ea642e Use a resourceful path for message marking 2018-09-05 11:23:53 +08:00
Andy Allan
5405dde6ec Use resourceful destroy method for messages 2018-09-05 10:38:36 +08:00
translatewiki.net
d792a3bab5 Localisation updates from https://translatewiki.net. 2018-09-03 08:23:19 +02:00
Tom Hughes
a1b179fa38 Merge remote-tracking branch 'upstream/pull/1964' 2018-08-30 18:26:05 +01:00