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

581 commits

Author SHA1 Message Date
Tom Hughes
8d76be71bb Merge remote-tracking branch 'upstream/pull/3177' 2021-06-24 08:43:18 +01:00
Andy Allan
24f6aeda6a Use hash-based flash objects to render complex flash messages 
Since flash objects can only be String, Hash or Array (notably excluding SafeBuffers), then this approach is necessary to render complex html in a safe manner.

Each local can be treated as an (unsafe) string, and therefore escaped normally when rendered into the template. The template (and translation strings) can
contain html since they are no longer stored in the flash as a plain string.

Fixes #3215
 2021-06-23 20:10:55 +01:00
Tom Hughes
f064a18a16 Add tests for OAuth2 2021-05-18 12:05:33 +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
Tom Hughes
914ec8723c Fix new rubocop warnings 2021-04-20 18:29:41 +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
Michal Migurski
a968c1b923 Added test for user prefs JSON response 2021-04-09 14:28:13 -07: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
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
Tom Hughes
e0d501f832 Don't allow deleted users to be confirmed 2021-04-01 17:28:03 +01:00
Andy Allan
9fd96cfb87 Move sessions-related tests out of UsersControllerTest 2021-03-24 11:40:17 +00: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
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
Andy Allan
4dc584421a Refactor traces list display 
Ideas taken from #3036
 2021-03-17 18:04:00 +00:00
Andy Allan
38ad8fbc36 Use login_path instead of explicit controller and actions 
This makes future refactoring easier.
 2021-03-10 14:31:55 +00:00
Tom Hughes
1f136a84a6 Prevent CSRF bypass with login form 2021-02-10 20:39:23 +00:00
Tom Hughes
51af102c00 Prevent CSRF bypass with password reset form 2021-02-09 23:00:21 +00:00
mmd-osm
c49e400aa3 Prevent CSRF bypass unblocking users 2021-02-09 20:39:04 +00:00
Tom Hughes
7810734ac4 Prevent CSRF bypass updating account details 
Fixes #3089
 2021-02-08 12:24:43 +00:00
Tom Hughes
e430bc0f7f Fix URL generation for atom feed on history page 
Fixes #3085
 2021-02-07 16:24:14 +00:00
mmd-osm
4e6d729529 Remove /api/0.6/changes endpoint 
Also removes sql functions which are only used by this endpoint
 2021-02-03 14:06:34 +00:00
Andy Allan
a7d959e588 Refactor account form to use bootstrap 
There's further refactoring that could be done, but this is sufficient for now.
 2021-01-27 17:59:58 +00:00
Andy Allan
cc8bb7c6a5 Refactor user registration form to use bootstrap 2021-01-20 15:38:10 +00:00
Tom Hughes
812f5b44e8 Redirect after saving settings in case the username has changed 
Fixes #3059
 2021-01-19 18:57:34 +00:00
Tom Hughes
0654be27f9 Fix new rubocop warnings 2021-01-11 19:17:31 +00:00
Tom Hughes
0ff89c31e4 Remove both Potlatch versions 
Fixes #2622
 2021-01-05 21:18:45 +00:00
Tom Hughes
786b8cce65 Verify that public and trackable traces don't return identity details 2020-12-30 17:58:04 +00:00
Tom Hughes
bfffe7ed96 Prefer string interpolation to concatenation 2020-11-13 11:32:28 +00:00
Tom Hughes
93e49daee2 Merge remote-tracking branch 'upstream/pull/2918' into master 2020-10-28 11:29:57 +00:00
Andy Allan
da2277505f Ensure that test utility methods are marked as private 
This allows us to enable the check for test method names.
 2020-10-28 11:49:01 +01:00
Andy Allan
c04d05686f Resolve some extra-long lines 2020-10-28 11:07:34 +01:00
Tom Hughes
2dc50b4431 Fix new rubocop warnings 2020-10-09 08:26:38 +01:00
Tom Hughes
ddac660f3b Merge remote-tracking branch 'upstream/pull/2839' 2020-09-30 11:54:30 +01:00
mmd-osm
37a7996d94 API User details: format tweaks 
- _show_ to return single user only
- remove nesting for languages
 2020-09-18 21:50:38 +02:00
mmd-osm
dff8effc13 Json user details: unit tests 2020-09-16 22:13:19 +02:00
mmd-osm
9f280be82b Fix unit test, assume application/xml instead of text/xml 2020-09-16 21:01:54 +02:00
Tom Hughes
21adea321b Convert password reset forms to use bootstrap 2020-09-04 00:36:43 +01:00
Tom Hughes
c11142d5c0 Convert logout form to use bootstrap 2020-09-03 23:52:59 +01:00
Tom Hughes
ea59d95f4a Fix some new rubocop warnings 2020-08-06 22:27:30 +01:00
Tom Hughes
0e2a66e8de Fix new rubocop warnings 2020-08-06 18:42:16 +01:00
Tom Hughes
c24c2e481c Merge remote-tracking branch 'upstream/pull/2667' 2020-08-05 21:50:08 +01:00
Tom Hughes
2d3972249c Fix some rubocop todos 2020-08-02 19:38:58 +01:00
Andy Allan
47d11763fb Add some changsets that shouldn't be selected 2020-07-22 17:51:43 +02:00
Andy Allan
e7dc2f2e55 Refactor changeset index testing to assert against objects, not db queries 
This avoids the situation where tests pass despite an empty db.

Refs #2614
 2020-07-22 17:39:48 +02:00
Andy Allan
b23d6a5445 Refator way_full test to avoid relying on non-existant fixtures 
Refs #2614
 2020-07-22 16:33:33 +02:00
Andy Allan
41d6f19a6b Rename the notes#mine action to index 2020-07-08 18:43:30 +02:00
Andy Allan
8d2271699b Use bootstrap_form as the formbuilder for GPX upload form 
This also uses the recommended bs-custom-file-input javascript plugin
for the file input control.
 2020-07-01 17:23:02 +02:00