Commit graph

8242 commits

Author SHA1 Message Date
Andy Allan
ae44879213 Merge branch 'master' into moderation 2018-01-21 11:20:19 +00:00
Andy Allan
3a386f185c Reopen issues if necessary when creating a report. 2018-01-21 11:18:24 +00:00
Tom Hughes
ec45114f59 Use no-r2 comment to block RTL gem from changing sprites
Fixes #1717
2018-01-18 17:42:30 +00:00
Tom Hughes
56448b50d0 Update leaflet to 1.3.1 2018-01-18 17:42:30 +00:00
translatewiki.net
80c83be68d Localisation updates from https://translatewiki.net. 2018-01-18 08:47:01 +01:00
Tom Hughes
66ba93d6e6 Update Potlatch 2 to 2.5-21-gec1befed build 2018-01-17 12:32:58 +00:00
Tom Hughes
e35867dd7a Update the Leaflet.contextmenu plugin to 1.5.0 2018-01-15 10:25:50 +00:00
Tom Hughes
15b2a88a2d Update leaflet to 1.3.0 2018-01-15 10:25:50 +00:00
translatewiki.net
6a41df6730 Localisation updates from https://translatewiki.net. 2018-01-15 08:08:50 +01:00
Tom Hughes
9590d60f73 Allow cross domain flash access from http sites 2018-01-13 15:57:31 +00:00
Tom Hughes
810c8cf129 Enable cross origin requests for diary RSS feeds
Fixes #1714
2018-01-13 10:41:26 +00:00
Tom Hughes
9cf698322c Merge remote-tracking branch 'upstream/pull/1707' 2018-01-13 10:35:42 +00:00
Tom Hughes
d987416901 Allow apache to control the HSTS setting 2018-01-11 19:44:20 +00:00
Tom Hughes
b396c8cbe5 Allow apache to control the HSTS setting 2018-01-11 19:20:07 +00:00
translatewiki.net
3128aabbfd Localisation updates from https://translatewiki.net. 2018-01-11 08:10:41 +01:00
Tom Hughes
256460a2d9 Fix jshint warning 2018-01-08 20:30:51 +00:00
Tom Hughes
be86e4824f Convert various URLs to https 2018-01-08 20:18:21 +00:00
Tom Hughes
af1397436f Use https for nominatim 2018-01-08 10:50:44 +00:00
Tom Hughes
ce9066797c Monkey patch OAuth to allow http signatures on https requests 2018-01-08 10:50:44 +00:00
translatewiki.net
88dd97ba01 Localisation updates from https://translatewiki.net. 2018-01-08 09:18:17 +01:00
translatewiki.net
e8c9513887 Localisation updates from https://translatewiki.net. 2018-01-04 10:23:00 +01:00
Tom Hughes
9340c46173 Remove dependencies on mapzen services 2018-01-02 18:45:20 +00:00
translatewiki.net
88db2c536f Localisation updates from https://translatewiki.net. 2018-01-01 15:41:07 +01:00
translatewiki.net
b41d120484 Localisation updates from https://translatewiki.net. 2017-12-25 15:23:29 +01:00
translatewiki.net
c7a8595232 Localisation updates from https://translatewiki.net. 2017-12-21 08:44:26 +01:00
Tom Hughes
c658e84535 Fix tests that only worked if object 400 didn't exist 2017-12-19 17:43:53 +00:00
mmd-osm
e21c967fdd Revoking administrator role on current user should fail
Fixes #1697
Closes #1701
2017-12-19 17:31:34 +00:00
mmd-osm
965123372d Added explanation about discussions on open changesets
Closes #1705
2017-12-18 21:19:35 +00:00
translatewiki.net
6a23f0e4d4 Localisation updates from https://translatewiki.net. 2017-12-18 17:56:33 +01:00
Guillaume RISCHARD
ca36cf2826 Remove support for soon discontinued josm remote https endpoint 2017-12-16 16:15:52 +01:00
Tom Hughes
30757696bd Move advice on what to enter in a note to guide text 2017-12-14 16:07:32 +00:00
translatewiki.net
c6b66ddeee Localisation updates from https://translatewiki.net. 2017-12-14 08:41:46 +01:00
Andy Allan
e23ff48dce Revert whitespace changes. 2017-12-13 16:50:22 +00:00
Andy Allan
cba08bb454 Simplify permissions check. 2017-12-13 16:43:09 +00:00
Andy Allan
e3054fc15a Fix some reporting links. 2017-12-13 16:35:14 +00:00
Andy Allan
02c9806323 Remove unused update method from issues_controller. 2017-12-13 16:29:47 +00:00
Andy Allan
3d0c905762 Revert en-GB.yml to master.
Only en.yml should be changed in pull requests, en-GB.yml is taken
care of through Translatewiki
2017-12-13 16:29:47 +00:00
Andy Allan
e0faf68437 Remove new issue notifications for now
This can be re-implemented later.
2017-12-13 16:29:46 +00:00
Andy Allan
a79d951db2 Remove a couple of unused style rules. 2017-12-13 16:15:40 +00:00
Andy Allan
63992d83bd Store the report category. 2017-12-13 16:02:55 +00:00
translatewiki.net
90332473b8 Localisation updates from https://translatewiki.net. 2017-12-11 08:10:41 +01:00
Tom Hughes
31133683b4 Don't add system tests if the user specified which tests to run 2017-12-09 10:52:19 +00:00
Martijn van Exel
4d7411eabd A couple more tweaks to Mac install docs
* The URL for the homebrew site  has changed.
* Added phantomjs (test dependency)

Closes #1700
2017-12-07 18:02:26 +00:00
Martijn van Exel
da52b3a778 Add explicit install instructions for libxml2 on MacOS
Closes #1698
2017-12-07 09:26:36 +00:00
translatewiki.net
a749146723 Localisation updates from https://translatewiki.net. 2017-12-07 09:12:58 +01:00
Andy Allan
875e588348 Show issues based on all the users roles
Previously you were prevented from seeing moderator issues if you
were also an administrator.
2017-12-06 18:56:27 +00:00
Andy Allan
8dc8479e12 Re-enable issue reassigning. 2017-12-06 18:01:51 +00:00
Andy Allan
cbe707b33e Validate the assigned role, and remove the :type activrecord enum 2017-12-06 17:15:11 +00:00
Andy Allan
0df788d742 Rename 'issue_type' to 'assigned_role', set defaults in the model and test. 2017-12-06 17:15:11 +00:00
Andy Allan
c40ad9de02 Remove the hardcoded pixel width for columns. 2017-12-06 15:26:40 +00:00