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

5562 commits

Author SHA1 Message Date
Tom Hughes
6b631f1e25 Merge remote-tracking branch 'upstream/pull/2209' 2019-06-12 19:56:59 +01:00
Tom Hughes
d9b8ebeb01 Merge remote-tracking branch 'upstream/pull/2257' 2019-06-12 19:50:52 +01:00
Tom Hughes
176b853174 Fix new eslint warnings 2019-06-12 19:27:58 +01:00
Tom Hughes
24b138db09 Merge remote-tracking branch 'upstream/pull/2228' 2019-06-12 19:16:32 +01:00
Andy Allan
a08b65a6ac Use built-in form submit translation keys for traces 2019-06-12 19:24:06 +02:00
Andy Allan
1d09cfcb18 Use built-in form submit translation keys for oauth client applications 2019-06-12 19:24:06 +02:00
Andy Allan
085412f624 Use i18n for submit button for issue comments 
Normally when an en-GB.yml translation is missing, rails falls back to en.yml. But when
using the submit helpers, if the en-GB translation is missing, rails knows how to create
a fallback like 'Create {model_name}' without touching the en.yml file. This string might
then be different from what the test expects, e.g. 'Add Comment'.

So it's important to set the language headers, to avoid phantomjs from picking up your desktop
preferences in this specific case.
 2019-06-12 19:24:06 +02:00
Andy Allan
5450bade1a Use built-in form sumbit translation keys for diary comments 
Also use a diary comment object as the basis for the form
 2019-06-12 16:20:29 +02:00
Andy Allan
52782121a6 Use built-in form sumbit translation keys for messages 2019-06-12 16:11:54 +02:00
Andy Allan
cf0b6403aa Use built-in form sumbit translation keys for redactions 2019-06-12 16:08:20 +02:00
Andy Allan
97ff32f528 Use built-in form sumbit translation keys for user blocks 2019-06-12 16:07:18 +02:00
Tom Hughes
ee458b6ee2 Parse each GPX file in an archive separately 
Fixes #2253
 2019-06-11 12:57:00 +01:00
Tom Hughes
63186dc161 Fix erblint warnings 2019-06-06 18:20:21 +01:00
Tom Hughes
8e85d0cfd1 Make hidden diary entries and comments more visible 2019-06-06 17:51:58 +01:00
Andy Allan
9e158a5d39 Show all diary comments to administrators 2019-06-06 16:03:42 +02:00
Andy Allan
fdffd22cca Allow admins to unhide diary comments, if they wish 2019-06-06 16:03:42 +02:00
Andy Allan
49fc17c6b6 Show deleted diary entries to administrators, if the user isn't also deleted 
This will allow administrators to review diary entry deletions from non-spam users.
 2019-06-06 15:59:47 +02:00
Andy Allan
f2f3fbb1f1 Allow administrators to unhide diary entries, if they wish 2019-06-06 15:59:47 +02:00
Tom Hughes
5bb21188e4 Fix rubocop warning 2019-06-05 09:20:00 +01:00
Tom Hughes
f99c383318 Merge remote-tracking branch 'upstream/pull/2225' 2019-05-30 18:06:58 +01:00
Tom Hughes
e49953f141 Merge remote-tracking branch 'upstream/pull/2239' 2019-05-29 17:41:08 +01:00
Andy Allan
9431b471a7 rubocop and erblint fixes 2019-05-29 17:09:51 +02:00
Andy Allan
6ed749e7eb Allow a configurable delay to keep diary entries from being published in feeds 
This is to provide another tool to help spam fighting.

The configuration value is set to zero hours for new deploys in
order to be 'least surprising'. You can change the setting without
interfering with your test suite.
 2019-05-29 16:56:15 +02:00
Andy Allan
1b1d90a0f9 Refactor diary entry form 
This uses the built-in helpers for naming form elements, rather than
having to override with specific i18n labels. It also changes the label
to 'Update', and capitalizes the title on the edit page.
 2019-05-29 16:09:14 +02:00
Andy Allan
fbcd2bc10a Refactor some diary entry routes to use resources 2019-05-29 15:55:27 +02:00
Andy Allan
b7893df84e Refactor diary entries to use create and update methods 
This brings it slightly more into line with resourceful routing.
 2019-05-29 15:37:23 +02:00
Andy Allan
8ae8768cd3 Update annotations to show 'using' clause on indexes 2019-05-29 12:02:50 +02:00
Andy Allan
4377e2bd55 Update annotations to correctly show bigint types 2019-05-29 11:52:20 +02:00
Tom Hughes
e78859aeaf Merge remote-tracking branch 'upstream/pull/2028' 2019-05-19 17:14:19 +01:00
mmd-osm
b97e8d5427 Remove SWF gpx trackpoints feature for Potlatch1 2019-05-19 15:17:14 +02:00
Tom Hughes
8e258d810c Add some extra indexes for ACL lookups 2019-05-18 12:57:31 +01:00
Andy Allan
2142ff02c2 Allow moderators to hide diary entries and comments 2019-05-15 13:40:15 +02:00
Andy Allan
90ac07d071 Allow user_blocks to be created for longer periods 
This avoids admins from having to manually change end periods in the database
 2019-05-15 11:30:28 +02: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
mmd-osm
363155a2a8 Move xml gen. into view for (old) nodes, ways, relations, map 2019-05-07 22:16:22 +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