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 branch 'redesign'	Matthew Somerville	2012-03-14	-23/+23
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore notes/INSTALL perllib/FixMyStreet/App/Controller/Photo.pm perllib/FixMyStreet/Cobrand/FixMyStreet.pm
\| *	Update error message (missed from previous).	Matthew Somerville	2012-03-14	-2/+2
\| \|
\| *	Store full size photos that are uploaded on filesystem, put hash in ↵	Matthew Somerville	2012-03-08	-2/+2
\| \| \| \| \| \| \| \|	database. Fixes #9, basics for #209 (needs light box adding).
\| *	Get test suite all passing again, and fix bug displaying partial photo and ↵	Matthew Somerville	2012-03-02	-19/+21
\| \| \| \| \| \| \| \|	my stupid use of c as a variable.
* \|	Improve cobrand mapping with ALLOWED_COBRANDS for #215.	Matthew Somerville	2012-02-06	-5/+3
\| \|
* \|	make sure admin summary page handle new cobrand structure correctly	Struan Donald	2012-02-02	-0/+2
\|/
*	Remember checkbox change even if name is blank, for #188.	Matthew Somerville	2012-01-27	-2/+2
\|
*	If password field left blank when reporting/updating, ignore that for ↵	Matthew Somerville	2012-01-20	-9/+28
\| \| \| \| \| \|	password setting. This is so if someone temporarily forgets their password, and uses email confirmation to confirm without setting a new password, their old password isn't lost.
*	Give all council cobrands a common parent to use.	Matthew Somerville	2012-01-13	-9/+8
\|
*	Merge remote branch 'origin/master'	Struan Donald	2012-01-12	-1/+1
\|\
\| *	Fix bug in admin interface deleting a mark-fixed comment.	Matthew Somerville	2012-01-11	-1/+1
\| \|
* \|	pass even if line wraps	Struan Donald	2012-01-12	-2/+2
\|/
*	Fix test for when long domain name pushes things over one line.	Matthew Somerville	2012-01-06	-2/+2
\|
*	fix date format for dates that are now from a previous year	Struan Donald	2012-01-06	-20/+20
\|
*	deal with missing geocode data when generating nearest road text in email alerts	Struan Donald	2011-12-13	-1/+141
\|
*	also check that cached geocode object looks roughly correct	Struan Donald	2011-12-05	-0/+1
\|
*	add in some tests for closest address methods	Struan Donald	2011-12-05	-0/+77
\|
*	Merge branch 'rss-addresses'	Struan Donald	2011-11-30	-1/+196
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: db/schema.sql perllib/FixMyStreet/DB/Result/Problem.pm
\| *	tests for postcode in alert emails	Struan Donald	2011-11-30	-0/+69
\| \|
\| *	make the test and description match	Struan Donald	2011-11-29	-1/+1
\| \|
\| *	sanity check that non postcodes come through	Struan Donald	2011-11-29	-0/+6
\| \|
\| *	canonicalise postcode for display in RSS titles	Struan Donald	2011-11-29	-1/+2
\| \|
\| *	include nearest road data in rss feed if available, plus tests	Struan Donald	2011-11-28	-0/+118
\| \|
\| *	add in postcode to email alert titles	Struan Donald	2011-11-28	-1/+2
\| \|
* \|	error message not consistent so make check more general	Struan Donald	2011-11-21	-1/+1
\| \|
* \|	Merge branch 'js-validation'	Struan Donald	2011-11-21	-6/+56
\|\ \
\| * \	Merge remote branch 'origin/master' into js-validation	Struan Donald	2011-11-18	-7/+814
\| \|\ \
\| * \ \	Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵	Struan Donald	2011-09-21	-25/+81
\| \|\ \ \ \| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into js-validation Conflicts: templates/web/default/report/display.html
\| * \| \|	Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵	Struan Donald	2011-09-05	-22/+25
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into js-validation Conflicts: templates/web/default/common_header_tags.html
\| * \| \| \|	fix failing test due to now having error messages in js elsewhere on the page	Struan Donald	2011-09-05	-6/+6
\| \| \| \| \|
\| * \| \| \|	do not display spurious name error message when sign in during report ↵	Struan Donald	2011-09-05	-0/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	submission fails
* \| \| \| \|	more verbose error messages for open311	Struan Donald	2011-11-18	-1/+19
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Merge branch 'open311-consumer'	Struan Donald	2011-10-20	-2/+809
\|\ \ \ \
\| * \| \| \|	fix some failing encoding tests	Struan Donald	2011-10-20	-2/+3
\| \| \| \| \|
\| * \| \| \|	if we have two conflicting existing contacts then skip the update	Struan Donald	2011-10-11	-4/+63
\| \| \| \| \|
\| * \| \| \|	reduce duplicate code	Struan Donald	2011-10-11	-135/+38
\| \| \| \| \|
\| * \| \| \|	test existing contacts are deleted	Struan Donald	2011-10-11	-1/+71
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	udpate service code for contact with same category
\| * \| \| \|	handle change of service name for existing service code	Struan Donald	2011-10-11	-0/+75
\| \| \| \| \|
\| * \| \| \|	rewrite populate service list to enable testing and add some tests	Struan Donald	2011-10-10	-0/+148
\| \| \| \| \|
\| * \| \| \|	Merge remote branch 'origin/master' into open311-consumer	Struan Donald	2011-10-10	-25/+81
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| * \| \| \|	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
\| * \| \| \|	fix failing test and remove debug code	Struan Donald	2011-08-22	-4/+4
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵	Struan Donald	2011-08-22	-64/+1069
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into open311-consumer Conflicts: t/app/model/problem.t templates/web/default/report/new/fill_in_details.html web/css/core.css
\| * \ \ \ \	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
\| * \| \| \| \| \|	shuffle problem update code about to make it easier to test and write some tests	Struan Donald	2011-08-12	-0/+198
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	delete user created in test	Struan Donald	2011-08-12	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	move problem update into problem model and add some tests, plus attempt some ↵	Struan Donald	2011-08-11	-0/+108
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	timezone things
\| * \| \| \| \| \|	Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵	Struan Donald	2011-08-09	-6/+6
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into open311-consumer
\| * \ \ \ \ \ \	Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵	Struan Donald	2011-08-09	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into open311-consumer Conflicts: web/css/core.css
\| * \| \| \| \| \| \| \|	check that the generated select has all the elements we expect	Struan Donald	2011-08-04	-0/+9
\| \| \| \| \| \| \| \| \|