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

841 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
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
Tom Hughes
9f57f60b87 Fix new rubocop warnings 2019-04-23 09:33:34 +01:00
Tom Hughes
dcfe326f65 Merge remote-tracking branch 'upstream/pull/2175' 2019-03-26 19:14:04 +00:00
Andy Allan
c1bf73bee4 Use an enumerator for gpx.points, and process the the points in batches 2019-03-20 10:35:40 +01:00
Andy Allan
07fdcf638e Raise exception if there is an error, and import tracepoints in batches 2019-03-20 10:35:40 +01:00
Andy Allan
400db58036 Use activerecord-import for bulk importing tracepoint records 
Non-rigourous testing shows a significant speedup, even on ssds.
 2019-03-20 10:35:40 +01:00
Tom Hughes
e3ed9988ce Merge remote-tracking branch 'upstream/pull/2177' 2019-03-16 15:39:03 +00:00
Tom Hughes
874fddf499 Merge remote-tracking branch 'upstream/pull/2164' 2019-03-16 15:31:29 +00:00
Frederik Ramm
538bfed8a6 Move changeset XML generation to a view 2019-03-16 15:30:18 +00:00
Andy Allan
d102c9aaf4 Move all settings to settings.yml 
We leave the STATUS setting alone, since it's required before rails
boots. The test-specific settings now live in config/settings/test.yml
 2019-03-13 18:06:23 +01:00
Andy Allan
1ca77d6dda Rubocop fixes for ruby 2.5 2019-03-13 10:33:33 +01:00
Tom Hughes
7ccf6964e3 Prevent leading and trailing whitespace on email addresses 2019-03-08 11:17:51 +00:00
Tom Hughes
e174eb762f Strip leading and trailing whitespace for email authentication 
Fixes #2173
 2019-03-08 10:59:57 +00:00
Tom Hughes
fbefe3550c Always look to the global scope for the GPX module 2019-02-07 18:40:35 +00:00
Andy Allan
c4a192f436 Remove unnecessary requires from app 2019-02-06 12:26:30 +01:00
Andy Allan
32ce4ea527 Move utf8 validator into app/validators 2019-02-06 12:11:44 +01:00
Tom Hughes
cdb42d2a6c Avoid ordering points from public and private traces 
Closes #2046
 2018-11-07 08:57:14 +00:00
Tom Hughes
b7438167c0 Use character validate to exclude URL characters for trace tags 2018-11-05 21:16:21 +00:00
Tom Hughes
d73a5d4bc0 Merge character validators 2018-11-05 18:54:19 +00:00
Tom Hughes
b4ef61a9f3 Merge leading and trailing whitespace validators 2018-11-05 18:29:17 +00:00
Tom Hughes
873ac155ca Improve consistency of text validations 2018-11-05 17:06:48 +00:00
J Guthrie
1e57189366 Added tests for validators 2018-11-05 16:23:30 +00:00
J Guthrie
6cde8c9b0c Changed User model to not allow nil display_name (w/ tests) 2018-11-05 15:40:37 +00:00
J Guthrie
c2f23fea6a Create invalid_char validators and apply to models 2018-11-05 14:27:03 +00:00
J Guthrie
64816e50b5 Added more non-ascii chars to validation (matching list of chars in other models) 2018-11-05 14:24:30 +00:00
J Guthrie
7d6c5d7cd7 Fix rubucop errors 2018-11-05 14:24:29 +00:00
J Guthrie
b439bac920 Make invalid char list more explicit (between ascii and non ascii chars) 2018-11-05 14:24:29 +00:00
J Guthrie
c3254b7e93 Added trailing/leading whitespace errors to locale 2018-11-05 14:24:25 +00:00
J Guthrie
88e048deea Specifiy invalid chars in username error message 
- Refactored list of invalid chars out to constant
 2018-11-05 14:24:24 +00:00
Tom Hughes
e93e5fbe63 Allow note comments with no body 2018-11-05 09:24:51 +00:00
Tom Hughes
acfbc09198 Merge remote-tracking branch 'upstream/pull/2042' 2018-11-04 14:49:27 +00:00
mmd-osm
d9a48d66f9 Limit notes sizes to 2000 characters 2018-11-03 18:32:02 +01:00
Tom Hughes
5b062f0315 Merge remote-tracking branch 'upstream/pull/2039' 2018-10-31 18:33:20 +00:00
Andy Allan
4395b79bf7 Move notifier.rb into app/mailers 
This is the expected location for mailers
 2018-10-31 17:19:18 +01:00
Tom Hughes
82f3dc6823 Convert some model mixins to concerns 2018-10-29 19:14:55 +00:00
Simon Poole
07ffb4c3f6 Calculate bounding box when deleting relations 
Closes #2030
Fixes #2020
 2018-10-21 19:32:12 +01:00
Tom Hughes
b8a8a88004 Merge remote-tracking branch 'upstream/pull/2014' 2018-10-03 18:59:33 +01:00
Andy Allan
3ec67ea2d3 Rename user_controller to users_controller 2018-10-03 15:31:10 +02:00
Andy Allan
5e407dfb34
Merge branch 'master' into messages 2018-10-03 14:04:12 +02:00
Xuyang Jia
d0e45c7c8e Fix any_relations always being false 
Closes #1976
 2018-09-22 17:46:00 +01:00
Tom Hughes
de29e9b3f5 Fix Style/NumericPredicate rubocop warnings 2018-09-22 17:34:58 +01:00
Tom Hughes
64146b4f36 Fix Style/SafeNavigation rubocop warnings 2018-09-22 17:21:06 +01:00
Tom Hughes
6c2093b29d Fix new rubocop warnings 2018-09-22 17:12:29 +01:00
Tom Hughes
70cca71f38 Merge remote-tracking branch 'upstream/pull/1973' 2018-09-05 19:01:24 +01: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
Tom Hughes
6027c42ee7 Hide note comments made by deleted users 
Fixes #1970
 2018-09-04 22:22:39 +01:00