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

5813 commits

Author SHA1 Message Date
Michal Migurski
21eafac304 Fix erblint complaints 2021-06-16 15:55:55 +01:00
Tobias Jordans
f4e998804d Traces#index: Introduce tab navigation, fix tag-filter 
- introduce bootstrap tabs to switch the views
- introduce `content_for :heading_class` to remove the padding below the bootstrap tabs
- update the rss-image to use a svg, adopted from https://icons.getbootstrap.com/icons/rss/ (without the outer border)
- move rss- and new-button away from the view-switching actions
- the `@tag` logic was broken. introduce new link to remove the tag-filter; the tabs keep the filter once given; use params[:tag] directly in the view
- use `&.` syntax nil-safety so we can remove `@display_name`
 2021-06-16 15:55:55 +01:00
Tom Hughes
3fff377b00 Merge remote-tracking branch 'upstream/pull/3217' 2021-06-09 17:46:45 +01:00
Tom Hughes
616f3783df Merge remote-tracking branch 'upstream/pull/3216' 2021-06-09 17:46:11 +01:00
Andy Allan
63c82ed72f Set updated_by when resolving issues 
Refs #3211
 2021-06-09 15:47:31 +01:00
Andy Allan
7e5bbce23d
Merge pull request #3208 from osm-hr/update-rcn-color 
fix map key color for regional OpenCycleMap
 2021-06-09 15:29:57 +01:00
Andy Allan
71be435886 Fix case when user block durations are slightly negative 
The output from ActiveSupport::Duration is wildly unhelpful in those cases

Fixes #3210
 2021-06-09 15:16:35 +01:00
Andy Allan
5ce14cfa4d Ensure that short duration blockss are shown as '0 hours' 
Passing `:count => nil` means that i18n.t will return the hash of translations, so use a default value of 0 when checking for hours to prevent this.

Refs #3210
 2021-06-09 14:17:56 +01:00
Tom Hughes
baa32464cd Drop last vestiges of ruby 2.5 support 2021-06-08 20:33:25 +01:00
Tom Hughes
2c5e981684 Fix erblint warnings 2021-06-05 07:40:55 +01:00
Tom Hughes
17b5395e26 Fix new rubocop warnings 2021-06-01 18:27:50 +01:00
Matija Nalis
7b3c449b46 fix map key color for regional OpenCycleMap, as it changed from light cyan to purple on the map. 
Closes: https://github.com/openstreetmap/openstreetmap-website/issues/2785
 2021-05-25 22:48:38 +02:00
Tom Hughes
e2af9941a8 Fix downloading of image variants 2021-05-19 18:44:41 +01:00
Tom Hughes
0a15112423 Mark javascript issued cookies with SameSite=Lax 2021-05-17 19:06:43 +01:00
Tom Hughes
32cc04fa5c Switch to using js-cookie to manage cookies from javascript 2021-05-17 18:57:48 +01:00
Tom Hughes
cd5d54ce4e Use image_processing macros to resize images 2021-05-12 18:49:21 +01:00
Tom Hughes
bf851691bf Fix deprecation warnings 2021-05-12 18:49:21 +01:00
Tom Hughes
9603d718c2 Fix calculation of friendship rate limit 2021-05-11 15:49:48 +01:00
Tom Hughes
84c601460f Add rate limiting to user friendships 2021-05-11 12:10:36 +01:00
Tom Hughes
0e78061cdb Merge remote-tracking branch 'upstream/pull/3029' 2021-04-29 19:42:51 +01:00
Andy Allan
2955fe4d4b Refactor user blocks information to use a dl 
This also standardises the labels to have the colon, in common with
oauth_clients#show.
 2021-04-28 17:28:30 +01:00
Andy Allan
dbf35e0cf6 Merge branch 'pull/3146' 2021-04-28 16:03:57 +01:00
Andy Allan
02bfc46ab3 Move duration to its own line, so that it can be clearly labelled 2021-04-28 16:01:03 +01:00
Andy Allan
7158426ebb
Merge pull request #3169 from harry-wood/empty-lists 
Display message when the there are no notes/comments to display
 2021-04-28 10:36:09 +01:00
Andy Allan
28af501924 Merge branch 'pull/3164' 2021-04-14 16:13:29 +01:00
Andy Allan
6bb18436a3 Add tests for routing and to ensure output format 
This avoids the tests passing if the json output is an array of kv pairs,
instead of the desired hash of attributes.
 2021-04-14 16:11:57 +01:00
Harry Wood
95d682119a Display no diary comments message when empty 
Display a 'No diary comments' message when there are no diary comments to display, rather than an empty table.
 2021-04-10 00:47:20 +01:00
Harry Wood
de8ee536b1 Display no notes message when empty 
Display a 'No notes' message when there are no notes to display, rather than an empty table with pagination features.
 2021-04-09 19:21:09 +01:00
Andy Allan
b70da7b8ea
Merge pull request #1558 from plarus/master 
Add start url and indicate minimal-ui is sufficient when added as a PWA.
 2021-04-08 14:01:08 +01:00
Michal Migurski
143a90fcac Added root elements and dict support for preferences response 2021-04-07 17:45:24 -07:00
plarus
2b5e705006
Update manifest.json.erb 
Change for minimal-ui
 2021-04-07 19:45:58 +02:00
Tom Hughes
2d111c0f34 Merge remote-tracking branch 'upstream/pull/3166' 2021-04-07 16:44:06 +01:00
Andy Allan
6f2e3e9508 Add missing root attributes to User#show and User#index json responses 2021-04-07 16:30:08 +01:00
Andy Allan
094d6c8bb9 Move confirmation methods into ConfirmationsController 2021-04-07 16:05:32 +01:00
Andy Allan
7a66c6d4eb Split password reset functionality into PasswordsController 2021-04-07 16:05:28 +01:00
Michal Migurski
fd7526857b Updated JSON response format per feedback 2021-04-06 21:44:38 -07:00
Michal Migurski
a67ff9c038 Added JSON support to user preferences 2021-04-06 21:27:54 -07:00
Tom Hughes
e0d501f832 Don't allow deleted users to be confirmed 2021-04-01 17:28:03 +01:00
Tom Hughes
25510b6616 Add additional limits on sending messages 
Additional limits apply to new accounts and accounts with
unresolved issues reported against them.

Fixes #3135
 2021-03-31 22:40:34 +01:00
Tom Hughes
bf3743f190 Add missing callbacks to session controller 2021-03-29 20:36:07 +01:00
Andy Allan
12228510c3 Fix registration link 
Fixes #3156
 2021-03-29 14:57:41 +01:00
Andy Allan
f18baae22e Refactor login/logout into sessions controller 
Certain controller methods are shared with oauth-based logins, and these have been
moved to a concern.
 2021-03-24 11:32:46 +00:00
polarbearing
b4e2f8e34f
Show the crafted duration of a block independent of the reading time 
Fixes #3143.
Not tested by myself. Treat like pseudocode, I don't speak Ruby.
 2021-03-23 12:37:14 +01:00
Tom Hughes
4c2e4de5c0 Handle errors checking for gravatars 2021-03-21 10:24:53 +00:00
Andy Allan
a08fe1c291 Use list-inline to achieve spacing between elements on a line 
This is a better solution than spans and margins. Additionally, rework
to use mb-* instead of my-* (bootstrap advises against using margin-top)
and get rid of <br>s by using paragraphs instead.
 2021-03-17 18:57:36 +00:00
Tom Hughes
e2db409872 Merge remote-tracking branch 'upstream/pull/3138' 2021-03-17 18:16:15 +00:00
Andy Allan
4dc584421a Refactor traces list display 
Ideas taken from #3036
 2021-03-17 18:04:00 +00:00
Andy Allan
6f70c13062 Use .add method for adding errors 
This avoids a deprecation warning on rails 6.1
 2021-03-17 17:09:34 +00:00
Andy Allan
a2ddcda911 Merge branch 'pull/3112' 2021-03-17 16:07:43 +00:00
Tom Hughes
93b8c47c8f Reject referers that do not include an absolute path 2021-03-16 11:07:34 +00:00