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

187 commits

Author SHA1 Message Date
Tom Hughes
b89486eab0 Rework AMF controller's streaming output for rails 3 2011-11-14 09:42:46 +00:00
Tom Hughes
226c41be69 Update ActiveRecord queries to use arel 2011-11-14 09:42:44 +00:00
Tom Hughes
e1213a4651 Use Rails.xxx instead of RAILS_XXX 2011-11-14 09:42:40 +00:00
Tom Hughes
0a81411e68 Make the AMF API check that the CTs have been agreed 2011-06-20 09:20:30 +01:00
Matt Amos
838b1ee7e9 Fixed AMF controller to validate changeset comments 
Fixed AMF controller so that it doesn't accept non-UTF8 comments, and
throws away non-XML characters.
 2010-08-08 16:23:11 +01:00
Tom Hughes
f07819d81a Rework application configuration 
Use a preinitializer to load the settings from application.yml so
that they are available as early as possible. All settings can also
be overridden using environment variables.

The ad-hoc settins in environment.rb are then moved to this new
system so we have one consistent location for settings.
 2010-08-04 22:06:05 +01:00
Richard Fairhurst
4de68be303 join/unjoin fixes, plus better amf_controller error handling for deleted items 2010-02-11 00:48:15 +00:00
Richard Fairhurst
ce85092f57 force changeset id to be an int so we don't have a table scan 2010-02-03 16:50:39 +00:00
Richard Fairhurst
dd9999dc43 Move render :text to write out each result as it's received, rather than assembling them into a big array and writing this at the end. Theoretically this should permit streaming, but Rails appears not to be that clever. Nonetheless it reduces memory usage when assembling a big bunch of getways and that has to be worthwhile 2009-10-20 22:14:32 +00:00
Ævar Arnfjörð Bjarmason
e0eb2b79b7 [18163] commited by me yesterday (and reverted in [18165]) was 
broken. I didn't restart rails when testing it because I thought lib/
was auto-refreshed as well and that:

    ruby -e 'x = []; x[0]["foo"] = "bar"'

Would work and autovify like it does in Perl. But no, you have to do:

    ruby -e 'x = [{}]; x[0]["foo"] = "bar"'

This commit is equivalent to [18163] aside from that fix to lib/potlatch.rb
 2009-10-15 08:21:57 +00:00
Tom Hughes
d0c63b6d5d Revert r18163 as it is completely broken. 2009-10-15 07:46:54 +00:00
Tom Hughes
a35b194330 Attempt to unbreak Potlatch. 2009-10-15 07:40:47 +00:00
Ævar Arnfjörð Bjarmason
cc9a9ee399 Make the preset list at the bottom of the screen (Airport, Bus stop, 
...) translatable
 2009-10-14 23:42:09 +00:00
Ævar Arnfjörð Bjarmason
9bdade37af Add the language the user is using to Potlatch's created_by string. Like JOSM 2009-10-12 15:52:51 +00:00
Matt Amos
3429f016c2 Adding blocking to user auth bits of amf_controller. Or, at least, the bits I could find. 2009-10-02 10:49:03 +00:00
Ævar Arnfjörð Bjarmason
9b7e39dc49 I moved Potlatch's locales but didn't update this, which broke all i18n 2009-09-23 23:34:43 +00:00
Ævar Arnfjörð Bjarmason
5a76b08868 oops, removing debugging code 2009-09-23 17:36:51 +00:00
Ævar Arnfjörð Bjarmason
65eec82978 [2304]: Split the default English i18n parameter in Potlatch out to a YAML file 2009-09-23 17:08:46 +00:00
Richard Fairhurst
233f3ee527 Potlatch 1.2 2009-08-04 22:24:20 +00:00
Matt Amos
586d7befce Fixed dumb-arse bug with wrong variable name. Added tag cleanup and checking on nodes which are part of ways (i.e: not 'POIs' in potlatch terminology). 2009-07-28 16:09:13 +00:00
Matt Amos
4826032d18 Added methods to strip those non-XML control characters from tags in AMF controller and give an error if there's invalid UTF-8. 2009-07-27 16:54:00 +00:00
Tom Hughes
bf0e4291a2 Don't use the (unset) value of I18n.locale to try and select a language 
as the one we want is in lang so just use that. Fixes #2071.
 2009-07-16 20:26:18 +00:00
Tom Hughes
07211afe3e Select the language for Potlatch indepdently of the web site. 2009-07-16 07:37:49 +00:00
Richard Fairhurst
6599fe0586 Potlatch 1.1a 2009-07-16 01:20:47 +00:00
Ævar Arnfjörð Bjarmason
5d33aaa332 Potlatch's i18n support predates our Rails i18n effort, so it was 
still doing its own language detection.

Scrap that and use I18n.locale instead, now Potlatch is guaranteed to
use whatever translation the rest of the site uses.

I've tested this by switching the language in preferences back and
forth, and also ensured that Potlatch will fall back on English if the
specified language doesn't exist in its list of translations.
 2009-07-14 21:55:40 +00:00
Richard Fairhurst
8eb77ef5e1 "list mode" should really be "live mode" :) 2009-07-08 22:29:45 +00:00
Richard Fairhurst
369202787b Potlatch 1.1 (server code) 2009-07-08 20:52:02 +00:00
Tom Hughes
d6ba46b120 Simplify rejection of existing renumbered nodes. 2009-06-08 11:08:18 +00:00
Richard Fairhurst
9cfaeb5460 potential fix for issue encountered on talk 2009-06-08 10:54:06 +00:00
Tom Hughes
2f3e23f6eb Move to version 2.3.2 of rails. 2009-06-04 08:08:24 +00:00
Tom Hughes
afb13ad93e Refactor potlatch error handling. 2009-06-03 16:51:33 +00:00
Richard Fairhurst
33e3d3d576 fix #1849 2009-05-25 10:19:50 +00:00
Richard Fairhurst
a3a792e137 adapt for larger fonts on Linux; fix indexing with renumbered nodes 2009-05-22 19:43:56 +00:00
Tom Hughes
912f708d62 Fix some comments to reflect reality. 2009-05-21 17:30:20 +00:00
Richard Fairhurst
8100be1e8d Potlatch 1.0 2009-05-21 00:30:33 +00:00
Tom Hughes
b38684e59e Add a global timeout that is applied to most API requests. 2009-05-20 22:18:36 +00:00
Tom Hughes
058d942c7c Log arguments to AMF read methods. 2009-05-20 13:24:59 +00:00
Richard Fairhurst
ced42cf101 always set new node id when updating/deleting (to be read in conjunction with zere's patch) 2009-05-13 19:23:59 +00:00
Matt Amos
ed0a1658df Removed updatetimeout method, as it isn't needed any more. 2009-05-12 14:38:22 +00:00
Matt Amos
1ceb4ab9ba Fixed bug #1816 - the timeout updating logic should have been in a before_save handler, not in save_with_tags. 2009-05-12 13:54:37 +00:00
Richard Fairhurst
8696d144ad Potlatch 0.11b 2009-05-04 23:37:06 +00:00
Shaun McDonald
33d32bf737 We don't need an extra method for the amf controller for saving nodes, just catch the exception and do nothing with that exception. 2009-04-30 15:16:15 +00:00
Richard Fairhurst
41f85fb77d Potlatch 0.11a 2009-04-30 01:23:50 +00:00
Tom Hughes
4de6006567 Eager load nodes and node tags for the way when doing a getway call. 2009-04-28 15:55:54 +00:00
Tom Hughes
c20f55045d Reject any AMF request which is not a POST request. 2009-04-28 11:14:15 +00:00
Richard Fairhurst
2acdfd7132 a couple of minor revert fixes 2009-04-24 20:12:43 +00:00
Richard Fairhurst
9b4271ed8c pass common API error text through to Potlatch so it can be shown to the user 2009-04-24 17:44:52 +00:00
Richard Fairhurst
3cc3ff7ad6 lots of relations changes for speed and version management 2009-04-24 14:46:52 +00:00
Richard Fairhurst
64d076847b fix another way-node/Way-Node problem in amf_controller; add WinIE JS compatibility via ExternalInterface (we can use this later to alert for a commit message if none is provided) 2009-04-23 17:54:17 +00:00
Richard Fairhurst
749a735472 actually delete nodes on deleteway (might help) 2009-04-23 12:01:42 +00:00