Commit graph

1311 commits

Author SHA1 Message Date
Matt Amos
0330e10943 Set defaults properly on redaction model, and remove unnecessary
guards around update.
2012-04-05 13:53:32 +01:00
Matt Amos
a4ded8bb67 Decided that restricting redacts to the user who created the
redaction is an unnecessary restriction.
2012-04-05 13:52:41 +01:00
Matt Amos
7953a883d0 Refactored common functionality from object history controllers 2012-04-05 13:52:10 +01:00
Matt Amos
1f9301e2e2 Better comments in application controller logic 2012-04-05 13:52:07 +01:00
Matt Amos
eca8f6e849 Used unredacted scope rather than explicit SQL 2012-04-05 13:52:04 +01:00
Matt Amos
7da8a5a1a8 Added redactions controller test and fixed a bug in the controller 2012-04-05 13:52:01 +01:00
Matt Amos
7c42552f16 Fixed fixture after adding link from redaction to user 2012-04-05 13:51:57 +01:00
Matt Amos
851de28303 Added redactions resource 2012-04-05 13:50:15 +01:00
Matt Amos
9519f26241 Fixed AMF controller methods to hide redacted ways 2012-04-05 13:50:13 +01:00
Matt Amos
7c2ca3efb1 Fixed AMF controller methods to hide redacted nodes 2012-04-05 13:50:11 +01:00
Matt Amos
e01a309970 Added test for changeset/download hiding redacted elements 2012-04-05 13:49:53 +01:00
Matt Amos
8bfb5cae8a Added relation redaction logic, same as node and way logic, plus tests 2012-04-05 13:49:46 +01:00
Matt Amos
990f3eba40 Altered old_way stuff to be Railsy like old_node is now 2012-04-05 13:49:43 +01:00
Kai Krueger
72e59b49fa Copy the redaction code from nodes to ways 2012-04-05 13:49:39 +01:00
Kai Krueger
7d41b926cf Expose redactions through the node history API calls
Add the show_redactions=true parameter to the old_node_controller
and add a redacted attribute in node XML output.
2012-04-05 13:48:36 +01:00
Matt Amos
67182f824e Fixing review comments
Added scoping for unredacted items, cleaned up authorization and
railsified old_node_controller.
2012-04-05 13:46:40 +01:00
Matt Amos
67dd9e4c9d Adding first cut of Redactions support
Redactions support hiding historical versions of elements and
collecting meta-data about that action together.
2012-04-05 13:46:36 +01:00
Tom Hughes
d7d317f694 Mark yet more methods as needing write access to the database 2012-04-02 19:08:47 +01:00
Tom Hughes
151626d019 We no longer need to disable sessions when the database is offline 2012-04-02 18:42:14 +01:00
Tom Hughes
e1ce75ec49 Mark some extra methods as needing write access to the database 2012-04-02 18:40:05 +01:00
Tom Hughes
987c52f53e Only require a readable database for login, not a writable one 2012-03-28 10:08:38 +01:00
Tom Hughes
eaad3611b8 Add functional tests for messages
Also fixes various issues in the code discovered while writing
the tests, and adds some named routes for messages.
2012-03-22 23:14:29 +00:00
Tom Hughes
5270a07bc5 Handle change from @to_user to @this_user for new message action 2012-03-22 19:47:24 +00:00
Tom Hughes
311f7ddd6e Factor out common code for looking up users 2012-03-21 22:22:33 +00:00
Tom Hughes
a9824dbc2e Use one "no_such_user" view everywhere 2012-03-21 21:47:09 +00:00
Tom Hughes
38a610fd31 Add functional tests for the user_roles controller 2012-03-20 17:21:13 +00:00
Tom Hughes
5f33656c8d Get rid of custom CSRF protection for user role changes
By restricting role changes to POST requests, which they should be
anyway, we get all the rails CSRF protection for free.
2012-03-20 17:21:13 +00:00
Tom Hughes
e1d873cde9 Add functional tests for user blocks
Also fixes various issues in the code discovered while writing
the tests, and adds some named routes for user blocks.
2012-03-19 11:26:02 +00:00
Tom Hughes
64747f7604 Set the user description to markdown formatting when it changes 2012-03-17 16:37:22 +00:00
Tom Hughes
561f2f694a Add preview functionality to rich text controls 2012-03-17 16:36:57 +00:00
Tom Hughes
d29a9dad9d Removed code for handling Osmrender export requests 2012-03-15 14:43:03 +00:00
Tom Hughes
3a1e7a67ac Specify the username when redirecting to the OAuth client list 2012-03-14 13:57:28 +00:00
Tom Hughes
c9fb146608 Restructure notes URLs according to standard rails conventions 2012-03-10 17:04:57 +00:00
Tom Hughes
6aca6cfabf Merge branch 'master' into openstreetbugs
Conflicts:
	config/routes.rb
	db/structure.sql
2012-03-10 15:30:25 +00:00
Tom Hughes
b255a333c5 Specify the username when generating a URL for a trace 2012-03-10 13:05:39 +00:00
Tom Hughes
a87540a5dd Fix layout selection to detect OAuth correctly 2012-03-10 12:46:10 +00:00
Tom Hughes
2351d02ed5 Fix mass assignment errors with user blocks 2012-03-09 23:15:39 +00:00
Tom Hughes
58d889436f Fix various routing and route generation errors 2012-03-09 23:15:39 +00:00
Tom Hughes
6391ea5a7a Remove method tests that are now enforced by the routes 2012-03-09 20:19:55 +00:00
Tom Hughes
6de8c2e6b3 Get the per-user note list view working again 2012-03-09 12:54:19 +00:00
Tom Hughes
39b20bb85d Fix some bugs found by the note controller tests 2012-03-09 00:42:43 +00:00
Tom Hughes
6f88f4d03f Fix mass assignment issues 2012-03-09 00:34:16 +00:00
Tom Hughes
b012617608 Save the user record after changing it 2012-03-09 00:21:08 +00:00
Tom Hughes
4dfe43c956 Fix typo 2012-03-08 23:17:38 +00:00
Tom Hughes
88541c523d Use normal assignment instead of mass assignment 2012-03-08 22:41:25 +00:00
Tom Hughes
e660e60966 Merge branch 'master' into openstreetbugs
Conflicts:
	Gemfile
	Gemfile.lock
	lib/migrate.rb
2012-03-08 18:23:27 +00:00
Tom Hughes
1340fca8f1 Turn on mass assignment protection
Require any attribute that is going to be mass assigned to be
whitelisted, and whitelist those attributes which need it
2012-03-06 08:54:45 +00:00
Tom Hughes
232e04ab9b Use a consistent host name in cache keys 2012-03-04 10:27:34 +00:00
Tom Hughes
e7a0302e2b Update the username cookie when the display name is changed 2012-03-03 00:49:03 +00:00
Steve Singer
1944372af8 Add a view to show diary comments left by a user 2012-02-28 21:29:18 +00:00