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

9304 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
cf7c8a0cd0 Merge remote-tracking branch 'upstream/pull/2249' 2019-06-05 17:19:57 +01:00
Tom Hughes
a8d0a64b2a Merge remote-tracking branch 'upstream/pull/2250' 2019-06-05 17:18:55 +01:00
Andy Allan
a88d62bcc6 Ignore the block length of the routes 
Since the routes are more of a dsl than code, we've been happy to
repeatedly bump up this number. But then that hides other code which
has over-long block lengths hiding behind.

So instead let's exclude the routes from this metric.
 2019-06-05 16:29:54 +02:00
Andy Allan
31e1204dfa Remove dead link to sitemap 
Fixes #1113
 2019-06-05 16:18:48 +02:00
Tom Hughes
5bb21188e4 Fix rubocop warning 2019-06-05 09:20:00 +01:00
Tom Hughes
5e8fd6e6cb Update rubocop todo 2019-06-05 09:10:03 +01:00
Tom Hughes
0d936de9c9 Add rubocop-rails 2019-06-05 08:51:27 +01:00
Tom Hughes
56c18509ba Update bundle 2019-06-05 08:51:27 +01:00
translatewiki.net
c3699e206e Localisation updates from https://translatewiki.net. 2019-06-03 17:46:00 +02:00
translatewiki.net
f4e848d9ea Localisation updates from https://translatewiki.net. 2019-05-30 19:35:08 +02:00
Tom Hughes
f99c383318 Merge remote-tracking branch 'upstream/pull/2225' 2019-05-30 18:06:58 +01:00
Tom Hughes
5d8e1922fe Update bundle 2019-05-30 09:25:34 +01:00
Tom Hughes
b92c699a66 Merge remote-tracking branch 'upstream/pull/2237' 2019-05-30 09:20:37 +01:00
Andy Allan
3e414a5025 Use strong_migrations to help developers avoid problems in production database schema changes 2019-05-30 10:11:17 +02:00
Tom Hughes
e49953f141 Merge remote-tracking branch 'upstream/pull/2239' 2019-05-29 17:41:08 +01:00
Tom Hughes
7fc00c9314 Merge remote-tracking branch 'upstream/pull/2238' 2019-05-29 17:37:18 +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
Tom Hughes
21bf5d79d6 Merge remote-tracking branch 'upstream/pull/2236' 2019-05-29 11:05:21 +01: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
ea68ac865b Merge remote-tracking branch 'upstream/pull/2232' 2019-05-28 14:36:38 +01:00
translatewiki.net
ab66a001eb Localisation updates from https://translatewiki.net. 2019-05-27 16:54:08 +02:00
Bryan Housel
c7ed8a9e86 Update to iD v2.15.1 2019-05-24 22:20:29 -04:00
translatewiki.net
2af5f21578 Localisation updates from https://translatewiki.net. 2019-05-23 14:31:35 +02:00
Bryan Housel
c99f7299d4 Update to iD v2.15.0 2019-05-21 13:23:10 -04:00
translatewiki.net
fd13c753e2 Localisation updates from https://translatewiki.net. 2019-05-20 14:03:37 +02:00
Tom Hughes
1bef353c27 Update database schema 2019-05-19 17:17:25 +01:00
Tom Hughes
e78859aeaf Merge remote-tracking branch 'upstream/pull/2028' 2019-05-19 17:14:19 +01:00
Simon Poole
c5a7d64522 Remove left over string from first draft 2019-05-19 17:17:59 +02:00
Tom Hughes
71cbb003f8 Exclude per-user diary pages from indexing 2019-05-19 11:56:47 +01:00
Tom Hughes
8e258d810c Add some extra indexes for ACL lookups 2019-05-18 12:57:31 +01:00
Tom Hughes
25951cae38 Block indexing of diaries 2019-05-18 10:11:12 +01:00
translatewiki.net
1aa6710c2e Localisation updates from https://translatewiki.net. 2019-05-17 12:35:45 +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
b89e6c2274 Update user_creation_test for new parameter 2019-05-13 16:54:29 +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
e488a7e862 Fix tests for change in users_controller 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
51c84869c4 Fix tests for change in users_controller, add test for missing read_tou 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