Tom Hughes
1a5fb52c28
Merge remote-tracking branch 'upstream/pull/5116'
2024-09-10 18:42:21 +01:00
Tom Hughes
091e0c21ef
Merge remote-tracking branch 'upstream/pull/5150'
2024-09-10 18:42:21 +01:00
Tom Hughes
039b3e1c32
Merge remote-tracking branch 'upstream/pull/5180'
2024-09-10 18:42:21 +01:00
Tom Hughes
173ed570b9
Merge remote-tracking branch 'upstream/pull/5179'
2024-09-10 18:42:20 +01:00
Tom Hughes
95d99d0faf
Merge remote-tracking branch 'upstream/pull/5168'
2024-09-10 18:42:19 +01:00
Anton Khorev
28886a1ba3
Mark flash messages as temporary
2024-09-10 12:24:08 +03:00
Anton Khorev
7d1b73ea93
Refactor flash template
2024-09-10 12:13:22 +03:00
Anton Khorev
c661bbf7db
Adapt richtext javascript to Turbo
2024-09-10 11:48:48 +03:00
Anton Khorev
cb65cd9adc
Guess translation scope from controller name if not provided
2024-09-10 10:51:50 +03:00
Anton Khorev
7633657ecb
Pass translation scope instead of keys to shared pagination
2024-09-10 10:37:36 +03:00
Anton Khorev
2d18a802ef
Move ?: operator outside of t() for "Only ... can edit" block messages
2024-09-08 13:40:54 +03:00
Anton Khorev
8b024f48c1
Disable redactions with write_api scope
...
Requires write_redactions scope to redact. Previously it was possible to redact with either write_redactions or write_api.
2024-09-08 12:31:31 +03:00
Tom Hughes
1fce0c00f1
Merge remote-tracking branch 'upstream/pull/5164'
2024-09-06 17:05:02 +01:00
Tom Hughes
0473288b14
Merge remote-tracking branch 'upstream/pull/5163'
2024-09-06 17:04:35 +01:00
Tom Hughes
ef861715d1
Merge remote-tracking branch 'upstream/pull/5161'
2024-09-06 17:02:13 +01:00
Anton Khorev
8b0c188841
Remove :edit abilities implied by :update abilities
2024-09-06 09:28:52 +03:00
Anton Khorev
da28c0e561
Remove Oauth::OAUTH2_SCOPES
...
After OAuth1 was removed, all scopes are OAuth2 scopes. Former OAuth2-only scopes now can be combined with the rest.
2024-09-06 09:14:54 +03:00
Anton Khorev
dcb0369788
Merge branch 'pull/5115'
2024-09-06 06:04:25 +03:00
Anton Khorev
6a77a78d19
Remove unnecessary site.about locale scope from About page
2024-09-06 00:49:09 +03:00
Anton Khorev
e7fb89c8d0
Remove nil ApiCapability user branch
2024-09-05 23:21:24 +03:00
Anton Khorev
ccc70fb914
Remove OAuth 1 ApiCapability user branch
2024-09-05 23:16:01 +03:00
Anton Khorev
7f9cccf038
Remove node.tags_as_hash method
2024-09-03 04:27:07 +03:00
Anton Khorev
e9148e56eb
Use svg icons in pagination for note lists
2024-09-03 02:10:43 +03:00
Anton Khorev
6f074c9f20
Use Bootstrap pagination for note lists
2024-09-03 01:48:34 +03:00
Anton Khorev
2f5272639e
Move note paging locale strings to notes scope
2024-09-03 01:38:17 +03:00
Anton Khorev
b816bad726
Merge branch 'pull/5141'
2024-09-03 01:03:13 +03:00
Tom Hughes
973d62a25e
Drop support for basic authentication
2024-09-02 19:00:57 +01:00
Anton Khorev
96b365dd6f
Merge branch 'pull/5149'
2024-09-02 18:05:26 +03:00
Nenad Vujicic
005add9f49
Fixed bug when requested missing changeset
...
Fixes #5148 . Added forgotten @type = "changeset" in ChangesetsController#show.
2024-09-02 15:42:52 +02:00
mmd-osm
3d3e143811
I18n: messages: avoid dynamic translation keys
...
By moving the translation outside the loop and calling t(...) with
explicitly stated keys, `bundle exec i18n-tasks unused` no longer
reports the keys as unused.
2024-09-02 06:55:21 +02:00
Tom Hughes
0a9dc1651e
Merge remote-tracking branch 'upstream/pull/5136'
2024-09-01 10:53:04 +01:00
Tom Hughes
33a2ccf560
Merge remote-tracking branch 'upstream/pull/5135'
2024-09-01 10:51:50 +01:00
Tom Hughes
17bc0853a0
Drop support for OAuth 1
2024-09-01 03:43:02 +03:00
Anton Khorev
a638220ff7
Remove unused reference to missing gps layer name
2024-09-01 01:17:12 +03:00
Anton Khorev
9ed6a9d779
Fix page title for failed trace updates
2024-08-31 19:13:27 +03:00
Nenad Vujicic
c816efc386
Compacted repeated "Results" into one sentence
...
Fixes #5065 . Removed "Results from" from search results.
2024-08-30 01:54:08 +02:00
Tom Hughes
549a46c867
Merge remote-tracking branch 'upstream/pull/5126'
2024-08-28 19:03:53 +01:00
Tom Hughes
5f2a5cadcb
Merge remote-tracking branch 'upstream/pull/4565'
2024-08-28 18:59:09 +01:00
Andy Allan
7fc83c880a
Merge pull request #5124 from tomhughes/turbo-issue-search
...
Use turbo to update issue search results
2024-08-28 18:52:10 +01:00
Tom Hughes
990b41cd4c
Merge remote-tracking branch 'upstream/pull/5120'
2024-08-28 18:38:34 +01:00
Andy Allan
10a4c5cf6e
Rename Feeds::ChangesetCommentsController to ChangesetComments::FeedsController
...
We usually create nested controllers with the main controller as the module,
and the nested controller as the specialization, e.g. Users::DeletionsController
or Traces::IconsController.
This then leaves the topic of whether the feed resource is plural, and whether we
are then showing a singular feed or showing a list (index) of objects.
The routes are carefully named so that we have `changesets_comments_feed_path` (the
comments feed for all changesets) vs `changeset_comment_feed_path(changeset)` (the
comments for a singular changeset).
2024-08-28 18:31:36 +01:00
Andy Allan
a948f2bc24
Merge pull request #4587 from AntonKhorev/changeset-comment-routes
...
Move changeset comments feed to resourceful routes
2024-08-28 18:30:11 +01:00
Andy Allan
b9988bdbc8
Merge pull request #5093 from AntonKhorev/diary-comments-shallow-paths
...
Use shallow routes for diary comments
2024-08-28 14:58:53 +01:00
Nenad Vujicic
4716800144
Allowed sending follow-ups for sent messages
...
Fixes #3497 . Adds Reply button when displaying sent messages (app/views/messages/show.html.erb) and allows replying to messages for which sender is current user (app/controllers/messages_controller.rb). Improved tests for testing added functionality.
2024-08-28 15:11:09 +02:00
Tom Hughes
9416317e64
Use turbo to update issue search results
2024-08-27 20:21:00 +01:00
nertc
3cf5667c91
Add turbo to Issues page
2024-08-27 11:50:43 +04:00
nertc
c32f6dd4ff
Add pagination to Issues page
2024-08-26 13:57:44 +04:00
Tom Hughes
ec5754a9bd
Merge remote-tracking branch 'upstream/pull/5110'
2024-08-23 18:09:21 +01:00
Tom Hughes
dd1c07f609
Merge remote-tracking branch 'upstream/pull/5111'
2024-08-23 18:01:27 +01:00
Tom Hughes
6704a6a0dc
Merge remote-tracking branch 'upstream/pull/5107'
2024-08-23 17:48:48 +01:00
