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

9243 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Chris Flipse
2a44ff581f fix and improve ability coverage to account for tokens 2018-06-17 13:57:06 -04:00
Chris Flipse
060c686c19 Use cancancan to authorize user_preference_controller 2018-06-17 13:57:06 -04:00
Chris Flipse
ac7c45bca0 add test helper to set oauth tokens 2018-06-17 13:57:06 -04:00
Chris Flipse
5232914427 Implement the cancan filters for diary entries 
Access logic is not _entirely_ exported from the controller,
unfortunately.  For interface reasons, some actions which require admin
have to be listed within the controller's deny_access method.

This is required because, being a default-deny system, cancancan
_cannot_ tell you the reason you were denied access; and so
the "nice" feedback presenting next steps can't be gleaned from
the exception
 2018-06-17 13:57:06 -04:00
Chris Flipse
6b44a1976c use a controller method to handle cancan denials 
This will let controllers override for specific circumstances
 2018-06-17 13:57:06 -04:00
Chris Flipse
6da3ece683 use token in ability checks 2018-06-17 13:56:23 -04:00
Chris Flipse
b16aa11f65 fix tests for site controller 2018-06-17 13:56:23 -04:00
Chris Flipse
2ab3d56102 don't check authorization everywhere 2018-06-17 13:56:23 -04:00
Andy Allan
ffa65d4d72 Add cancancan and the first ability definitions for site_controller 2018-06-17 13:56:23 -04:00
Tom Hughes
727ee97a3f Allow inline javascript and CSS in better_errors pages 2018-06-17 11:33:51 +01:00
Tom Hughes
e5604ce98e Assign vandalism reports for users to moderators 2018-06-17 11:14:19 +01:00
Tom Hughes
6c225bd01c Only include issues visible to the current user in the count 2018-06-17 01:01:24 +01:00
Tom Hughes
0071025400 Avoid using "other" as a translation key 2018-06-16 16:21:07 +01:00
Tom Hughes
4862bade50 Fix typoed expansion variable in translation 2018-06-16 12:52:23 +01:00
Tom Hughes
1392e63272 Show count of open issues in the header 2018-06-16 12:40:15 +01:00
Tom Hughes
5ea1ba8d84 Set the locale for issue and report views 2018-06-16 12:14:58 +01:00
Tom Hughes
7441f15b4f Merge remote-tracking branch 'upstream/pull/1576' 2018-06-16 11:45:23 +01:00
Benjamin Reynolds
d5672aed4a Remove quad_tile library and extract to gem 
Quad tile functions are now installed via a gem with native extension
automatically. This improves the run time of the test suite by ~30% for
users that didn't bother to build the C version of the functions.

Closes #1314
Closes #1899
 2018-06-14 18:29:37 +01:00
Bryan Housel
39a1600c3a Update to iD v2.9.0 2018-06-14 08:45:39 -04:00
translatewiki.net
f3bd3834e0 Localisation updates from https://translatewiki.net. 2018-06-14 12:35:47 +02:00
Tom Hughes
27679356af Default to only showing open issues 2018-06-10 19:11:25 +01:00
Tom Hughes
29f12c4547 Improve system tests for issues 2018-06-10 19:03:47 +01:00
Tom Hughes
518cf69b34 Improve model tests for issues 2018-06-10 17:59:15 +01:00
Tom Hughes
22385c179a Improve controller tests for issues 2018-06-10 17:48:47 +01:00
Tom Hughes
5e2c567b7f Make report type a required field 2018-06-10 17:16:33 +01:00
Tom Hughes
f7d0a60fc1 Make reportable item titles translatable 2018-06-10 17:05:21 +01:00