Commit graph

5373 commits

Author SHA1 Message Date
Tom MacWright
d13f0b7088 Remove dead code 2012-03-13 08:46:58 +00:00
Tom Hughes
9ec887ec30 Don't escape HTML in the "user suspended" message 2012-03-13 08:42:32 +00:00
Tom Hughes
5feb99d333 Remove OsmaRender layer class 2012-03-12 22:45:42 +00:00
Tom Hughes
2188317cd8 Remove osmarender layer from embed page 2012-03-12 22:45:03 +00:00
Tom Hughes
10df3d8565 Add the transport and MaqQuest layers to the embed page 2012-03-12 22:43:39 +00:00
Tom Hughes
7575f1ec0a Update Potlatch 2 to 2.3-224-g2df4b28 build 2012-03-12 20:27:32 +00:00
Matt Amos
d07680a085 Added reference and link to Top Ten Tasks in the README 2012-03-12 18:46:18 +00:00
Siebrand Mazeland
3e5a10eb01 Localisation updates from http://translatewiki.net. 2012-03-11 21:59:53 +01:00
Tom Hughes
30f21edbc2 Fixed incorrect link generation in sent message list 2012-03-11 08:46:28 +00:00
Tom Hughes
c6710bba54 Fix incorrect link generation that relied on default routes 2012-03-11 00:12:18 +00:00
Tom Hughes
c9fb146608 Restructure notes URLs according to standard rails conventions 2012-03-10 17:04:57 +00:00
Tom Hughes
6aca6cfabf Merge branch 'master' into openstreetbugs
Conflicts:
	config/routes.rb
	db/structure.sql
2012-03-10 15:30:25 +00:00
Tom Hughes
917d7324a6 Avoid mass assignment error in spam observer 2012-03-10 14:42:09 +00:00
Tom Hughes
b471d757ca Removed expiry code for bogus trace URLs that no longer exist 2012-03-10 13:05:55 +00:00
Tom Hughes
b255a333c5 Specify the username when generating a URL for a trace 2012-03-10 13:05:39 +00:00
Tom Hughes
a87540a5dd Fix layout selection to detect OAuth correctly 2012-03-10 12:46:10 +00:00
Tom Hughes
5c74a6517c Load the piwik tracking code asynchronously 2012-03-10 12:17:23 +00:00
Tom Hughes
e23313fbd4 Don't escape the heading as it contains a link 2012-03-09 23:15:40 +00:00
Tom Hughes
2351d02ed5 Fix mass assignment errors with user blocks 2012-03-09 23:15:39 +00:00
Tom Hughes
58d889436f Fix various routing and route generation errors 2012-03-09 23:15:39 +00:00
Tom Hughes
6391ea5a7a Remove method tests that are now enforced by the routes 2012-03-09 20:19:55 +00:00
Tom Hughes
c74180ba0f Update schema 2012-03-09 20:17:21 +00:00
Tom Hughes
ef820ade46 Fix some incorrect tests that relied on the default routes 2012-03-09 20:16:18 +00:00
Tom Hughes
d5bdf633bf Remove some unecessary routes and add lots of method constraints 2012-03-09 20:15:34 +00:00
Tom Hughes
90e46a58de Add routing tests for all supported routes 2012-03-09 19:49:44 +00:00
Tom Hughes
6de8c2e6b3 Get the per-user note list view working again 2012-03-09 12:54:19 +00:00
Tom Hughes
39b20bb85d Fix some bugs found by the note controller tests 2012-03-09 00:42:43 +00:00
Tom Hughes
81d6b9dd28 Update note controller tests for new GeoJSON output 2012-03-09 00:42:22 +00:00
Tom Hughes
fbf2310721 Remove redundant routes and add default format specifiers 2012-03-09 00:41:15 +00:00
Tom Hughes
11af5c266d Update schema 2012-03-09 00:35:23 +00:00
Tom Hughes
6f88f4d03f Fix mass assignment issues 2012-03-09 00:34:16 +00:00
Tom Hughes
67017dbca4 User errors.add(:base) instead of the removed errors.add_to_base() 2012-03-09 00:32:57 +00:00
Tom Hughes
2e1d9f3348 Make setting of a default status for new notes work 2012-03-09 00:31:53 +00:00
Tom Hughes
85d17f257c Include the event type in the JSON output of a note 2012-03-09 00:29:22 +00:00
Tom Hughes
82cf356d85 Drop with_format and user the new :formats render option instead 2012-03-09 00:28:03 +00:00
Tom Hughes
b012617608 Save the user record after changing it 2012-03-09 00:21:08 +00:00
Tom Hughes
4dfe43c956 Fix typo 2012-03-08 23:17:38 +00:00
Tom Hughes
0c681571e2 Update Potlatch 2 to 2.3-212-g774c6a9 build 2012-03-08 22:48:36 +00:00
Tom Hughes
88541c523d Use normal assignment instead of mass assignment 2012-03-08 22:41:25 +00:00
Tom Hughes
e660e60966 Merge branch 'master' into openstreetbugs
Conflicts:
	Gemfile
	Gemfile.lock
	lib/migrate.rb
2012-03-08 18:23:27 +00:00
Tom Hughes
cb5e6ebfaa Update Potlatch 2 to 2.3-210-g4e72cd6 build 2012-03-07 21:20:51 +00:00
Tom Hughes
222cd46a57 Add some more unit tests for traces 2012-03-07 21:12:02 +00:00
Tom Hughes
e3152ea1c7 Add some more unit tests for users 2012-03-07 16:44:58 +00:00
Tom Hughes
fc0b4e2dba Update schema 2012-03-07 16:44:50 +00:00
Tom Hughes
2a62ebec53 Add some extra unit tests for diary entries 2012-03-07 15:59:07 +00:00
Tom Hughes
1cc882b23f Fix migration to work with mass assignment protection 2012-03-06 19:00:49 +00:00
Tom Hughes
d9ba72e66f Update Potlatch 2 to 2.3-209-g749f2c8 build 2012-03-06 17:37:34 +00:00
Tom Hughes
32817fe26c Update Potlatch 2 to 2.3-208-g7b7f802 build 2012-03-06 17:21:33 +00:00
Tom Hughes
4d7c3db62c Use cache store for sessions when memcached is not available
Using cookie store is problematic because there is a limit to the
amount of session data you can store, and we sometimes overflow.
2012-03-06 10:42:37 +00:00
Tom Hughes
c5a54b779c Add a temporary hack to suppress some broken rails translations
See https://github.com/svenfuchs/rails-i18n/issues/194 for more
information and progress on an upstream fix.
2012-03-06 09:21:26 +00:00