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 |
|
mmd-osm
|
fe644bbd72
|
Include num_changes in changeset xml response
|
2018-08-14 10:57:13 +02:00 |
|
Tom Hughes
|
98de681e47
|
Update to rails 5.2.0
|
2018-06-19 00:16:24 +01:00 |
|
Tom Hughes
|
e5604ce98e
|
Assign vandalism reports for users to moderators
|
2018-06-17 11:14:19 +01:00 |
|
Tom Hughes
|
6c225bd01c
|
Only include issues visible to the current user in the count
|
2018-06-17 01:01:24 +01:00 |
|
Tom Hughes
|
d3700e6201
|
Merge branch 'master' into next
|
2018-06-10 17:02:12 +01:00 |
|
Tom Hughes
|
f227804093
|
Add some extra indexes on issues
|
2018-06-10 15:25:53 +01:00 |
|
J Guthrie
|
30756f72ca
|
Change language immediately after updating settings
Closes #1883
|
2018-05-27 15:12:34 +01:00 |
|
Andy Allan
|
4ec70f7994
|
Rename messages#read to #show
Also rename the named path, to align with resourceful routing
|
2018-05-15 18:25:54 +08:00 |
|
Andy Allan
|
011cfa794a
|
Use named paths for messages
|
2018-05-09 11:24:11 +08:00 |
|
Andy Allan
|
713de1fadb
|
Set default_url_options for action_mailer
This saves having to repeat the same host and protocol options
throughout the notifiers
|
2018-04-11 15:53:30 +08:00 |
|
Andy Allan
|
7dbf8d8336
|
Merge branch 'master' into moderation
|
2018-04-11 09:54:04 +08:00 |
|
Tom Hughes
|
1f2ac59d1d
|
Fix new rubocop warnings
|
2018-03-26 19:00:03 +01:00 |
|
Andy Allan
|
ee1a8637d3
|
Convert issue status to an enum
|
2018-03-21 12:05:08 +08:00 |
|
Andy Allan
|
9f84c6f46e
|
Use user_path links. Fixes #1785
|
2018-03-21 11:33:45 +08:00 |
|
Andy Allan
|
facce9d0bb
|
Refactor set_default_assigned_role to be more easily read.
|
2018-03-14 17:35:58 +08:00 |
|
Andy Allan
|
5310c7000c
|
Remove cascading deletes, add another foreign key, and switch index around.
|
2018-03-14 16:15:39 +08:00 |
|
Andy Allan
|
3e5a4a14df
|
Ensure reports have an issue id and a user id
|
2018-03-14 15:36:46 +08:00 |
|
Andy Allan
|
5e7abf67fb
|
Remove nonsense has_one relationship
|
2018-03-14 15:20:04 +08:00 |
|
Andy Allan
|
e85110957a
|
Remove vandalism as an option for reporting notes.
|
2018-03-14 12:51:22 +08:00 |
|
Tom Hughes
|
276859d0c9
|
Validate user location is sensible
|
2018-03-04 10:53:14 +00:00 |
|
Tom Hughes
|
9361478e74
|
Use home_tile to find nearby users
|
2018-03-04 09:59:24 +00:00 |
|
Tom Hughes
|
f1e9dcc66a
|
Add an indexed home_tile column to the user table
|
2018-03-04 09:59:23 +00:00 |
|
Andy Allan
|
a20e28809f
|
Merge branch 'master' into moderation
|
2018-02-28 15:55:28 +08:00 |
|
Andy Allan
|
424b6ef1cf
|
Merge branch 'master' into moderation
|
2018-02-28 15:46:25 +08:00 |
|
Andy Allan
|
3006ce9713
|
Remove reporting of changesets
|
2018-02-28 14:39:40 +08:00 |
|
Andy Allan
|
80a241f798
|
Allow reporting of anonymous notes
|
2018-02-28 14:26:40 +08:00 |
|
Tom Hughes
|
81241b3083
|
Exclude hidden diary entries and comments from spam scoring
|
2018-02-26 22:35:06 +00:00 |
|
mmd-osm
|
cea403dce0
|
Remove BBOX expansion performance optimization
Closes #1749
Fixes #1742
|
2018-02-14 17:23:06 +00:00 |
|
Tom Hughes
|
5d03c3899f
|
Use configured server protocol for links in e-mail notifications
Closes #1341
|
2018-02-05 21:01:36 +00:00 |
|
Tom Hughes
|
a83030dab7
|
Fix new rubocop warnings
|
2018-01-22 18:55:45 +00:00 |
|
Andy Allan
|
ae44879213
|
Merge branch 'master' into moderation
|
2018-01-21 11:20:19 +00:00 |
|
Tom Hughes
|
be86e4824f
|
Convert various URLs to https
|
2018-01-08 20:18:21 +00:00 |
|
Andy Allan
|
e0faf68437
|
Remove new issue notifications for now
This can be re-implemented later.
|
2017-12-13 16:29:46 +00:00 |
|
Andy Allan
|
63992d83bd
|
Store the report category.
|
2017-12-13 16:02:55 +00:00 |
|
Andy Allan
|
8dc8479e12
|
Re-enable issue reassigning.
|
2017-12-06 18:01:51 +00:00 |
|
Andy Allan
|
cbe707b33e
|
Validate the assigned role, and remove the :type activrecord enum
|
2017-12-06 17:15:11 +00:00 |
|
Andy Allan
|
0df788d742
|
Rename 'issue_type' to 'assigned_role', set defaults in the model and test.
|
2017-12-06 17:15:11 +00:00 |
|
Tom Hughes
|
2c52c91b39
|
Make changeset#query preload users, tags and comments
|
2017-12-04 07:54:19 +00:00 |
|