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
*	Add *.swp to .gitignore	Hakim Cassimally	2014-05-22	-0/+1
\|
*	Install Carton in its own local::lib.	Matthew Somerville	2014-02-26	-5/+2
\| \| \| \|	This keeps the dependencies of carton separate from those of FixMyStreet.
*	Factor CSS so that all SCSS is under cobrand, and non-SCSS is in css/ under ↵	Matthew Somerville	2013-07-27	-11/+1
\| \| \| \|	that.
*	ignore seesomething cobrand as it is pulled in from another repo	Struan Donald	2013-01-07	-0/+1
\|
*	add oxfordshire cobrand CSS, based solely on fixmystreet cobrand	Dave Whiteland	2012-12-04	-0/+1
\|
*	Merge branch 'stevenage'	Struan Donald	2012-11-19	-0/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore bin/make_css conf/crontab.ugly perllib/FixMyStreet/Cobrand/Default.pm perllib/Open311.pm templates/web/fixmystreet/around/postcode_form.html
\| *	ignore stevenage css	Struan Donald	2012-10-23	-0/+1
\| \|
* \|	ignore autogenerated FixMyBarangay.po	Struan Donald	2012-09-26	-0/+1
\| \|
* \|	Merge remote-tracking branch 'origin/master' into fmb-read-only	Struan Donald	2012-08-22	-1/+7
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore bin/make_css conf/general.yml-example perllib/FixMyStreet/App/Controller/Council.pm perllib/FixMyStreet/App/Controller/Report/New.pm perllib/FixMyStreet/Cobrand/Default.pm templates/web/default/around/around_index.html templates/web/default/index.html templates/web/emptyhomes/index.html templates/web/fixmystreet/around/around_index.html templates/web/fixmystreet/index.html web/fixmystreet_app_cgi.cgi web/fixmystreet_app_fastcgi.cgi
\| *	Ignore compiled Zurich CSS.	Matthew Somerville	2012-08-17	-0/+1
\| \|
\| *	Move .mo ignoring to top-level gitignore.	Matthew Somerville	2012-08-17	-0/+4
\| \|
\| *	Move default cobrand to new design.	Matthew Somerville	2012-07-13	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Due to old cobrands, this involves the subclasses implementing the web templates dir to ignore what the default is doing. A vaguely garish yet pleasing colour scheme has been chosen so that the site is both usable and suggests you may want to change it.
* \|	Merge branch 'master' into fmb-read-only	Dave Whiteland	2012-06-25	-0/+7
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore bin/make_css perllib/FixMyStreet/Cobrand/FixMyStreet.pm
\| *	Merge branch 'phonegap'	Struan Donald	2012-06-15	-0/+5
\| \|\
\| \| *	ignore more Android build files	Struan Donald	2012-06-12	-0/+1
\| \| \|
\| \| *	ignore Android bin directory	Struan Donald	2012-06-08	-2/+1
\| \| \|
\| \| *	Merge remote-tracking branch 'origin/master' into phonegap	Struan Donald	2012-05-23	-0/+1
\| \| \|\
\| \| * \|	ignore phonegap JS config file	Struan Donald	2012-03-19	-0/+1
\| \| \| \|
\| \| * \|	remove what seem to be working files and add ignore them in future	Struan Donald	2012-03-19	-0/+4
\| \| \| \|
\| * \| \|	Merge branch 'barnet-newstyle'	Struan Donald	2012-06-08	-0/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore perllib/FixMyStreet/Cobrand/FixMyStreet.pm perllib/FixMyStreet/Cobrand/UKCouncils.pm templates/web/default/reports/council.html templates/web/fixmystreet/header.html templates/web/fixmystreet/report/display.html web/cobrands/bromley/layout.scss web/cobrands/fixmystreet/fixmystreet.js web/js/map-OpenLayers.js
\| \| * \| \|	ignore barnet css files	Struan Donald	2012-04-24	-0/+1
\| \| \| \|/ \| \| \|/\|
\| * \| \|	Store compiled photos on file system.	Matthew Somerville	2012-05-30	-0/+1
\| \| \| \|
* \| \| \|	Merge remote branch 'origin/master' into fmb-read-only	Dave Whiteland	2012-05-29	-0/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: bin/send-reports perllib/FixMyStreet/Cobrand/Default.pm perllib/FixMyStreet/Cobrand/FixMyStreet.pm templates/web/fixmystreet/alert/index.html templates/web/fixmystreet/around/display_location.html web/cobrands/fixmystreet/_layout.scss web/js/map-OpenLayers.js
\| * \| \|	Start to consolidate disparate JavaScript files.	Matthew Somerville	2012-03-28	-0/+1
\| \|/ /
* / /	Black/white colour for FMB (and can be used for default look later, hopefully).	Matthew Somerville	2012-04-25	-0/+1
\|/ /
* /	Initial creation of Bromley cobrand.	Matthew Somerville	2012-03-22	-0/+1
\|/
*	Merge branch 'redesign'	Matthew Somerville	2012-03-14	-0/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore notes/INSTALL perllib/FixMyStreet/App/Controller/Photo.pm perllib/FixMyStreet/Cobrand/FixMyStreet.pm
\| *	add compass config	Josh Angell	2012-02-10	-0/+2
\| \| \| \| \| \| \| \|	Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
* \|	ignore ms deployment files for blog	Struan Donald	2012-02-03	-0/+3
\| \|
* \|	ignore wordpress files	Struan Donald	2012-02-03	-0/+1
\| \|
* \|	Merge branch 'packaging'	Struan Donald	2012-02-02	-0/+2
\|\ \ \| \|/ \|/\| \| \| \| \|	Conflicts: .gitignore
\| *	ignore carton working directory	Struan Donald	2012-01-12	-0/+1
\| \|
\| *	ignore /local	Struan Donald	2012-01-12	-0/+1
\| \|
* \|	Initial redesign to fit FixMyTransport mySociety bar and font choice.	Matthew Somerville	2012-01-10	-0/+1
\|/
*	ignore generated css file for reading cobrand	Struan Donald	2011-10-18	-0/+1
\|
*	Versioning of CSS files, remove generated CSS files from repo.	Matthew Somerville	2011-09-02	-1/+5
\|
*	Compile templates and set a long stat TTL in production.	Matthew Somerville	2011-08-11	-0/+1
\|
*	ignore tags file	Struan Donald	2011-05-26	-0/+1
\|
*	Create Around controller and implement the easy bits	Edmund von der Burg	2011-04-12	-0/+1
\|
*	Added more files to ignore	Edmund von der Burg	2011-04-05	-0/+1
\|
*	Merge branch 'master' into migrate_to_catalyst	Edmund von der Burg	2011-04-04	-1/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore commonlib conf/packages perllib/FixMyStreet/Map.pm templates/website/cobrands/barnet/footer web/confirm.cgi web/css/core.css web/import.cgi web/index.cgi
\| *	Use SCSS to generate CSS - no change to actual CSS at this point.	Matthew Somerville	2011-03-25	-0/+1
\| \|
* \|	Created app using catalyst.pl	Edmund von der Burg	2011-02-22	-0/+4
\| \|
* \|	Add note to prompt when env setup	Edmund von der Burg	2011-02-22	-0/+1
\| \| \| \| \| \| \| \|	ignore local-lib5
* \|	ignore Mac meta files	Edmund von der Burg	2011-02-22	-1/+1
\|/
*	Ignore editor temporary files	Edmund von der Burg	2011-02-03	-1/+3
\|
*	Updating .gitignore	Louise Crow	2010-01-25	-1/+2
\|
*	More .gitignores	Louise Crow	2010-01-25	-0/+1