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

1950 commits

Author SHA1 Message Date
Tom Hughes
d83cc0f15b Reduce TOTP cookie expiry to one hour 2017-01-02 21:17:37 +00:00
Tom Hughes
17135cad03 Add support for generating TOTP cookies 
This allows other sites in the openstreetmap.org domain to validate
that requests are coming from a www.openstreetmap.org user.
 2017-01-02 19:01:01 +00:00
Tom Hughes
c8f26592a7 Fix rubocop warnings 2016-12-02 22:01:40 +00:00
Tom Hughes
ec6e096274 Remove redundant creation of an exception object 2016-12-02 09:38:18 +00:00
Matt Amos
8b03371e10 Make API and web roll back any open transactions on timeout 
By default the exception thrown by Timeout::timeout is caught
using Kernel::catch so that it cannot be stopped by intermediate
exception handlers. The problem with that is that it stops any
database transactions that were in progress being rolled back
because they never see the exception.

Fortunately passing a class to Timeout::timeout changes it's
behaviour so that the exception is thrown and caught in the normal
way, allowing the database transactions to rollback.
 2016-12-02 09:31:45 +00:00
Andy Allan
f464e2a6e9 Suppress XML parsing errors. 
This technique was already used in app/models/changeset.rb

This suppresses the error messages when parsing invalid XML, but
the exceptions are still raised, as tested in test_from_xml_double_lat
in test/models/node_test.rb
 2016-10-26 10:35:03 +01:00
Tom Hughes
e17b89e89f Fix rubocop warnings 2016-10-20 22:35:51 +01:00
Mikel Maron
be40536440 merge upstream/master and resolve conflicts from https://github.com/openstreetmap/openstreetmap-website/pull/1318 2016-10-12 10:52:05 -04:00
Andy Allan
41e05f0929 Remove unnecessary controller references from the redirect hashes. 
Rails redirect_to uses the current controller by default, so there
is no need to re-iterate this in the code when the redirect targets
the current controller.

The short-form is already used elsewhere, this just tidies up those
which were still using the long-form.
 2016-10-12 14:32:49 +01:00
Mikel Maron
a32076abd6 fix rubocop warnings 2016-10-07 06:32:05 -04:00
Mikel Maron
e055eaf690 tests passing 2016-10-06 21:33:47 -04:00
Mikel Maron
3c01d2e80d more idiomatic models for diary entry subscriptions 2016-10-06 20:31:10 -04:00
Andy Allan
3f698e1d15 Fix bugs->notes in comment 2016-10-06 08:59:24 +01:00
Mikel Maron
44b08cc35d not api endpoints, moved to button, fixed notifier message, fixed tests 2016-10-03 22:20:04 -04:00
Mikel Maron
443080d7b0 WIP diary comment subscriptions 2016-10-03 15:04:22 -04:00
Tom Hughes
d73128271f Fix rubocop warnings 2016-09-26 12:38:54 +01:00
Sarah Hoffmann
5efbc8a8b7 look for extra place tags in Nominatim search results 
Administrative boundaries at municipality level are generally
better described by the place node (as town, village etc.).
Nominatim exports the place type in extratags if it was able
to merge place nodes with admin boundaries. Use this preferably
to create the descriptive term.
 2016-09-26 13:00:10 +02:00
Tom Hughes
5f4dcd34ff Fix some rubocop warnings 2016-09-15 22:41:07 +01:00
Tom Hughes
d82f9d12ce Fix new rubocop warnings 2016-09-15 19:21:00 +01:00
Matt Amos
c3ad6aa292 More whitespace fixes. Attempting to get tests to pass. 2016-08-22 18:38:03 +01:00
Matt Amos
757a1aaa85 Made rubocop happy by formatting and minor syntax tweaks. 2016-08-22 17:24:10 +01:00
Shrey
ed84930283 UI changes + Redirection after creating report fixed 
(cherry picked from commit 987fcf0ba5e7e914dc479e9dc7613400e72148a0)
 2016-08-22 16:18:15 +01:00
Shrey
eb79b15681 Fixed error 
(cherry picked from commit 99f8a765b8303115c8633fdc9e3c4edc77cbc32d)

Conflicts:
	app/controllers/issues_controller.rb
 2016-08-22 16:18:15 +01:00
Shrey
b598979374 Changed report button + Added disclaimer on report page + Added search filter 2016-08-22 16:18:15 +01:00
Shrey
69c1f6d186 Added sortable headers + search + reportable Notes 2016-08-22 16:18:15 +01:00
Shrey
732e1ab03a Fixed link to DiaryComments 2016-08-22 16:17:54 +01:00
Shrey
4b4b67aa96 Added report strings for Changesets and Notes + minor controller changes 2016-08-22 16:17:54 +01:00
Shrey
b17f9a6157 Fixed an error + Added email notifications for moderators 2016-08-22 16:17:54 +01:00
Shrey
b68b29b43c Added support for reporting Changesets + Deleting issues from the CLI 2016-08-22 16:17:54 +01:00
Shrey
cf639202b8 Added a few more tests 2016-08-22 16:17:54 +01:00
Shrey
25737ce46e Added a few tests 2016-08-22 16:17:54 +01:00
Shrey
965f32d545 Fixed existing tests 2016-08-22 16:17:54 +01:00
Shrey
e74163d036 Replaced check_box_tags with radio_button 2016-08-22 16:17:54 +01:00
Shrey
dc173881e5 Small changes 2016-08-22 16:17:54 +01:00
Shrey
f72c34aaf8 Added Issue Type + Issue Reassigning + Last updated_by 2016-08-22 16:17:54 +01:00
Shrey
fb78544d05 Proper implementation of report strings + cleaning up 2016-08-22 16:17:54 +01:00
Shrey
0a3dd82c47 Added search for issues 2016-08-22 16:17:54 +01:00
Shrey
c7bc13668b Issue reopens on Reports coming in after instance update 2016-08-22 16:17:54 +01:00
Shrey
cf4cfc530a Moved strings to locales + Added 'Issues' button + Fixed typo in tests 2016-08-22 16:17:54 +01:00
Shrey
d5f02968f6 Fixed tests + Altered migration file + Added reporting strings + Added update method 2016-08-22 16:17:54 +01:00
Shrey
d1d4f8192d DB changes + Related issues added 2016-08-22 16:16:31 +01:00
Shrey
bdc6adddbf basic UI for reporting diary entries,diary entry comments and user profiles 2016-08-22 16:15:12 +01:00
Shrey
683722ed5c Added IssueComments + ForeignKeys + Indexes 2016-08-22 16:15:12 +01:00
Shrey
d49922eb63 Added authorization + issues dashboard 2016-08-22 16:14:10 +01:00
Shrey
453f758f91 Controllers + a few tests + new notification added. Work pending on the notification view 2016-08-22 16:13:31 +01:00
Tom Hughes
b72bc8bf30 Improve code readability 2016-08-19 12:31:45 +01:00
Simon Poole
c6fe828286 Fix rubocop warnings 2016-08-19 09:31:47 +02:00
Simon Poole
0837205d02 Merge message when Gravatar status has changed with email confirmation 
Merge message when Gravatar status has changed with email confirmation and make messages more verbose and friendly.
 2016-08-19 08:59:40 +02:00
Simon Poole
90b7101cc3 Add tests for change of gravatar use depending on email 2016-08-16 22:09:11 +02:00
Simon Poole
05cd781b25 Remove default enabling of gravatar, check on initial confirmation of e-mail address and on any changes afterward if 
a gravatar exists and enable then if the user hasn't uploaded a picture.
 2016-08-16 21:42:02 +02:00