cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15095 commits 4 branches 1 tag 499 MiB
Commit graph

3564 commits

Author SHA1 Message Date
Anton Khorev
3d79f9fd88 Make a generic preferred color scheme method 2024-12-01 04:58:00 +03:00
Anton Khorev
bad03267c1 Add site color scheme select to preferences form 2024-12-01 04:40:01 +03:00
Anton Khorev
d0b8278c4a Show site color scheme on user preferences page 2024-12-01 04:39:51 +03:00
Anton Khorev
2ca74ab3ef Add auto/manual color scheme stylesheets depending on user preferences 2024-12-01 03:55:19 +03:00
Andy Allan
ce342fede0 Move html_safe declaration for user_mailer from layout to helper 
This allows us to enable output safety checks for all code within
erb files.

`rubocop --auto-gen-config` ignores code within the erb files, so
it is easier to maintain an exclusion on the helper than inside
the layout.
 2024-11-27 18:04:32 +00:00
Anton Khorev
aca9bd205e Add subscribe/unsubscribe buttons to note pages 2024-11-22 00:55:41 +03:00
Anton Khorev
a25b7953b3 Merge branch 'pull/5297' 2024-11-18 18:15:25 +03:00
Emin Kocan
738e66afa6 Add status filter to user's note page 2024-11-18 15:21:55 +01:00
Andy Allan
22942b1ca1
Merge pull request #5333 from AntonKhorev/auth-buttons-same-as-preferred 
Style small auth buttons similarly to preferred auth buttons
 2024-11-15 16:15:05 +00:00
Anton Khorev
24ccba60cb Style small auth buttons similarly to preferred auth buttons 2024-11-15 19:09:57 +03:00
Anton Khorev
cfe08d42d6 Set colors for trace visibility badges using .text-bg-* 2024-11-15 18:09:03 +03:00
Andy Allan
ae00fa84c8 Merge pull request #4761 from AntonKhorev:dark-mode-with-close-button 
Enable dark theme if user prefers dark color scheme - no javascript version
 2024-11-13 20:26:47 +00:00
Andy Allan
7f611b295f
Merge pull request #5151 from AntonKhorev/no-history-and-export-buttons 
Move History and Export buttons to secondary nav
 2024-11-13 19:15:59 +00:00
Tom Hughes
a42b654606 Make the "remember me" option work as intended 2024-11-13 12:18:23 +00:00
Anton Khorev
a05692a3f6 Restore loading spinner in richtext previews 2024-11-08 15:04:38 +03:00
Anton Khorev
7d46203f5f Decrease padding between close button and inputs in directions form 2024-10-25 18:22:36 +03:00
Anton Khorev
566fb06709 Don't show older/newer buttons if all items fit on one page 2024-10-21 14:51:35 +03:00
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
414b01d310 Remove .btn-group wrapping Edit button 2024-09-03 03:32:33 +03:00