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

8616 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Tom Hughes
d3700e6201 Merge branch 'master' into next 2018-06-10 17:02:12 +01:00
Tom Hughes
2aca6920dc Use lazy lookups for translations in issues 2018-06-10 16:59:58 +01:00
Tom Hughes
5effa0a6d6 Avoid losing filter settings when an invalid user is entered 2018-06-10 15:42:35 +01:00
Tom Hughes
e8942437c0 Use select_tag for issue filter fields instead of abusing select 2018-06-10 15:32:27 +01:00
Tom Hughes
f227804093 Add some extra indexes on issues 2018-06-10 15:25:53 +01:00
translatewiki.net
e4b94f4e5e Localisation updates from https://translatewiki.net. 2018-06-07 11:23:59 +02:00
translatewiki.net
d03d495a69 Localisation updates from https://translatewiki.net. 2018-06-07 08:19:03 +02:00
Tom Hughes
ba9a00b10c Merge remote-tracking branch 'upstream/pull/1892' 2018-06-06 14:51:30 +01:00
Tom Hughes
beec16232d Update style for change of name for message controller 2018-06-06 14:45:19 +01:00
Tom Hughes
4df0fe72e2 Merge remote-tracking branch 'upstream/pull/1893' 2018-06-06 14:33:36 +01:00
Tom Hughes
3da3b93f80 Merge remote-tracking branch 'upstream/pull/1894' 2018-06-06 14:30:27 +01:00
Tom Hughes
5f31e8d99d Merge remote-tracking branch 'upstream/pull/1895' 2018-06-06 14:28:30 +01:00
Tom Hughes
a516d13d33 Allow iD to access ESRI imagery metadata 2018-06-06 14:25:52 +01:00
Tom Hughes
b7dfcf020f Update Potlatch 2 to 2.5-37-ga38498b2 build 2018-06-06 14:17:49 +01:00
Andy Allan
d336523738 Speed up tests by making fewer random changes 
The old_node_controller#test_version in particular was slow, since
it saves a huge number of tags when adding a tag 30 times over. Since
the tests are random and not based on the number of iterations, this
reduces the iteration counts.
 2018-06-06 13:54:09 +08:00
Andy Allan
e276bea2ff Prefer the helper in controllers 
This avoids future gotchas with conversion to lazy lookups.
 2018-06-06 13:34:34 +08:00
Andy Allan
25c2feaec9 Fix lazy i18n lookups for browse error pages 
`I18n.t` doesn't support lazy lookups, whereas the equivalent
rails `t` helper does. The code can also be simplified to avoid the
lookup table.

Fixes 1877
 2018-06-06 13:25:40 +08:00
Andy Allan
3e5a953e8f Fix missing message translation strings 2018-06-06 11:53:05 +08:00
Andy Allan
88ff81b694 Refactor messages show action to be resourceful 2018-06-06 11:51:52 +08:00
Andy Allan
9b36021ec5 Refactor inbox and outbox paths to avoid display names in urls. 2018-06-06 11:33:33 +08:00
Andy Allan
57d3b3af55 Refactor trace creation pages 
Split the trace creation into new and create methods, with standard resourceful routing. Provide a redirect for external requests to the old url.
 2018-06-06 10:22:42 +08:00
translatewiki.net
892c30aa8c Localisation updates from https://translatewiki.net. 2018-06-04 08:05:07 +02:00
Tom Hughes
b6c36c8545 Revert to using ubuntu/xenial64 with virtualbox 
The generic/ubuntu1604 box doesn't support the vbox extensions.
 2018-06-01 18:26:21 +01:00
Tom Hughes
2f342ba8e8 Only set QT_QPA_PLATFORM if phantomjs fails without it 2018-06-01 00:41:29 +01:00
Tom Hughes
619fa7d802 Update vagrant configuration 
Use a common box for all platforms and fix up various
issues with the provisioning script.
 2018-05-31 22:53:22 +01:00
Tom Hughes
41326fd6d4 Set QT_QPA_PLATFORM to offscreen in the test environment 
Works around an issue with the weird way the debian/ubuntu
version of phantomjs is built:

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=817277
https://github.com/ariya/phantomjs/issues/14376
 2018-05-31 22:52:59 +01:00