Nenad Vujicic
b0ad96ebd4
Removed unused translation keys in users.*
...
Removed users.new.tou (added 9649b19
and has never been used), users.terms.decline replaced with users.terms.cancel and together with users.terms.continue started being used at /users/terms.html.erb (both were added at 9a9e13a
and removed at 1be8d59
)
2024-09-24 16:03:23 +02:00
Tom Hughes
578a3aebaf
Merge remote-tracking branch 'upstream/pull/5225'
2024-09-19 18:05:14 +01:00
Anton Khorev
6595d43e3c
Merge branch 'pull/5117'
2024-09-19 16:49:29 +03:00
Anton Khorev
1c88a0b136
Don't use ?: in "Comment from user" changeset discussion strings
2024-09-19 15:59:03 +03:00
Nenad Vujicic
091bf88a5f
Added greeting to friendship notification
...
Added greeting 'Hi {user display name},' to friendship notification email. As a side effect, user_mailer.friendship_notification.hi is not anymore reported as unused.
2024-09-17 23:20:41 +02:00
Tom Hughes
fe96c0a524
Replace creation_ip with creation_address
2024-09-15 19:38:21 +01:00
Tom Hughes
33c0e95ebe
Merge remote-tracking branch 'upstream/pull/5203'
2024-09-15 19:30:22 +01:00
Tom Hughes
3025500b9c
Merge remote-tracking branch 'upstream/pull/5214'
2024-09-15 19:08:31 +01:00
Nenad Vujicic
8d77891fd6
Show friend options only when user is logged in
...
Fixes #5199 . Displays "Add Friend" and "Unfriend" links (buttons) on user profile page only if user is logged-in.
2024-09-14 22:48:31 +02:00
Anton Khorev
ed74bc036b
Fix browse elements timeouts
2024-09-14 18:03:48 +03:00
Anton Khorev
54c0361744
Always show changeset element page links below headings
2024-09-14 17:15:11 +03:00
Tom Hughes
70f1b327b4
Merge remote-tracking branch 'upstream/pull/5178'
2024-09-13 18:09:37 +01:00
Tom Hughes
17bea98e19
Merge remote-tracking branch 'upstream/pull/5189'
2024-09-11 17:13:56 +01:00
Tom Hughes
b34e71f1d9
Merge remote-tracking branch 'upstream/pull/5186'
2024-09-11 17:12:13 +01:00
Tom Hughes
c6e12b541b
Merge remote-tracking branch 'upstream/pull/5184'
2024-09-11 17:06:15 +01:00
Anton Khorev
138988860c
Replace 'remove this redaction' confirmation and request with Turbo
2024-09-11 17:43:37 +03:00
Nenad Vujicic
02b4aea509
Pulled out ?: operator from tr in changesets/index
...
Pulled out ?: operator from tr in changesets/index.html.erb, so, changesets.index.{empty, empty_area, empty_user, no_more, no_more_area, no_more_user} translation keys are not more reported as unused.
2024-09-11 13:23:19 +02:00
Anton Khorev
418615bce7
Add New Redaction button to redactions page
2024-09-11 14:14:35 +03:00
Anton Khorev
de344eea83
Rename _blocks partial template to _page
2024-09-11 13:38:02 +03: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
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
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
8a84825b02
Fix changeset comments feed timeout
2024-09-09 19:14:51 +03: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
Nenad Vujicic
ef2c6ef026
Improved error reporting when trace upload fails
...
Fixes #2630 . Added supported file formats below Choose File
(traces/new.html.erb) and improved error / success messages.
2024-09-06 14:07:05 +02: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
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
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
17bc0853a0
Drop support for OAuth 1
2024-09-01 03:43:02 +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