Commit graph

9282 commits

Author SHA1 Message Date
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
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
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
translatewiki.net
da66044021 Localisation updates from https://translatewiki.net. 2019-05-13 14:55:56 +02:00
translatewiki.net
82e3dd6967 Localisation updates from https://translatewiki.net. 2019-05-09 17:24:10 +02:00
Tom Hughes
b97853f4ed Update bundle 2019-05-08 19:03:48 +01:00
Tom Hughes
810eafdca6 Update polyfills 2019-05-08 19:01:55 +01:00
Tom Hughes
a6d5bc4a00 Update leaflet to 1.5.1 2019-05-08 19:00:15 +01:00
translatewiki.net
7d8cb70ccd Localisation updates from https://translatewiki.net. 2019-05-06 17:01:54 +02:00
translatewiki.net
714468a883 Localisation updates from https://translatewiki.net. 2019-05-02 18:16:12 +02:00
translatewiki.net
128fbf1ea0 Localisation updates from https://translatewiki.net. 2019-04-29 17:46:20 +02:00
Tom Hughes
3bb80bc522 Remove version constraint on postgres driver 2019-04-27 12:44:21 +01:00
J Guthrie
0f83081847 Add geolink class to login/logout referer links
Fixes #2216
2019-04-27 12:37:19 +01:00
translatewiki.net
24c375a68b Localisation updates from https://translatewiki.net. 2019-04-25 20:31:39 +02:00
Tom Hughes
6de1744ab0 Teach travis to validate the database schema 2019-04-24 18:29:54 +01:00
Tom Hughes
a8aed64eb7 Update database schema 2019-04-24 18:29:54 +01:00
Tom Hughes
b606acba0c Use rails 4.2 defaults for older migrations 2019-04-24 11:14:05 +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
81e0b49ed5 Add rubocop-performance 2019-04-23 09:33:34 +01:00