Andy Allan
f11221f05b
Merge branch 'master' into cancancan
2018-10-31 11:16:47 +01:00
Tom Hughes
22af018298
Update translation keys for renaming of user to users
2018-10-29 12:48:20 +00:00
Andy Allan
0888f43d7b
Check the oauth token and then use the capabilities directly
2018-10-24 16:48:54 +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
Tom Hughes
aef5273e95
Tidy up notes#search
2018-10-11 18:32:31 +01:00
Tom Hughes
db13180c70
Use "user" as user id parameter for notes searches
2018-10-11 18:30:53 +01:00
Tom Hughes
57095bc6c0
Merge remote-tracking branch 'upstream/pull/1955'
2018-10-11 17:41:47 +01:00
Tom Hughes
45c464a69a
Suppress changeset pagination for inactive users
...
Fixes #2024
2018-10-11 09:39:56 +01:00
ENT8R
caef5828f4
Fix Rubocop issue
2018-10-11 08:36:13 +02:00
ENT8R
b19e424112
Fix some issues and improve code
2018-10-10 19:29:11 +02:00
Andy Allan
b7baa2c10a
Remove temporary development code
2018-10-10 16:54:16 +02:00
Andy Allan
dfb9e40820
Move issues and reports to authorization system
2018-10-10 16:34:44 +02:00
Andy Allan
901c29a820
Fix typo in method name
2018-10-10 11:55:00 +02:00
Andy Allan
fb2c1f6cfd
Refactor site#welcome to use abilities instead of require_user
2018-10-10 11:49:45 +02:00
Andy Allan
f8f7ab1568
Change abilities based on upstream renamings
2018-10-10 11:41:16 +02:00
Andy Allan
420a7289a0
Merge branch 'authz' of https://github.com/rubyforgood/openstreetmap-website into rubyforgood-authz
2018-10-10 11:26:30 +02:00
ENT8R
0859748815
Fix Rubocop issue
2018-10-09 14:50:55 +02:00
ENT8R
3cdf4f3686
Fix an issue where the query did not work if a display name or an id was specified
2018-10-09 14:37:55 +02:00
ENT8R
083500f056
Merge branch 'master' into notes-search
2018-10-09 11:41:22 +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
de29e9b3f5
Fix Style/NumericPredicate rubocop warnings
2018-09-22 17:34:58 +01:00
Tom Hughes
64146b4f36
Fix Style/SafeNavigation rubocop warnings
2018-09-22 17:21:06 +01:00
Tom Hughes
6c2093b29d
Fix new rubocop warnings
2018-09-22 17:12:29 +01:00
Tom Hughes
0e0c89b95c
Merge remote-tracking branch 'upstream/pull/1985'
2018-09-10 18:58:27 +01: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
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
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
5405dde6ec
Use resourceful destroy method for messages
2018-09-05 10:38:36 +08:00
Tom Hughes
6027c42ee7
Hide note comments made by deleted users
...
Fixes #1970
2018-09-04 22:22:39 +01:00
Ilya Zverev
67925e6d98
Do not display two coordinates on 'where am I' click
...
Closes #1968
2018-09-03 17:46:26 +01:00
Tom Hughes
a1b179fa38
Merge remote-tracking branch 'upstream/pull/1964'
2018-08-30 18:26:05 +01:00
Andy Allan
d0089f0ce8
Rename traces#list to traces#index
2018-08-29 17:58:37 +08:00
Andy Allan
16fef14b61
Rename traces#view to traces#show
2018-08-29 17:43:38 +08:00
Andy Allan
b745126b6e
Split out updating a trace into an update action
2018-08-29 17:31:12 +08:00
Tom Hughes
720da8b78c
Avoid multiple returns
2018-08-29 08:53:23 +01:00
Tom Hughes
05514ced0c
Merge remote-tracking branch 'upstream/pull/1962'
2018-08-29 08:46:44 +01:00
Tom Hughes
80a6e8da05
Tidy up control flow in trace creation
2018-08-29 08:34:38 +01:00
Andy Allan
942e62117f
Merge pull request #1938 from jguthrie100/fix_no_trace_description_error
...
Fixes "new trace" validation error
2018-08-29 14:49:26 +08:00
Andy Allan
f38e03f0ed
Refactor message creation to use a create action
...
This makes it more conventional, rather than handling posts to the new action. The posting of the form was also reworked to use a hidden field for the displayname, rather than in the url, again for convention.
2018-08-29 14:18:20 +08:00
Tom Hughes
08f0621d6f
Tidy whitespace
2018-08-28 17:56:34 +01:00
Ilya Zverev
a46ecae757
Reverse coordinates order only when called with two nondescript numbers
2018-08-28 15:16:26 +03:00
ENT8R
e8cb7ac8f1
Add some more tests, better error handling for dates
2018-08-27 16:44:46 +02:00
Ilya Zverev
d9d51fce9b
Add parsing coordinates in lon, lat format
2018-08-27 14:06:17 +03:00
ENT8R
98402908b0
Improve code style, fix tests
2018-08-26 16:04:09 +02:00
