Commit graph

2133 commits

Author SHA1 Message Date
Shaun McDonald
5f8ab9e924 Merge changes from trunk 7673:8632. 2008-07-03 13:06:24 +00:00
Shaun McDonald
0a459023d3 Now all the unit tests work 2008-07-03 10:56:17 +00:00
Tom Hughes
97aefa23d0 Merge data browser branch to trunk. 2008-06-27 23:09:05 +00:00
Tom Hughes
398d5fa329 Improve the layout of the object browser views. 2008-06-24 16:44:45 +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
Tom Hughes
e8293baf8f Let's have one last try... 2008-06-07 00:03:27 +00:00
Tom Hughes
d29defa7cc Magic foo to make composite_primary_keys work. 2008-06-06 23:53:20 +00:00
Tom Hughes
e7346e5903 Go back to rails 2.0.2 for now as 2.1.0 doesn't quite work... 2008-06-06 23:32:21 +00:00
Tom Hughes
4fc6b982dd Switch to rails 2.1.0 release. 2008-06-06 23:17:56 +00:00
Tom Hughes
e2539b7126 Switch to rails 2.0.2 as Debian/Ubuntu is able to handle it now. 2008-06-05 23:06:29 +00:00
Shaun McDonald
c373220bd2 sort the default test database user and password.
Adding new test for the user
2008-06-02 11:00:09 +00:00
Christopher Schmidt
4a9ee4c736 The ordering of these shouldn't have mattered, but it did, because I didn't put a regex filter on my :id, so "upload" was being treated as an ID (which clearly wouldn't work); This fix obviates the need for r7789, sorry about that. 2008-05-12 21:12:30 +00:00
Gabriel Ebner
ec916b7429 api06: Make diff uploading work again. 2008-05-12 20:43:35 +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
Tom Hughes
5620d7263a Merge 7452:7744 from trunk. 2008-05-09 23:22:26 +00:00
Tom Hughes
895eb829c9 Backout message deletion functionality as it has unfortunate side effects
as it also removes the message from the sender's outbox.
2008-05-06 16:35:24 +00:00
Gabriel Ebner
3d6e1c67fb api06: Preliminary support for diff uploading. This will not return anything
useful and the code will need some heavy refactoring.
2008-05-04 13:52:43 +00:00
Tom Hughes
0ef056ffbc Stick with rails 2.0.1... 2008-05-04 11:32:49 +00:00
Tom Hughes
cf304fe60f Merge 7649:7673 from trunk. 2008-05-04 11:26:36 +00:00
Tom Hughes
02efd7ba4a Go back to using user_id+k as the primary key for user preferences but
actually using the composite primary key extension this time so that it
really works.

Also stop update_one tring to render a non-existent view, and add a
delete_one method to allow preferences to be deleted.
2008-05-04 11:18:38 +00:00
Frederik Ramm
8c5638d696 initial changeset support 2008-05-04 10:41:42 +00:00
Steve Coast
ee6165bf9b ability to delete messages 2008-05-03 13:25:34 +00:00
Steve Coast
4b3c207a81 add individual user preference read/write, and default all new users to having public data 2008-05-03 12:57:48 +00:00
Tom Hughes
f1b0225b79 Reduce the expiry for OpenLayers resources (which are not subject to
rails asset tagging) to one week, and set a one week expiry for the
new static HTML page used for HTML export.
2008-05-01 07:55:23 +00:00
Richard Fairhurst
f747951714 preset typo 2008-04-29 10:34:20 +00:00
Richard Fairhurst
a2caee2a35 add turning_circle to autocomplete 2008-04-27 22:00:48 +00:00
Richard Fairhurst
6d8e6d235f must remember not to commit new version while Potlatch users are in IRC 2008-04-22 21:59:52 +00:00
Richard Fairhurst
9df6d2ac06 Potlatch 0.8b 2008-04-22 21:32:26 +00:00
Christopher Schmidt
336a80530c add in-map node/way browser 2008-04-21 23:18:08 +00:00
Christopher Schmidt
bad57126c0 add a browse index (no content yet) 2008-04-20 16:18:22 +00:00
Christopher Schmidt
488efc3df8 drop _view from action names 2008-04-20 16:11:56 +00:00
Christopher Schmidt
7618a9a791 update routes: everything lives in browse/ now 2008-04-20 16:05:48 +00:00
Christopher Schmidt
bb8acc8424 Add support for relation history. 2008-04-20 15:32:25 +00:00
Christopher Schmidt
4168e0963e Add history for ways and nodes, split 'last edited by' into a seperate template to be used in multiple places, add to routes. 2008-04-20 15:14:20 +00:00
Tom Hughes
db30a423a8 Commit crschmdt's data browser patch. 2008-04-20 12:20:23 +00:00
Tom Hughes
d4010ff589 Revert accidental commit. 2008-04-19 10:49:54 +00:00
Tom Hughes
7ebb29d195 Don't call formatChanged() when disabling XML output as it has side effects. 2008-04-19 10:48:48 +00:00
Tom Hughes
52a6df0548 Simplify URLs a bit. 2008-04-17 17:38:48 +00:00
Tom Hughes
d13ef1db02 More work on export tab. 2008-04-14 23:46:10 +00:00
Tom Hughes
1df50231fa Commit initial work on export tab. 2008-04-07 23:23:15 +00:00
Richard Fairhurst
adf24182ff tone colours down very slightly so you can still see the points 2008-03-21 23:50:52 +00:00
Richard Fairhurst
cb0b0d9d89 Edgemaster's patch to colour routes depending on network 2008-03-21 21:33:38 +00:00
Richard Fairhurst
ae142c554b Potlatch 0.8 - be afraid, be very, very afraid 2008-03-19 01:03:51 +00:00
Tom Hughes
c0d2ad40c3 Work round ruby's half assed Tempfile class which, because for some
reason it is implemented by delegating to File (by inheriting from
DelegateClass(File)) rather than by inheriting from it, does not
actually look like a File, and hence does not look like an IO (in
that it does not respond to kind_of? IO calls).

In ruby 1.8.5 this doesn't matter as REXML checks that the source
it has been given responds to the methods it wants (using respond_to?
which is handled properly by DelegateClass) but in 1.8.4 which we
are running on rails2 REXML uses kind_of? to see if the source is
one it can use.
2008-03-06 12:43:10 +00:00
Steve Coast
cacf1879c3 user images 2008-02-23 15:18:59 +00:00
Steve Coast
2e44f9ccf3 User prference system basically done 2008-02-23 13:37:36 +00:00
Steve Coast
e13337354d preference stuff 2008-02-23 11:12:42 +00:00
Richard Fairhurst
c3c16bf591 stop accidental cities :) 2008-02-15 13:03:14 +00:00