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

9630 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
640ea955fe Remove script sources which are no longer needed by iD 2018-07-26 17:44:16 +01:00
Tom Hughes
e418074b2a Merge remote-tracking branch 'upstream/pull/1939' 2018-07-26 17:38:40 +01:00
J Guthrie
c38a50fc5f Added locale 2018-07-26 16:49:12 +01:00
J Guthrie
07480996d7 Refactored and added new test 2018-07-26 16:27:28 +01:00
translatewiki.net
4549df57fb Localisation updates from https://translatewiki.net. 2018-07-26 10:13:58 +02:00
Bryan Housel
315df40f19 Update to iD v2.10.0 2018-07-26 01:38:22 -04:00
J Guthrie
a04b19a9ae Return after rendering - stops further processing in controller 2018-07-25 02:30:59 +01:00
J Guthrie
4ae7bb4178 Switched if to unless to satisfy rubycop 2018-07-25 02:04:04 +01:00
J Guthrie
c299bd42ef No trace description now redirects to /new 2018-07-25 01:49:51 +01:00
translatewiki.net
39f0b501e8 Localisation updates from https://translatewiki.net. 2018-07-23 09:43:27 +02:00
Frederik Ramm
b9f9d9df88 allow moderators to read hidden notes through API 2018-07-22 15:42:14 +02:00
translatewiki.net
d368488946 Localisation updates from https://translatewiki.net. 2018-07-20 15:10:59 +02:00
Tom Hughes
28b48cf583 Add issues link to "More" menu for intermediate sized screens 
Fixes #1928
 2018-07-18 18:59:52 +01:00
Tom Hughes
5d30594a7b Update leaflet to 1.3.3 2018-07-18 18:42:15 +01:00
Frederik Ramm
e71d7e8bea fixed tests to work with new, non-anonymous note comments 2018-07-18 13:29:16 +02:00
Tom Hughes
e14476f52d Update leaflet.osm plugin 2018-07-17 22:48:45 +01:00
Tom Hughes
8df4d8aff0 Update leaflet to 1.3.2 2018-07-17 22:47:50 +01:00
Frederik Ramm
1aa0e35a7a do not allow anonymous users to comment on notes 2018-07-17 12:41:49 +02:00
translatewiki.net
d50a07966b Localisation updates from https://translatewiki.net. 2018-07-16 17:02:36 +02:00
Tom Hughes
5ff822083d Block non-localhost requests for all tests 
Only blocking them for the system tests didn't actually
work anyway as the setting is global so would apply to all
tests after the first system test.
 2018-07-10 18:59:15 +01:00
Tom Hughes
90d5d062f5 Fix nominatim stubs 2018-07-10 18:50:29 +01:00
Tom Hughes
b4106383d9 Add /api/0.6/users to fetch multiple users 
Fixes #1921
 2018-07-09 22:26:55 +01:00
Tom Hughes
53eadb36fc Fix another hostip stub 2018-07-09 20:36:41 +01:00
Tom Hughes
f70edc02f0 Return the "large" image from the user details API call 
Closes #1923
 2018-07-09 20:26:37 +01:00
Tom Hughes
d66b4b3d2f Fix stubbing of hostip requests 2018-07-09 20:15:42 +01:00
translatewiki.net
492a580d9c Localisation updates from https://translatewiki.net. 2018-07-05 13:52:34 +02:00
translatewiki.net
29036cdfaf Localisation updates from https://translatewiki.net. 2018-07-02 08:05:23 +02:00
Tom Hughes
1a0ed716f7 Convert some URLs to https 2018-06-29 11:46:54 +01:00
Bryan Housel
7377cb6393 Update to iD v2.9.2 2018-06-28 19:23:18 -04:00
translatewiki.net
0bc664ac9e Localisation updates from https://translatewiki.net. 2018-06-28 07:32:30 +02:00
Bryan Housel
724d92d5f1 Update to iD v2.9.1 2018-06-25 21:37:25 -04:00
Tom Hughes
1285bcbd71 Update bundle 2018-06-25 14:35:10 +01:00
translatewiki.net
72e5c9586c Localisation updates from https://translatewiki.net. 2018-06-25 08:20:29 +02:00
Tom Hughes
73637b285d Remove expired banners 2018-06-22 12:05:45 +01:00
Francesco Frassinelli
99856a7717 Add SotM 2018 banner 
Closes #1905
 2018-06-22 12:05:45 +01:00
Tom Hughes
a6b0106879 Update bundle 2018-06-22 12:05:45 +01:00
translatewiki.net
999b9c69e1 Localisation updates from https://translatewiki.net. 2018-06-21 08:26:23 +02:00
Tom Hughes
e9acb894a3 Fix daily cleanup script for rails 5.2 compatibility 2018-06-20 08:51:11 +01:00
Tom Hughes
6a25ee9ec9 Update (as far as possible) to rails 5.2 default configuration 2018-06-19 18:53:08 +01:00
Tom Hughes
5f5f31ee7e Fix rubocop warnings 2018-06-19 09:05:32 +01:00
Tom Hughes
98de681e47 Update to rails 5.2.0 2018-06-19 00:16:24 +01:00
Tom Hughes
aee222551a Update to rails 5.1.6 2018-06-18 09:14:50 +01:00
Tom Hughes
f7a35c5895 Fix new rubocop warnings 2018-06-18 09:00:49 +01:00
Tom Hughes
2f6a583510 Update bundle 2018-06-18 08:55:34 +01:00
Tom Hughes
353ce3bf52 Fix broken translation 2018-06-18 08:51:33 +01:00
translatewiki.net
a973d9ce9c Localisation updates from https://translatewiki.net. 2018-06-18 08:05:22 +02:00
Chris Flipse
25256a4849 Make rubocop happy 2018-06-17 20:40:48 -04:00
Chris Flipse
91fc65a2e3 separate ability and capability 
These are asking fundamentally different questions;

Abilities are asking the application if the user has a role that allows
the user to take a certain action
Capabilities are asking if the user has granted the application to
perform a certain type of action

CanCanCan makes no distinction, however, so the `granted_capabilities`
method is provided as a point that can be checked in rescue methods, so
that one can _attempt_ to continue to provide the more informative error
messages around permission refusals
 2018-06-17 13:57:32 -04:00
Benjamin Reynolds
4d20a2c96a Authorize actions on GeocoderController with CanCanCan Ability 2018-06-17 13:57:06 -04:00
Chris Flipse
464c7f863e Update capabilities check to actually reflect the existing logic 
The OAuth capabilities are essentially user permissions that have been
granted to the app.  If the user authenticates through a non-oauth
method, they are assumed to have granted all capabilities to the app
 2018-06-17 13:57:06 -04:00