Commit graph

8346 commits

Author SHA1 Message Date
Wille Marcel
e3357b27e6 Add banner for SotM Latam 2016 2016-09-13 14:49:40 +01:00
Niklas Laxström
03e615eab3 Localisation updates from https://translatewiki.net. 2016-09-13 08:12:49 +02:00
Tom Hughes
f02729fa9a Merge remote-tracking branch 'openstreetmap/pull/1279' 2016-09-08 19:26:07 +01:00
Tom Hughes
f3f1687fa3 Add thunderforest API key to example configuration 2016-09-08 18:20:21 +01:00
Tom Hughes
e0dd431e6c Propagate API keys to minimaps in layer switcher 2016-09-08 17:35:37 +01:00
Tom Hughes
322e7142ba Hide thunderforest layers when no API key is available 2016-09-08 17:28:54 +01:00
Tom Hughes
3eda7be919 Use an API key for thunderforest tile layers 2016-09-08 16:16:45 +01:00
Andy Allan
ea610c8c3c Refactor tests to use factories instead of fixtures 2016-09-08 11:44:24 +01:00
Andy Allan
4f5c8b7956 Change the display_name of suspended user fixuture
The original name is reserved, which means the user was invalid,
and this causes problems when building objects using it via
associations.
2016-09-08 11:40:03 +01:00
Andy Allan
04591aed9f Test DiaryComment body validation
Replaces unnecessary test.
2016-09-08 10:01:11 +01:00
Niklas Laxström
ef8eb034d0 Localisation updates from https://translatewiki.net. 2016-09-08 10:36:22 +02:00
Andy Allan
191f6b3fcd Build a diary entry more succinctly 2016-09-08 09:06:46 +01:00
Andy Allan
bb15077dcc Assert there are no diary comments before creating one. 2016-09-08 09:06:26 +01:00
Andy Allan
ab12b6161a Update name of test 2016-09-08 08:58:18 +01:00
Andy Allan
3b3f328ae4 Rework DiaryEntry and DiaryComment model tests to use factories.
Since the database also contains fixtures from other tests, some
counts are dropped and instead tested for inclusion in the results.
2016-09-07 16:27:21 +01:00
Andy Allan
d5013ad0d2 Add FactoryGirl 2016-09-07 15:28:28 +01:00
Andy Allan
5ec11d3571 Update offense counts in rubocop_todo.yml 2016-09-07 11:08:20 +01:00
Andy Allan
d63dba03ce Add xml builder files to rubocop. 2016-09-07 11:07:56 +01:00
Andy Allan
38e12759ea Rubocop autofixes. 2016-09-07 11:07:42 +01:00
Andy Allan
e6f06f0515 Add outer variable shadowing to rubocop_todo.yml 2016-09-07 11:06:27 +01:00
Andy Allan
6cc4f4506b Use .present? instead of double negative to check if terms_agreed timestamp is set. 2016-09-07 11:02:20 +01:00
Andy Allan
924f9fa083 User.consider_pd is boolean, so no need for double negation. 2016-09-07 10:59:00 +01:00
Tom Hughes
dbeccba968 Update schema 2016-09-05 08:17:11 +01:00
Niklas Laxström
958a7766ca Localisation updates from https://translatewiki.net. 2016-09-05 07:42:09 +02:00
Tom Hughes
9f817f8364 Set banner expiry correctly 2016-08-23 19:23:58 +01:00
Matt Amos
119016255e More cleanup after tests. 2016-08-22 19:05:11 +01:00
Matt Amos
82ac68a26e Revert changes to old migration. 2016-08-22 18:48:48 +01:00
Matt Amos
c3ad6aa292 More whitespace fixes. Attempting to get tests to pass. 2016-08-22 18:38:03 +01:00
Matt Amos
757a1aaa85 Made rubocop happy by formatting and minor syntax tweaks. 2016-08-22 17:24:10 +01:00
Matt Amos
5cc0eba3f1 Reordered migrations to make them the latest. 2016-08-22 16:32:54 +01:00
Frederik Ramm
f3519e9781 fix build on wily; fix some moderation branch language constants 2016-08-22 16:19:14 +01:00
Shrey
49050467cc Update en-GB.yml
(cherry picked from commit aa061104cb0355f74d5e447b4dd5ffb1554ffb19)
2016-08-22 16:18:15 +01:00
emacsen
788d9c1f53 Update en.yml
Replace placeholder language with something closer to finalized language
(cherry picked from commit 1ef7ea1890e91e93c04b0d99e4e84269147101bf)
2016-08-22 16:18:15 +01:00
Shrey
916f2c9036 Added helper + minor UI changes
(cherry picked from commit 3a6550ff54eb08ec282d13ebf85dc3461cca2983)
2016-08-22 16:18:15 +01:00
Shrey
81b6599830 Fixed related issues positioning
(cherry picked from commit 156e678dc6dccdf36912ffa16264eb0967a4d5a6)
2016-08-22 16:18:15 +01:00
Shrey
ed84930283 UI changes + Redirection after creating report fixed
(cherry picked from commit 987fcf0ba5e7e914dc479e9dc7613400e72148a0)
2016-08-22 16:18:15 +01:00
Shrey
eb79b15681 Fixed error
(cherry picked from commit 99f8a765b8303115c8633fdc9e3c4edc77cbc32d)

Conflicts:
	app/controllers/issues_controller.rb
2016-08-22 16:18:15 +01:00
Shrey
b598979374 Changed report button + Added disclaimer on report page + Added search filter 2016-08-22 16:18:15 +01:00
Shrey
69c1f6d186 Added sortable headers + search + reportable Notes 2016-08-22 16:18:15 +01:00
Shrey
206e1309a9 Added report icon + changes to admin UI + changes to report form + few other minor changes 2016-08-22 16:17:54 +01:00
Shrey
732e1ab03a Fixed link to DiaryComments 2016-08-22 16:17:54 +01:00
Shrey
4b4b67aa96 Added report strings for Changesets and Notes + minor controller changes 2016-08-22 16:17:54 +01:00
Shrey
b17f9a6157 Fixed an error + Added email notifications for moderators 2016-08-22 16:17:54 +01:00
Shrey
b68b29b43c Added support for reporting Changesets + Deleting issues from the CLI 2016-08-22 16:17:54 +01:00
Shrey
cf639202b8 Added a few more tests 2016-08-22 16:17:54 +01:00
Shrey
25737ce46e Added a few tests 2016-08-22 16:17:54 +01:00
Shrey
965f32d545 Fixed existing tests 2016-08-22 16:17:54 +01:00
Shrey
e74163d036 Replaced check_box_tags with radio_button 2016-08-22 16:17:54 +01:00
Shrey
dc173881e5 Small changes 2016-08-22 16:17:54 +01:00
Shrey
f72c34aaf8 Added Issue Type + Issue Reassigning + Last updated_by 2016-08-22 16:17:54 +01:00