fixmystreet - This is mySociety's popular map-based reporting platform: easy to install in new countries and regions http://fixmystreet.org/

	Commit message (Collapse)	Author	Age	Lines
*	Merge remote branch 'origin/master' into open311-consumer	Struan Donald	2011-10-10	-23/+79
\|\
\| *	Decode template files read in with read_file, to prevent double encoding ↵	Matthew Somerville	2011-09-20	-3/+29
\| \| \| \| \| \| \| \|	(fixes #159). Also fix Welsh I18N test.
\| *	Change JSON response header for browsing map, so is not double-encoded. Add ↵	Matthew Somerville	2011-09-12	-1/+16
\| \| \| \| \| \| \| \|	tests for it.
\| *	Fix redirect of old Open311 URIs when they have query parameters.	Matthew Somerville	2011-09-12	-0/+13
\| \|
\| *	Fix tests, and remove unwanted height.	Matthew Somerville	2011-09-08	-15/+17
\| \|
\| *	Tidy up a bit of CSS.	Matthew Somerville	2011-09-08	-4/+4
\| \|
* \|	Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵	Struan Donald	2011-09-08	-22/+59
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into open311-consumer Conflicts: web/css/core.css web/js/fixmystreet.js
\| *	display link to site for all visible states plus fix a few other hardcoded	Struan Donald	2011-09-05	-0/+6
\| \| \| \| \| \| \| \|	states. fixes #154
\| *	Fix questionnaire test (broke due to being 6 months after fixed date); more ↵	Matthew Somerville	2011-09-02	-17/+18
\| \| \| \| \| \| \| \|	fixes to update tests.
\| *	more sensible test for non authority users making forbidden state changes	Struan Donald	2011-09-02	-5/+1
\| \|
\| *	test for removing flag and make it work	Struan Donald	2011-08-26	-0/+14
\| \|
\| *	add flagged checkbox to user edit admin page	Struan Donald	2011-08-26	-0/+20
\| \|
* \|	Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵	Struan Donald	2011-08-22	-64/+623
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into open311-consumer Conflicts: t/app/model/problem.t templates/web/default/report/new/fill_in_details.html web/css/core.css
\| *	correct council list delimiter	Struan Donald	2011-08-19	-2/+2
\| \|
\| *	use correct skip	Struan Donald	2011-08-18	-60/+62
\| \|
\| *	Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵	Struan Donald	2011-08-17	-23/+203
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into new_statuses Conflicts: db/schema.sql perllib/FixMyStreet/App/Controller/Admin.pm perllib/FixMyStreet/DB/Result/User.pm t/app/controller/admin.t templates/web/default/admin/update_edit.html web/css/core.css
\| * \|	use the correct council separator character	Struan Donald	2011-07-27	-2/+2
\| \| \|
\| * \|	allow council user to update state on problem sent to multiple councils	Struan Donald	2011-07-27	-1/+37
\| \| \|
\| * \|	Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵	Struan Donald	2011-07-26	-30/+211
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into new_statuses Conflicts: perllib/FixMyStreet/App/Controller/Admin.pm perllib/FixMyStreet/App/Controller/JSON.pm perllib/FixMyStreet/Map/Tilma/Original.pm web/css/core.css
\| * \ \	Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵	Struan Donald	2011-06-30	-30/+3
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into new_statuses Conflicts: perllib/FixMyStreet/App/Controller/Reports.pm
\| * \| \| \|	some extra info on updates	Struan Donald	2011-06-30	-0/+70
\| \| \| \| \|
\| * \| \| \|	make sure cobrand summary tests pass even if we have barnet entries in db	Struan Donald	2011-06-29	-0/+3
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵	Struan Donald	2011-06-28	-103/+274
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into new_statuses Conflicts: perllib/FixMyStreet/App/Controller/Report/Update.pm templates/web/default/report/display.html
\| * \| \| \| \|	correctly set mark_open/fixed in questionnaire generates updates	Struan Donald	2011-06-28	-0/+10
\| \| \| \| \| \|
\| * \| \| \| \|	store correct old state in questionnaire when creator marks problem as fixed	Struan Donald	2011-06-28	-1/+36
\| \| \| \| \| \|
\| * \| \| \| \|	display update marked as fixed text on questionnaire for all fixed states	Struan Donald	2011-06-28	-0/+49
\| \| \| \| \| \|
\| * \| \| \| \|	council users should be able to set state to confirmed	Struan Donald	2011-06-27	-0/+12
\| \| \| \| \| \|
\| * \| \| \| \|	user searching and editing	Struan Donald	2011-06-27	-0/+92
\| \| \| \| \| \|
\| * \| \| \| \|	Display council name next to updates from council users	Struan Donald	2011-06-27	-0/+2
\| \| \| \| \| \|
\| * \| \| \| \|	change to use from_council in users table and store the council id in	Struan Donald	2011-06-27	-10/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	there so we can check that the problem is for the council the user is from
\| * \| \| \| \|	Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵	Struan Donald	2011-06-27	-27/+20
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into new_statuses Conflicts: perllib/FixMyStreet/DB/Result/Comment.pm perllib/FixMyStreet/DB/Result/User.pm web/css/core.css
\| * \| \| \| \| \|	add extra states to problem count	Struan Donald	2011-06-23	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	indicate changes state in update meta information	Struan Donald	2011-06-23	-0/+51
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	check that state is permitted	Struan Donald	2011-06-23	-0/+33
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵	Struan Donald	2011-06-23	-8/+32
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into new_statuses
\| * \| \| \| \| \| \|	in progress banner	Struan Donald	2011-06-23	-0/+24
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	update problem status from update	Struan Donald	2011-06-23	-0/+46
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵	Struan Donald	2011-06-23	-20/+13
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into new_statuses
\| * \ \ \ \ \ \ \	Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵	Struan Donald	2011-06-23	-3/+3
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into new_statuses Conflicts: templates/web/default/report/display.html
\| * \| \| \| \| \| \| \| \|	prevent non authority users from changing the state on updates	Struan Donald	2011-06-23	-0/+34
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	display state dropdown on updates to authority users	Struan Donald	2011-06-23	-2/+27
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' into new_statuses	Struan Donald	2011-06-22	-1/+2
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵	Struan Donald	2011-06-21	-9/+24
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into new_statuses
\| * \| \| \| \| \| \| \| \| \| \|	remove more hardcoded references to fixed	Struan Donald	2011-06-21	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into new_statuses	Struan Donald	2011-06-21	-0/+1
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵	Struan Donald	2011-06-16	-0/+3
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into new_statuses
\| * \| \| \| \| \| \| \| \| \| \| \| \|	rename will not fix to closed	Struan Donald	2011-06-16	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	handle new states in report display and updating	Struan Donald	2011-06-16	-49/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	update report display to handle new statuses	Struan Donald	2011-06-15	-0/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵	Struan Donald	2011-08-16	-14/+192
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into open311-consumer Conflicts: db/schema.sql perllib/FixMyStreet/DB/Result/Problem.pm