Commit graph

13728 commits

Author SHA1 Message Date
Anton Khorev
a01fbed6d9 Fix module name of trace tests 2024-03-28 08:42:01 +03:00
Tom Hughes
99bed16f9a Merge remote-tracking branch 'upstream/pull/4629' 2024-03-27 17:58:46 +00:00
Anton Khorev
180a61bcc3 Move trace pictures/icons into their own controllers 2024-03-27 13:25:28 +03:00
Tom Hughes
af5d76ecab Merge remote-tracking branch 'upstream/pull/4625' 2024-03-26 18:32:52 +00:00
Tom Hughes
ae70bb7689 Merge remote-tracking branch 'upstream/pull/4626' 2024-03-26 18:22:16 +00:00
Tom Hughes
f4b8510744 Merge remote-tracking branch 'upstream/pull/4622' 2024-03-26 18:17:05 +00:00
Tom Hughes
8519ef12da Merge remote-tracking branch 'upstream/pull/4621' 2024-03-26 18:14:04 +00:00
Tom Hughes
4145d72be9 Update bundle 2024-03-26 17:35:08 +00:00
Anton Khorev
02c5ca6972 Add links for admins from user page to user list filtered by ip/status 2024-03-26 06:12:16 +03:00
Anton Khorev
f0d05c20ae Add found users count to users page 2024-03-26 05:44:35 +03:00
Anton Khorev
9f8e4fd60a Use before/after pagination on users page 2024-03-26 05:44:35 +03:00
Anton Khorev
274a516bc6 Make "include" and "limit" keyword args of pagination method 2024-03-26 04:41:07 +03:00
Anton Khorev
addf99f191 Move common pagination code to mixin 2024-03-26 02:36:28 +03:00
Anton Khorev
604bba10ec Remove assert_method from api controllers 2024-03-25 07:15:16 +03:00
Anton Khorev
1e9d390c1e Replace lookup_user_by_id with load_resource 2024-03-25 06:29:46 +03:00
Tom Hughes
65d8d12a4d Merge remote-tracking branch 'upstream/pull/4619' 2024-03-24 18:38:48 +00:00
Tom Hughes
8ce4aabf28 Merge remote-tracking branch 'upstream/pull/4620' 2024-03-24 18:13:47 +00:00
Anton Khorev
23e00dc4c7 Shorten note path helper calls in tests 2024-03-24 17:19:05 +03:00
Anton Khorev
2cf3861931 Replace collection partial with single item in changeset comments feed 2024-03-24 07:08:59 +03:00
Tom Hughes
b2acd6e49c Merge remote-tracking branch 'upstream/pull/4612' 2024-03-21 17:25:41 +00:00
Anton Khorev
9c0d74fe69 Simplify and test downloaded changeset element sorting 2024-03-21 20:02:18 +03:00
Tom Hughes
32ab099c35 Merge remote-tracking branch 'upstream/pull/4562' 2024-03-21 16:38:18 +00:00
Tom Hughes
44312c221b Merge remote-tracking branch 'upstream/pull/4609' 2024-03-21 16:32:36 +00:00
Tom Hughes
dd27022a35 Merge remote-tracking branch 'upstream/pull/4608' 2024-03-21 16:30:21 +00:00
Anton Khorev
b8f5a495f2 Simplify remaining link_to ... user_path in views 2024-03-21 18:07:56 +03:00
Anton Khorev
ff8fbcbdc5 Simplify links on diary pages 2024-03-21 17:30:59 +03:00
Andy Allan
0dc86d6cd4
Merge pull request #4602 from AntonKhorev/no-lego-trace-details
Avoid lego translation in trace time/user/tags string
2024-03-21 14:01:13 +00:00
Andy Allan
f472e432e0
Merge pull request #4607 from AntonKhorev/fix-traces-tabs
Fix user's traces tab
2024-03-21 14:00:41 +00:00
Gregory Igelmund
045209fade Nest data-turbo="true" attributes in partials 2024-03-21 14:55:16 +01:00
Gregory Igelmund
6c4968eafd Remove now-obsolete partials in app/views/messages/* 2024-03-21 14:55:16 +01:00
Gregory Igelmund
f3a31e00d4 application.js: Call updateHeader when turbo:render completed 2024-03-21 14:55:16 +01:00
Gregory Igelmund
1a7b7f5d18 Enable Turbo Drive with morphing for Messages#{destroy,mark} 2024-03-21 14:55:16 +01:00
Gregory Igelmund
f0af7d3cff Gemfile: Add turbo-rails 2024-03-21 14:55:15 +01:00
Anton Khorev
919fcef149 Fix user's traces tab link 2024-03-21 16:43:15 +03:00
Anton Khorev
50047a6c78 Change user's traces tab label to a string without "GPX" 2024-03-21 16:19:05 +03:00
Tom Hughes
fda99ba304 Merge remote-tracking branch 'upstream/pull/4606' 2024-03-21 12:58:29 +00:00
translatewiki.net
d277e3fbde Localisation updates from https://translatewiki.net. 2024-03-21 13:19:52 +01:00
Gregory Igelmund
f665566574
Replace csp_meta_tag with secure_headers nonce 2024-03-21 12:33:00 +01:00
Andy Allan
f53b9b3336
Merge pull request #4604 from AntonKhorev/block-factory-revoked-expired
Make factory-created revoked blocks inactive
2024-03-21 10:43:00 +00:00
Anton Khorev
3a05667d45 Make factory-created revoked blocks inactive 2024-03-21 06:11:24 +03:00
Anton Khorev
76a46824a4 Avoid lego translation in trace time/user/tags string 2024-03-21 01:34:46 +03:00
Tom Hughes
8da80ff471 Merge remote-tracking branch 'upstream/pull/4600' 2024-03-20 17:22:00 +00:00
Andy Allan
b95c4ed5f9
Merge pull request #4599 from AntonKhorev/rename-messages-local
Rename message local in message table partials
2024-03-20 17:20:57 +00:00
Andy Allan
bb3afad2c9
Merge pull request #4598 from AntonKhorev/fix-trace-description
Fix trace feed image urls and local variable names
2024-03-20 17:11:37 +00:00
Andy Allan
d04852fa47 Fix warning on unescaped hyphen in regexp 2024-03-20 17:05:28 +00:00
Anton Khorev
1df250e3e4 Rename message local in message table partials 2024-03-20 19:43:32 +03:00
Anton Khorev
4dcbe9e0a9 Rename trace local in trace description partial 2024-03-20 18:49:10 +03:00
Andy Allan
d115a1a7d7
Merge pull request #4574 from urbalazs/wiki-prefixes-240313
Add more wiki prefixes
2024-03-20 15:45:10 +00:00
Anton Khorev
1ca91ecbac Use absolute paths to trace icon in traces feed 2024-03-20 18:34:15 +03:00
Andy Allan
edd8bf7739
Merge pull request #4592 from AntonKhorev/simplify-link_to-on-block-pages
Simplify link_to user calls on block pages
2024-03-20 14:44:42 +00:00