Tom Hughes
|
1f8a68371a
|
Merge 14059:14394 from trunk.
|
2009-04-08 13:53:09 +00:00 |
|
Matt Amos
|
18633b7c9e
|
Fixed a problem where rails was setting the ID column to null, which violates the not-null constraint. Also fixed possible typo in AMF controller.
|
2009-03-29 02:14:40 +00:00 |
|
Matt Amos
|
afcb345014
|
Moved a bunch of time functions into UTC. Fixes bugs which we only see for 4 hours a year.
|
2009-03-29 01:31:04 +00:00 |
|
Richard Fairhurst
|
023b9e3662
|
fix user:pass auth for Potlatch
|
2009-03-26 09:38:11 +00:00 |
|
Matt Amos
|
568c05c548
|
Fixing failing potlatch tests. Someone who knows what the potlatch API is actually supposed to be doing should check these...
|
2009-03-25 17:54:21 +00:00 |
|
Harry Wood
|
0f3e5a28c0
|
show a 'no bbox specified' message for the moment at least. Due to inconsistent location detecting across tabs, the history tab often gets nil bbox (Need to fix for all tabs) + other history tab tweaks
|
2009-03-24 11:23:56 +00:00 |
|
Thomas Wood
|
8fb97a3337
|
Rather than referring how to view a bbox history, just redirect to the global history.
|
2009-03-23 19:56:01 +00:00 |
|
Thomas Wood
|
7d3a5899c9
|
More fixes to the changeset viewer, including logged-in-ness on per-user edit lists, fix XSS potential on usernames here, and general tidyups.
|
2009-03-23 19:40:33 +00:00 |
|
Thomas Wood
|
677f391ec1
|
Fix various auth bugs with the changeset listing stuff, catch exception (but not yet handled well) for when edits not public.
|
2009-03-23 18:23:37 +00:00 |
|
Harry Wood
|
afe8dd51ec
|
Add 'history' tab + Move 'recent changes' changeset list to re-use the same _changeset.rhtml partial
|
2009-03-23 16:39:59 +00:00 |
|
Tom Hughes
|
eff9fa3b00
|
Refactor the GPX upload to try and avoid the import daemon loading traces
which do not exist yet.
|
2009-03-20 00:08:53 +00:00 |
|
Tom Hughes
|
c8ee135104
|
Merge 12304:14009 from trunk.
|
2009-03-08 13:02:37 +00:00 |
|
Tom Hughes
|
fa3c97d6a6
|
Fix for libxml 1.0.0 changes.
|
2009-03-08 12:44:45 +00:00 |
|
Tom Hughes
|
07c1cd6b98
|
Update to use libxml 1.0.0 gem.
|
2009-03-08 11:34:46 +00:00 |
|
Richard Fairhurst
|
7bd1cdaa99
|
fix backspacing through way to delete it
|
2009-02-26 00:26:23 +00:00 |
|
Richard Fairhurst
|
dfa81462b8
|
history stuff should be working now (haha)
|
2009-02-25 22:04:22 +00:00 |
|
Richard Fairhurst
|
e827a04607
|
further work on 0.6 history (not quite complete yet)
|
2009-02-25 01:14:19 +00:00 |
|
Tom Hughes
|
10b71ba2f6
|
Add an ACL system to allow key/value pairs to be attached to blocks
of IP addresses, and implement an ACL restriction that allows account
creation to be blocked.
|
2009-02-19 13:47:43 +00:00 |
|
Richard Fairhurst
|
79d3ee4654
|
be a bit smarter about enlarging the bbox (note to self: must remember to put this in 0.6 too)
|
2009-02-13 15:12:52 +00:00 |
|
Matt Amos
|
76708eefcf
|
Fixed bug in changeset closing and querying where the number of elements exceeded the maximum. Added a fixture for this.
|
2009-02-07 17:45:27 +00:00 |
|
Tom Hughes
|
554614723a
|
Back out hack to setMapCenter and fix the problem in the right place.
|
2009-02-05 22:23:45 +00:00 |
|
Thomas Wood
|
1522ed275c
|
Set params to sane defaults if unset by client.
Reject creates with no file with 400, model validations will also reject with 400 (as was existing but broken behaviour)
Closes #1510
|
2009-01-23 19:14:21 +00:00 |
|
Thomas Wood
|
9bb9de0fbe
|
Require auth on calls to /trace/create, and pass through to form if called without params. Adjust validations on traces to prevent dual error messages on description (validates_presence_of catches the empty string removed from length validation)
More changes to come for api_create
References #1510
|
2009-01-23 01:19:45 +00:00 |
|
Shaun McDonald
|
d3dc973376
|
Move the ActiveRecord::RecordNotFound to the block, so that it catches the not found in line 327, when a nonexistant way id is searched for.
|
2009-01-14 00:17:42 +00:00 |
|
Richard Fairhurst
|
c9237a3583
|
swap way write with node deletion as per dev@
|
2009-01-13 08:37:58 +00:00 |
|
Richard Fairhurst
|
8e394b1625
|
small versioning fix (plus history rework in progress)
|
2009-01-11 17:09:43 +00:00 |
|
Thomas Wood
|
747d6f1d11
|
Revert last commit - too many test failures
|
2008-12-31 16:43:44 +00:00 |
|
Thomas Wood
|
898beb7b7f
|
DateTime => Time for consistency in changeset code, ok by shaun.
|
2008-12-31 16:33:02 +00:00 |
|
Thomas Wood
|
8fe53e4823
|
Only show changesets that are actually closed in the index view.
|
2008-12-31 16:14:39 +00:00 |
|
Thomas Wood
|
62b6d15967
|
Make browse controller index show recently closed changesets, rather than recently changed nodes.
|
2008-12-23 15:47:06 +00:00 |
|
Thomas Wood
|
60834f33f9
|
Pass the to_user to the view. Tests may follow. Closes #1394
|
2008-12-23 15:08:18 +00:00 |
|
Richard Fairhurst
|
9fa1f4b013
|
session management on only for :list
|
2008-12-23 13:09:36 +00:00 |
|
Richard Fairhurst
|
cc90867183
|
view changesets by user
|
2008-12-23 13:06:07 +00:00 |
|
Richard Fairhurst
|
2b8bde9055
|
Potlatch for API 0.6 now saving ways happily with node versioning... I think
|
2008-12-18 00:32:02 +00:00 |
|
Richard Fairhurst
|
b823e9fccc
|
some more putway fixes - this actually creates new ways with 0.6 Potlatch now
|
2008-12-17 00:30:29 +00:00 |
|
Shaun McDonald
|
d646530206
|
Fix UTF-8 encoding error char in source file that RichardF introduced
|
2008-12-16 16:40:59 +00:00 |
|
Richard Fairhurst
|
ff01f76293
|
bit more putway stuff
|
2008-12-16 00:40:04 +00:00 |
|
Richard Fairhurst
|
40647c53df
|
yet more rewriting of putway...
|
2008-12-16 00:23:11 +00:00 |
|
Shaun McDonald
|
b1445ab023
|
Fix the transactions, need to set anything that will be returned to nil outside the transaction, otherwise it won't be available after the end of the transaction, when it is returned.
|
2008-12-15 19:20:24 +00:00 |
|
Shaun McDonald
|
e5674abd2c
|
bug fix. Adding some transactions to amf controller, and adding the missing version to putway method signature.
|
2008-12-15 18:57:12 +00:00 |
|
Shaun McDonald
|
eb9138813c
|
Return, rather than allow a second render to happen. Closes #1407
|
2008-12-14 23:16:27 +00:00 |
|
Shaun McDonald
|
721dd9c27d
|
resync from rails_port 11795:12304
|
2008-12-12 19:29:27 +00:00 |
|
Shaun McDonald
|
fac8b5d28a
|
Log the request on a few requests when there is a bad request, probably should do this in a few more places. This makes it easier to see why we are getting errors/bad requests.
|
2008-12-12 19:04:28 +00:00 |
|
Shaun McDonald
|
c76e60f052
|
Improving the not found handling of preferences. adding a user preference test. adding some utility methods to the test helper
|
2008-12-12 18:54:03 +00:00 |
|
Tom Hughes
|
9b1b6be371
|
Optimise lookup of traces with a given tag.
|
2008-12-12 15:17:14 +00:00 |
|
Shaun McDonald
|
541c24b23d
|
capture the too many way nodes error, and give the user an error message
|
2008-12-12 11:24:40 +00:00 |
|
Shaun McDonald
|
b051dd11af
|
Making amf controller act more like the xml apis
|
2008-12-11 17:22:15 +00:00 |
|
Shaun McDonald
|
814822120a
|
Don't give an error when you access the login page when you are logged in. Instead take you to the page in the referer or the home page.
|
2008-12-11 15:05:53 +00:00 |
|
Shaun McDonald
|
8bf0a3197c
|
some more progress towards making amf_controller do version checking of nodes before deleting them
|
2008-12-11 10:38:36 +00:00 |
|
Shaun McDonald
|
eafcf91ceb
|
some further progress to amf controller checking the version numbers.
|
2008-12-10 18:07:30 +00:00 |
|