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

8880 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andy Allan
5cd417f8e8 Use relative translations for changeset comments 2018-11-07 11:07:29 +01:00
Andy Allan
04afeeb32f Rename hide_comment and unhide_comment to destroy and restore 
This preserves the API endpoints and HTTP methods, which could be changed in the next API version
 2018-11-07 10:51:43 +01:00
Andy Allan
4b0d56f7e1 Rename comments_feed to index 2018-11-07 10:22:07 +01:00
Andy Allan
b7e871cb46 Rename comment to create 2018-11-07 10:22:07 +01:00
Andy Allan
19c2b92fb7 Split changeset comment handling into a changeset_comments controller 2018-11-07 10:20:14 +01:00
Tom Hughes
a39c645602 Merge remote-tracking branch 'upstream/pull/2044' 2018-11-05 21:22:48 +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
56f7e692cd Improve character validator error messages 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
e091246ffc Converted invalid_chars validator to use locale 2018-11-05 14:27:07 +00:00
J Guthrie
3b68061e87 Fix rubocop errors 2018-11-05 14:27:06 +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
translatewiki.net
c42900f538 Localisation updates from https://translatewiki.net. 2018-11-05 08:57:46 +01:00
Tom Hughes
efd50cd529 Merge remote-tracking branch 'upstream/pull/2009' 2018-11-04 14:50:14 +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
16bef0c8ec Merge remote-tracking branch 'upstream/pull/2023' 2018-11-03 14:34:18 +00:00
Tom Hughes
8c269aba4e Move abilities to a sepatarate top level directory 2018-11-03 12:56:50 +00:00
Tom Hughes
391fb933f5 Merge remote-tracking branch 'upstream/pull/2038' 2018-11-03 11:58:56 +00:00
Tom Hughes
422afdbae3 Only use DelayedJob in production 
In development just let the default async adaptor be used so
that people don't need to run a daemon.
 2018-11-03 11:57:25 +00:00
J Guthrie
d5e6acaace On hover, change border to a subtle darker orange, increase strokeWidth 2018-11-02 01:23:37 +00:00
Tom Hughes
2e14b1106e Update to sassc 2.x 2018-11-01 22:41:06 +00:00
Tom Hughes
c26ecce7d3 Update bundle 2018-11-01 18:23:43 +00:00
Tom Hughes
0e7cc08c7b Merge remote-tracking branch 'upstream/pull/2037' 2018-11-01 18:01:25 +00:00
translatewiki.net
052fa33fb5 Localisation updates from https://translatewiki.net. 2018-11-01 08:19:56 +01:00
Tom Hughes
6142980d07 Fix new rubocop warnings 2018-10-31 19:14:39 +00:00
Tom Hughes
00f82918e6 Update bundle 2018-10-31 19:14:39 +00: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
Andy Allan
b54362d458 Use deliver_later for all email sending 2018-10-31 16:38:12 +01:00
Andy Allan
801522c5c3 Set up Delayed Job as the backend for Active Job 
This persists jobs into the database, and uses locking to ensure that
workers from multiple machines avoid treading on each other.

Jobs can be run by using `bundle exec rake jobs:work`

Fixes #2015
 2018-10-31 15:31:32 +01:00
Andy Allan
7a177cb03f Fix error messages when users should not be able to do things 2018-10-31 11:42:49 +01:00
Andy Allan
41619593df Add testing for moderator users and issues 2018-10-31 11:41:32 +01:00
Andy Allan
149c07fd2b Remove unnecessary token granting from the user_preferences tests 
Sufficient permissions are granted by the basic authorisation, so this
isn't testing anything.
 2018-10-31 11:36:24 +01:00
Andy Allan
f11221f05b Merge branch 'master' into cancancan 2018-10-31 11:16:47 +01:00
Tom Hughes
82f3dc6823 Convert some model mixins to concerns 2018-10-29 19:14:55 +00:00
Tom Hughes
ad85a03e21 Update mailmap 2018-10-29 12:48:32 +00:00
Tom Hughes
22af018298 Update translation keys for renaming of user to users 2018-10-29 12:48:20 +00:00
translatewiki.net
d75a09f5bb Localisation updates from https://translatewiki.net. 2018-10-29 08:12:55 +01:00
translatewiki.net
03419e1cc4 Localisation updates from https://translatewiki.net. 2018-10-25 10:31:58 +02:00