Kai Krueger
a6f45adede
Merge branch 'openstreetbugs' of git://git.openstreetmap.org/rails into openstreetbugs2
2011-04-29 20:49:38 -06:00
Kai Krueger
3b3896da08
Don't enable OSB layer by default
2011-04-29 20:42:26 -06:00
Kai Krueger
14ed7ad164
Increase font-size of the "report a problem" link
2011-04-29 20:38:32 -06:00
Kai Krueger
1ac7f20263
Make the bug popups look a little nicer
2011-04-29 20:37:51 -06:00
Kai Krueger
c322b0c298
Only show "Report a problem" link at zoom level 12 and higher
2011-04-29 19:55:29 -06:00
Tom Hughes
0a3087cd7d
Merge remote-tracking branch 'apmon/openstreetbugs2' into openstreetbugs
2011-04-29 17:06:10 +01:00
Tom Hughes
af68e07272
Merge branch 'master' into openstreetbugs
2011-04-29 17:05:59 +01:00
Tom Hughes
de8e98ac64
Update Potlatch 2 to 2.0-16-g106bbd1 build
2011-04-28 23:05:11 +01:00
Kai Krueger
b3d62bb85a
Send notification emails when someone comments on a map bug report
2011-04-27 12:01:52 -06:00
Siebrand Mazeland
0ca91134e8
Rename incorrectly named file.
2011-04-26 08:52:50 +02:00
Siebrand Mazeland
54c4e7939f
Remove incorrect language file.
2011-04-26 08:50:23 +02:00
Kai Krueger
3b55494c8c
Add a note that the OSB client side js library has been adapted from the original
2011-04-22 11:20:10 -06:00
Kai Krueger
ad75dd1f06
Update OSB internationalisation to match the rails_port way
2011-04-22 11:17:32 -06:00
Kai Krueger
8cb83adf84
Deactivate OSB controller immediately after clicking a new bug
2011-04-22 10:07:36 -06:00
Kai Krueger
890fbcaae6
Forgott to copy over an image from openstreetbugs.schokokeks.org
2011-04-22 10:06:33 -06:00
Kai Krueger
f414d3cb3e
Remove references to old server location
2011-04-22 09:47:25 -06:00
Kai Krueger
5e335b6a55
Link the openstreetbugs browse pages
2011-04-22 09:41:10 -06:00
Kai Krueger
4a23ee8baf
Grey out username text field for bugs when logged in.
2011-04-21 09:05:44 -06:00
Kai Krueger
85984128b1
Change bug comment to a textarea to make it easier to input longer comments
2011-04-21 08:16:53 -06:00
Kai Krueger
d7afad9395
Use local files rather than remote ones for osb images
2011-04-21 08:01:23 -06:00
Tom Hughes
02e186ee5b
Allow user details to be fetched without agreeing terms
2011-04-20 21:17:59 +01:00
Tom Hughes
e7ed2635c3
Merge remote-tracking branch 'apmon/openstreetbugs2' into openstreetbugs
2011-04-20 19:24:54 +01:00
Tom Hughes
8980da4381
Merge branch 'master' into openstreetbugs
2011-04-20 19:23:39 +01:00
Siebrand Mazeland
658762a603
Localisation updates from http://translatewiki.net .
2011-04-20 09:58:59 +02:00
Kai Krueger
3d3f3982a0
users.visible has changed to users.status
2011-04-19 23:59:50 -06:00
Kai Krueger
91b9b65a41
Minor fix to updated OpenLayers
2011-04-19 22:49:10 -06:00
Kai Krueger
001ff5764b
Merge branch 'master' into openstreetbugs2
2011-04-19 22:00:30 -06:00
Tom Hughes
7a8d021dc8
Add credit to Direction Générale des Impôts for French data
2011-04-19 00:29:17 +01:00
Tom Hughes
37b6418f72
Revert "Allow user details to be fetched without agreeing terms"
...
This reverts commit ddd12b03e1
2011-04-18 23:04:42 +01:00
Tom Hughes
ddd12b03e1
Allow user details to be fetched without agreeing terms
2011-04-18 22:23:48 +01:00
Tom Hughes
2f83a56d3c
Update Potlatch 2 to 2.0-14-gc925264 build
2011-04-18 12:49:36 +01:00
Tom Hughes
6f7eb8f0e8
Don't require terms to be agreed when logging out
2011-04-18 09:04:57 +01:00
Matt Amos
c21aa5933a
Added flash notice for CTs decline
...
Also ensured that CTs are either accepted or declined and cannot
be inadvertently bypassed.
2011-04-18 00:29:15 +01:00
Tom Hughes
2ba5067fcf
Use report_error so Potlatch can see the errors
2011-04-17 21:45:04 +01:00
Tom Hughes
8024a38be4
Make sure "please read the terms" error is issued in the right language
2011-04-17 20:33:49 +01:00
Tom Hughes
2fd52ddf60
Add memcache support
2011-04-17 18:56:50 +01:00
Matt Amos
696fbb4e16
Renumbered sections to be more consistent with subsection numbering style
2011-04-13 13:17:21 +01:00
Matt Amos
2491328270
Reformatting contributor terms box based on suggestions by Tom
2011-04-13 13:17:17 +01:00
Matt Amos
55cc2e0fcf
Updated French and UK terms to 1.2.4
2011-04-13 13:17:13 +01:00
Siebrand Mazeland
2bcb052cce
Localisation updates from http://translatewiki.net .
2011-04-11 14:49:51 +02:00
Tom Hughes
097657d3ca
Update Potlatch 2 to 2.0-10-g07a59e4 build
2011-04-08 20:04:19 +01:00
Siebrand Mazeland
ccd0cb7bbd
Localisation updates from http://translatewiki.net
2011-04-07 13:52:04 +02:00
Tom Hughes
fcb6ce416f
Don't use the en_US locale for Potlatch 2 as it doesn't work
2011-04-07 11:16:23 +01:00
Tom Hughes
9f0cc74832
Make Potlatch 2 default to the en locale if there is nothing better
2011-04-06 21:42:03 +01:00
Tom Hughes
d10dd6387c
Update Potlatch 2 to 2.0-6-g929356f build
2011-04-06 21:26:18 +01:00
Tom Hughes
5f7855fa4d
Tell Potlatch 2 which locale to use
2011-04-06 21:22:47 +01:00
Tom Hughes
10033fded1
Switch to i18n version 0.5.0 but keep old style interpolation
...
It's impossible to stop rails 2 loading a newer i18n gem if it is
installed, so go with the flow and use the latest one but override
the interpolation pattern for now.
2011-04-06 20:39:20 +01:00
Tom Hughes
b77c6fe8ae
Improve recognition of OAuth referers for triggering of slim mode
2011-04-06 13:24:08 +01:00
Tom Hughes
25815dfb4d
Update Potlatch 2 to 2.0-5-gabe766c build
2011-04-05 10:12:23 +01:00
Matt Amos
5df75e9321
Changed button text to match http://stateofthemap.org banner heading.
2011-04-05 00:46:48 +01:00
