Commit graph

637 commits

Author SHA1 Message Date
Shaun McDonald
5daeb1b063 Changing if not to unless to make code more readable. 2008-10-03 13:57:20 +00:00
Shaun McDonald
0ec26f14a0 adding some version reading for the nodes 2008-09-29 16:28:51 +00:00
Shaun McDonald
d9e070e069 Doing a resync from mainline 8633:10895. There was one simple to resolve conflict on app/models/node.rb. Also moving the migrations for API0.6 to new sequence numbers since there was some new migrations added to mainline, where the migration numbers would conflict if not moved. 2008-09-25 15:06:05 +00:00
Richard Fairhurst
98d49ed144 Potlatch 0.10c... part two 2008-09-20 12:07:48 +00:00
Tom Hughes
d6b05a8da9 Run web authorisation for all non-api requests. Closes #1152. 2008-09-07 15:07:44 +00:00
Tom Hughes
34189cf761 Add basic support for logically deleting a user. 2008-08-24 16:53:42 +00:00
Tom Hughes
791062569d Tidy up diary code a bit. 2008-08-24 15:12:20 +00:00
Richard Fairhurst
3b6d2c5336 edit diary entries 2008-08-21 21:40:23 +00:00
Tom Hughes
967f44ffac Don't user flash[:notice] when we're not redirecting as it will
persist to the next request and cause confusion.
2008-08-13 11:44:53 +00:00
Tom Hughes
64ecd02f0b Allow users to change their email address. Closes #546. 2008-08-13 11:39:33 +00:00
Tom Hughes
f8367c3ee1 Allow a user's email address to be marked invalid, and suppress most
notification mails for such users.
2008-08-13 10:45:49 +00:00
Richard Fairhurst
b0f0a2627d Potlatch 0.10b 2008-07-31 22:48:12 +00:00
Richard Fairhurst
35ace2607b Potlatch 0.10a 2008-07-29 00:33:33 +00:00
Tom Hughes
a0545ba4e5 Render nothing on a successful delete. 2008-07-22 14:16:07 +00:00
Tom Hughes
d69e9533d1 Fix thinko. 2008-07-19 23:02:04 +00:00
Tom Hughes
c933a4222c Improve error handling. 2008-07-19 22:59:59 +00:00
Tom Hughes
5d5f72b927 More warning fixes. 2008-07-18 22:23:26 +00:00
Tom Hughes
d6e047d7d4 Optimise finding of relations, partially reversing change #8443 but in
a more rails like way.
2008-07-16 23:42:59 +00:00
Tom Hughes
66b0dd135e Tidy up AMF controller and optimise a few rails things. 2008-07-16 23:10:32 +00:00
Tom Hughes
6fa8647855 Rename unique_nodes to unshared_node_ids to make it's purpose a bit clearer
and rework it to be a bit tidier.
2008-07-15 18:18:37 +00:00
Richard Fairhurst
62a1ec4748 Potlatch 0.10 2008-07-09 22:19:48 +00:00
Shaun McDonald
b2515ec75e Sorts out a problem with the description field and adding users. 2008-07-08 13:43:56 +00:00
Tom Hughes
6644f115c9 Add bounds to map responses. Closes #1011. 2008-07-08 09:52:08 +00:00
Tom Hughes
1e98eb9950 Allow users to remove their image. Closes #1010. 2008-07-07 23:26:41 +00:00
Shaun McDonald
5f8ab9e924 Merge changes from trunk 7673:8632. 2008-07-03 13:06:24 +00:00
Tom Hughes
97aefa23d0 Merge data browser branch to trunk. 2008-06-27 23:09:05 +00:00
Tom Hughes
abb66fa808 Disable the data browswer when the database is not available. 2008-06-26 17:36:21 +00:00
Tom Hughes
def60c1935 Railsify relation selection (aka ripping out the f***in SQL). 2008-06-24 23:42:39 +00:00
Tom Hughes
960d13488a Merge 7922:8377 from trunk. 2008-06-22 12:23:43 +00:00
Tom Hughes
2cf15b549e Add support for putting the site in an offline mode where it operates
without a database but with most features disabled.
2008-06-22 12:10:32 +00:00
Richard Fairhurst
550ebc6c82 trap for #971 until I can work out why it's doing it 2008-06-11 14:45:36 +00:00
Tom Hughes
48000eb09a Require a form post to finally confirm an account to stop
accidental confirmations.
2008-05-29 20:43:58 +00:00
Tom Hughes
88105d9c64 Merge 7744:7922 from trunk. 2008-05-28 16:37:31 +00:00
Richard Fairhurst
889ee9e368 fix revert to cope with moved nodes properly (OH NOES I updated some SQL) 2008-05-16 10:32:53 +00:00
Gabriel Ebner
5cc8afd896 api06: remove debugging output. 2008-05-13 13:42:03 +00:00
Gabriel Ebner
d96f238801 api06: simplify diff uploading. 2008-05-13 13:24:31 +00:00
Gabriel Ebner
866c3ff782 api06: diff upload: don't read the whole request into memory.
Note: libxml-ruby-0.5.4 will segfault on this:
https://rubyforge.org/tracker/index.php?func=detail&aid=20117&group_id=494&atid=1971
2008-05-13 12:53:59 +00:00
Gabriel Ebner
7151fa05e4 api06: simplify exception handling and add exception handling to the diff
upload.
2008-05-13 12:15:06 +00:00
Gabriel Ebner
cddded9569 api06: Fix typo. 2008-05-12 21:11:51 +00:00
Gabriel Ebner
ea1961e3ce api06: s/delete_with_relations_and_history/delete_with_history/g 2008-05-12 21:10:38 +00:00
Gabriel Ebner
86b4d1bc2c api06: Move version-checking into the models, raising an exception on mismatch
(still not implemented for delete requests though.)
2008-05-12 21:05:11 +00:00
Christopher Schmidt
322f3d7576 make error_message spit out the message text to the user as well as
putting it in the header.
2008-05-11 23:12:54 +00:00
Christopher Schmidt
618908319c prevent update of any object without providing the correct/current
version as part of the XML. This affects update-only at this time: 
DELETE doesn't work the same way because we don't provide the data as 
part of a DELETE
2008-05-11 21:49:33 +00:00
Christopher Schmidt
6aa9ec599f Make capabilities report the current version for from/to version
identifier
2008-05-11 21:23:38 +00:00
Christopher Schmidt
412472212b change 'no nodes' response to use API_VERSION in output 2008-05-11 21:21:30 +00:00
Christopher Schmidt
6f1aad0d04 add support for closing changesets 2008-05-11 21:18:42 +00:00
Christopher Schmidt
e48cbc6a5f Add support for accessing changesets as XML through the API via the
changeset controller "read" method
2008-05-11 20:03:17 +00:00
Christopher Schmidt
7a216c0ce6 Make edits return version numbers as plain text strings 2008-05-11 19:47:19 +00:00
Tom Hughes
5620d7263a Merge 7452:7744 from trunk. 2008-05-09 23:22:26 +00:00
Tom Hughes
74b6dabb7f Tidy up handling of unknown traces. 2008-05-06 16:57:40 +00:00