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

5883 commits

Author SHA1 Message Date
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
dfe21fec82 Use resourceful routing for message replies 2018-09-05 13:22:43 +08:00
Andy Allan
db30ea642e Use a resourceful path for message marking 2018-09-05 11:23:53 +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
44217775f0 Rename i18n keys track->trace 2018-08-29 17:59:58 +08: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
e0abb299d0 Merge remote-tracking branch 'upstream/pull/1948' 2018-08-28 18:53:45 +01:00
Tom Hughes
32a400c5af Only include embed related messages in the embed javascript 2018-08-28 18:02:32 +01:00
Tom Hughes
1dfbd9282c Merge remote-tracking branch 'upstream/pull/1950' 2018-08-28 17:59:46 +01: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
ENT8R
85324058f4
Enhanced the notes search endpoint with a few features 2018-08-25 23:00:11 +02:00
Tom Hughes
ed82d0a756 Only fetch client side translations for the current locale 2018-08-16 12:22:36 +01:00
mmd-osm
fe644bbd72 Include num_changes in changeset xml response 2018-08-14 10:57:13 +02:00
Tom Hughes
e9abea3dd7 Avoid some accidental manouver type matches 2018-08-13 17:13:26 +01:00
Tom Hughes
91194cf354 Set the locale when adding a comment to an issue 2018-08-01 21:35:51 +01:00
Tom Hughes
5fa0aebe9f Use dynamic error pages built through the asset pipeline 
Fixes #1241
 2018-08-01 19:13:04 +01:00
Tom Hughes
640ea955fe Remove script sources which are no longer needed by iD 2018-07-26 17:44:16 +01:00
J Guthrie
07480996d7 Refactored and added new test 2018-07-26 16:27:28 +01: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
Frederik Ramm
b9f9d9df88 allow moderators to read hidden notes through API 2018-07-22 15:42:14 +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
Frederik Ramm
1aa0e35a7a do not allow anonymous users to comment on notes 2018-07-17 12:41:49 +02: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
f70edc02f0 Return the "large" image from the user details API call 
Closes #1923
 2018-07-09 20:26:37 +01: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
98de681e47 Update to rails 5.2.0 2018-06-19 00:16:24 +01:00
Tom Hughes
f7a35c5895 Fix new rubocop warnings 2018-06-18 09:00:49 +01: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