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

5168 commits

Author SHA1 Message Date
Tom Hughes
e78859aeaf Merge remote-tracking branch 'upstream/pull/2028' 2019-05-19 17:14:19 +01:00
Tom Hughes
8e258d810c Add some extra indexes for ACL lookups 2019-05-18 12:57:31 +01:00
Simon Poole
42a917b0a8 Reduce es lint moaning 2019-05-13 17:45:50 +02:00
Simon Poole
d1499895e3 Try to make erblint happy 2019-05-13 16:54:29 +02:00
Simon Poole
1be8d599e8 Add checkbox for contributor terms and improve text 2019-05-13 16:54:29 +02:00
Simon Poole
fa81a608f7 Remove unnecessary test for 0 2019-05-13 16:54:29 +02:00
Simon Poole
e30813bbb1 Rubocop fixes and increase per method complexity limit from 23 to 25 2019-05-13 16:54:29 +02:00
Simon Poole
7cbd83bf01 Style fixes 2019-05-13 16:54:29 +02:00
Simon Poole
6d7a713c12 Require that tou_read checkbox is set 2019-05-13 16:54:29 +02:00
Simon Poole
027728fede Use jquery 2019-05-13 16:54:29 +02:00
Simon Poole
ac9319f4d4 Rename string to avoid translation confusion 2019-05-13 16:54:29 +02:00
Simon Poole
72d78db168 Move link to ToU to attribution footer 2019-05-13 16:54:29 +02:00
Simon Poole
d3d03a3177 Move onclick handling of tou checkbox to ujs 2019-05-13 16:52:18 +02:00
Simon Poole
077834704e Add links to the ToU and include them in signup 
- this adds links to the ToU in the Welcome box and on the About page
- adds a timestamp column to the users table to record acceptance of the ToU
- require ToU to be accepted before signup can proceed
- rearrange and change text on signup page
 2019-05-13 16:52:18 +02:00
J Guthrie
0f83081847 Add geolink class to login/logout referer links 
Fixes #2216
 2019-04-27 12:37:19 +01:00
Tom Hughes
784d4ca03d Avoid error when there is no layer with a keyid 
Fixes #2215
 2019-04-24 11:12:50 +01:00
Tom Hughes
d8c6f0e375 Return correct base layer ID 2019-04-23 14:41:09 +01:00
Tom Hughes
9f57f60b87 Fix new rubocop warnings 2019-04-23 09:33:34 +01:00
Andy Allan
e66c719294 Resourceful(ish) naming for api/users_controller 2019-04-10 17:06:15 +02:00
Andy Allan
5444af981c Resourceful route names for api/trace_controller 2019-04-10 16:52:20 +02:00
Tom Hughes
5bd59e1936 Enable a number of eslint style rules 2019-04-07 17:02:39 +01:00
Tom Hughes
8030e7b5d6 Enable some more eslint checks 2019-04-06 17:27:17 +01:00
Tom Hughes
eb7678145a Use double quotes consistently in javascript code 2019-04-06 15:59:34 +01:00
Tom Hughes
87127d41e9 Enable some more eslint rules from iD rules 2019-04-06 15:48:51 +01:00
Tom Hughes
f68cee0f4e Fix queuing of trace imports for API uploads 
Fixes #2200
 2019-04-03 21:53:16 +01:00
Tom Hughes
1f13321a60 Fix issues found by eslint 2019-04-01 22:03:39 +01:00
Tom Hughes
79bda7a8ed Format closed_at correctly in changeset API responses 
Fixes #2195
 2019-03-30 15:40:08 +00:00
Tom Hughes
7ce40eeb38 erblint: use consistent spacing in HTML tags 2019-03-28 00:30:48 +00:00
Tom Hughes
49da87fb6d erblint: remove leading blank lines 2019-03-28 00:29:04 +00:00
Tom Hughes
89341ce266 erblint: avoid dynamic find_by methods 2019-03-27 19:14:16 +00:00
Tom Hughes
9f931ca1e3 erblint: add rel=noopener to links that open in a new tab 2019-03-27 19:11:49 +00:00
Tom Hughes
1d97fd25b7 erblint: use conditional assignment 2019-03-27 18:59:52 +00:00
Tom Hughes
6afa132b84 erblint: use word arrays 2019-03-27 18:57:04 +00:00
Tom Hughes
ecd81eadbe erblint: use parentheses for nested function calls 2019-03-27 18:55:48 +00:00
Tom Hughes
40141993f7 erblint: use symbols as procs 2019-03-27 18:54:16 +00:00
Tom Hughes
70f571fbcf erblint: avoid negated if conditions 2019-03-27 18:49:01 +00:00
Tom Hughes
7cd7354673 erblint: prefer symbolic logical operators over and/or/not 2019-03-27 18:47:51 +00:00
Tom Hughes
dbbbd62ef1 Merge remote-tracking branch 'upstream/pull/2192' 2019-03-27 18:19:08 +00:00
Andy Allan
7b057545c0 Disentangle the api abilities from the web abilities 
This will allow us to rename api actions without causing permissions headaches. The choice of
abilities files is made by inheriting from either api_controller or application_controller.

Also rename capabilities to api_capabilites, for consistency.
 2019-03-27 18:07:29 +01:00
Andy Allan
22c1be4db7 Set image dimensions in order to avoid a reflow after the page is drawn by the browser 2019-03-27 18:05:44 +01:00
Andy Allan
a5f4124681 Refactor notes#mine to simplify code 2019-03-27 18:04:44 +01:00
Tom Hughes
3af16f6337 erblint: fix remaining single quoted strings 2019-03-27 16:15:19 +00:00
Tom Hughes
50091893d4 Merge remote-tracking branch 'upstream/pull/2189' 2019-03-27 12:07:11 +00:00
Tom Hughes
3b237dc3da Merge remote-tracking branch 'upstream/pull/2188' 2019-03-27 10:43:23 +00:00
Andy Allan
d5d3975181 Use the trace jobs for creating and destroy traces via the API 2019-03-27 11:40:50 +01:00
Andy Allan
0e09252840 Check validity token in changesets controller 
It makes no difference today, but prevents problems in future if
methods accepting post requests are added to this controller in future.
 2019-03-27 11:24:31 +01:00
Andy Allan
3834ed45e6 erblint: avoid parentheses for method calls with no arguments 2019-03-27 10:59:10 +01:00
Andy Allan
6d0100b91d erblint: prefer double quoted strings 2019-03-27 10:57:00 +01:00
Andy Allan
74b91c0e3e erblint: Add or remove curly braces around hash parameters as required 2019-03-27 10:30:48 +01:00
Andy Allan
040c0184a4 erblint: use hash rocket syntax 2019-03-27 10:03:56 +01:00