Commit graph

9709 commits

Author SHA1 Message Date
Tom Hughes
09defac787 Update COP names 2019-12-18 22:46:56 +00:00
Tom Hughes
aa7256d617 Update to rails 6.0.2.1 2019-12-18 22:15:59 +00:00
Tom Hughes
01a506a254 Merge remote-tracking branch 'upstream/pull/2466' 2019-12-18 18:29:36 +00:00
Tom Hughes
32fa124698 Merge remote-tracking branch 'upstream/pull/2452' 2019-12-18 18:23:42 +00:00
Andy Allan
c4c1f8ded3 Reformat params hashes to avoid super-long lines 2019-12-18 15:58:37 +01:00
Andy Allan
2722cc60be Move Style/Documentation into the main config file
I don't think anyone intends to write documentation for the app
2019-12-18 15:34:11 +01:00
Tom Hughes
6f8966e7c1 Note events use "opened" not "open" as the status 2019-12-16 22:26:33 +00:00
Tom Hughes
e7dbab2b82 Rename translations for trace#delete to trace#destroy
Fixes #2465
2019-12-16 22:12:13 +00:00
Tom Hughes
4ee60c0f8f Make all translation lookup errors throw exceptions in test mode 2019-12-16 21:54:11 +00:00
Tom Hughes
ac6a872a48 Avoid errors when /edit is called on an invalid object 2019-12-16 21:23:09 +00:00
translatewiki.net
60e1ddb6be Localisation updates from https://translatewiki.net. 2019-12-16 16:08:08 +01:00
Tom Hughes
1e4ced7c10 Update to rails 6.0.2 2019-12-13 18:54:06 +00:00
Tom Hughes
ae46cdc665 Update bundle 2019-12-13 18:53:32 +00:00
Tom Hughes
a2ad08b2e2 Use correct link for settings page 2019-12-12 19:12:38 +00:00
Tom Hughes
9153fd3559 Fix link in error page when a user has public edits disabled 2019-12-12 18:50:30 +00:00
translatewiki.net
aab9473f69 Localisation updates from https://translatewiki.net. 2019-12-12 15:36:38 +01:00
Tom Hughes
cfbd10b27b Fix rubocop warning 2019-12-11 17:48:37 +00:00
Tom Hughes
061231ec7e Switch back to the upstream actionpack-page_caching gem 2019-12-11 17:31:35 +00:00
Tom Hughes
2f419c7ab0 Merge remote-tracking branch 'upstream/pull/2461' 2019-12-11 17:31:16 +00:00
Andy Allan
040302286f Remove ignoring of nearby column
This is the final stage in the process. Now that the migrations are run,
and apps restarted, it is safe to remove the ignore_column declaration.
2019-12-11 18:08:31 +01:00
Tom Hughes
c56f7a37fc Merge remote-tracking branch 'upstream/pull/2460' 2019-12-11 16:36:40 +00:00
Andy Allan
13f0591605 Wrap table header rows in thead 2019-12-11 17:22:23 +01:00
Tom Hughes
3955338682 Merge remote-tracking branch 'upstream/pull/2459' 2019-12-11 16:00:14 +00:00
Andy Allan
efa5f6d4b6 Use a new colour name for the vibrant greens 2019-12-11 16:51:04 +01:00
Andy Allan
c0f5e4ede8 Use paramatered colours for greys 2019-12-11 16:20:16 +01:00
Andy Allan
9b6114ab0b Combine the two different offwhite background colours, and use the lighter one 2019-12-11 15:57:23 +01:00
Tom Hughes
7531060a12 Use squiggly heredocs 2019-12-11 10:40:41 +00:00
Tom Hughes
48463e60cb Merge remote-tracking branch 'upstream/pull/2458' 2019-12-11 10:21:08 +00:00
Andy Allan
7595e5a4dd Use squiggly heredocs instead of rails strip_heredoc
Squiggly heredocs were introduced in ruby 2.3 and I prefer the ability
to indent the closing heredoc marker.
2019-12-11 10:54:19 +01:00
Andy Allan
ec5039d9cc Use bootstrap typography 2019-12-11 10:24:57 +01:00
Andy Allan
dc96834ebb Use bootstrap cards to spruce up the help page 2019-12-11 10:24:57 +01:00
Andy Allan
01faa2e287 Custom bootstrap with all components disabled
This lets us work through things slowly as we use more features
2019-12-11 10:24:57 +01:00
Andy Allan
7f9dacbada Add bootstrap 4 2019-12-11 10:24:57 +01:00
Andy Allan
cffff1635d Rename bootstrap-tooltips file
This avoids clashing with including upstream bootstrap
2019-12-11 10:24:05 +01:00
translatewiki.net
b9d9785330 Localisation updates from https://translatewiki.net. 2019-12-09 16:02:49 +01:00
Tom Hughes
d3373754f0 Update bundle
Closes #2454
2019-12-06 07:09:49 +00:00
translatewiki.net
59f53f18b0 Localisation updates from https://translatewiki.net. 2019-12-05 15:35:38 +01:00
Tom Hughes
86b355c4df Use delete method correctly when deleting traces
Fixes #2453
2019-12-04 21:06:19 +00:00
Tom Hughes
fc8189685e Fix erblint warnings 2019-12-04 19:58:21 +00:00
Tom Hughes
57f5b7840e Fix rubocop warnings 2019-12-04 19:31:53 +00:00
Tom Hughes
743a764f3b Remove version lock on autoprefixer-rails 2019-12-04 19:01:26 +00:00
Tom Hughes
95c3e3b6ff Update bundle 2019-12-04 18:42:47 +00:00
Tom Hughes
6a68e7676d Merge remote-tracking branch 'upstream/pull/2451' 2019-12-04 16:08:26 +00:00
Andy Allan
35370684e5 Make the back button link to the inbox when reading received messages 2019-12-04 16:42:57 +01:00
Andy Allan
f1c6a87aa1
Merge pull request #2427 from mmd-osm/patch/remove_expand_bbox
Remove expand_bbox endpoint
2019-12-04 12:48:34 +01:00
Tom Hughes
ff3abf5dd8 Merge remote-tracking branch 'upstream/pull/2450' 2019-12-04 11:33:31 +00:00
Andy Allan
44c6fdc273 Use the conventional 'destroy' method name for destroying traces 2019-12-04 11:59:18 +01:00
Tom Hughes
dba3940571 Replace content_tag_for with a simple tr element 2019-12-03 22:54:55 +00:00
translatewiki.net
40809825e8 Localisation updates from https://translatewiki.net. 2019-12-02 09:39:56 +01:00
translatewiki.net
32b5a398a5 Localisation updates from https://translatewiki.net. 2019-11-28 16:50:26 +01:00