aboutsummaryrefslogtreecommitdiffstats
path: root/conf
Commit message (Collapse)AuthorAgeLines
* Merge remote-tracking branch 'origin/master' into fmb-read-onlyStruan Donald2012-08-22-82/+104
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * needs to have empty string otherwise deploy gets confusedStruan Donald2012-08-17-1/+1
| |
| * Point out the en-gb line should always be included.Matthew Somerville2012-08-17-0/+1
| |
| * Allow reports_per_page to be specified in config file,Matthew Somerville2012-08-17-7/+9
| |
| * Consolidate postcode form template, move question to template, and move ↵Matthew Somerville2012-08-17-0/+4
| | | | | | | | admin_base_url to config.
| * Get disambiguate_location from config file, with big explanation.Matthew Somerville2012-08-17-18/+39
| |
| * Allow the MapIt types to be given in config.Matthew Somerville2012-08-17-6/+21
| |
| * Allow languages to be given in config file.Matthew Somerville2012-08-16-0/+5
| |
| * Allow example_places to be specified in config file.Matthew Somerville2012-08-16-0/+4
| |
| * Remove packages that are installed by carton.Matthew Somerville2012-08-08-46/+0
| |
| * make is needed to use cpanm.Matthew Somerville2012-08-08-0/+2
| |
| * Not needed as package, carton installs it.Matthew Somerville2012-08-07-2/+0
| |
| * Get port for default mapit URL.Matthew Somerville2012-07-18-1/+3
| |
| * Blank YAML seems to be an issue with deployment..Matthew Somerville2012-07-18-1/+1
| |
| * Remove old test suite, and some unused config variables, tidying up config file.Matthew Somerville2012-07-16-27/+49
| |
| * turn off kasabi export as kasabi is being turned offStruan Donald2012-07-09-6/+0
| |
* | allow send-reports etc to run on fmb testStruan Donald2012-07-12-1/+1
| |
* | have to have a value, even if it is an empty stringStruan Donald2012-07-12-1/+1
| |
* | add MESSAGE_MANAGER_URL configDave Whiteland2012-07-11-0/+4
|/
* Carp::Clan actually in carton.lock so do not require hereStruan Donald2012-06-13-2/+0
|
* Typo package name.Matthew Somerville2012-06-13-2/+2
|
* add in missing packages discovered in backup restore testingStruan Donald2012-06-13-0/+4
|
* Merge branch 'master' into bromleyMatthew Somerville2012-05-16-1/+39
|\
| * Add squeeze+testing packages file for ruby-compass.Matthew Somerville2012-05-16-1/+39
| |
* | Merge branch 'master' into bromleyMatthew Somerville2012-05-16-38/+42
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/send-reports conf/crontab.ugly conf/general.yml-example db/schema.sql perllib/FixMyStreet/App/Controller/Admin.pm perllib/FixMyStreet/App/Controller/Report/New.pm perllib/FixMyStreet/DB/Result/Comment.pm perllib/FixMyStreet/DB/Result/Open311conf.pm perllib/FixMyStreet/DB/Result/Problem.pm perllib/FixMyStreet/DB/Result/User.pm templates/web/default/js/validation_strings.html templates/web/fixmystreet/auth/sign_out.html templates/web/fixmystreet/report/new/councils_text_all.html web/cobrands/fixmystreet/_base.scss
| * Merge branch 'install-details' of https://github.com/mhl/fixmystreetMatthew Somerville2012-05-11-38/+39
| |\
| | * Add a symlink from packages to packages.squeezeMark Longair2012-05-03-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Matthew Somerville for pointing out that this would stop the deploy mechanism from being able to find the package list. (I will independently change deploy-vhost to check preferentially for a release-specific packages list.)
| | * ruby-compass shouldn't be in the squeeze package listMark Longair2012-05-03-1/+0
| | | | | | | | | | | | Thanks to Matthew Somerville for pointing this out.
| | * Move towards one package list for a defined distributionMark Longair2012-04-23-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous version of the instructions suggested an xargs invocation that didn't work: a whitespace-separated '|' in conf/packages caused every package to be selected. It also seems like a good idea to have package lists and instructions that are specific to a known-to-work distribution, and add others if they are contributed.
| * | Merge branch 'master' into barnet-integrationDave Whiteland2012-04-29-0/+3
| |\| | | | | | | | | | | | | | | | | | | | | | (prior to go-live... amongst other things, the Barnet web templates had changed. NB conflict with carton.lock, accepted master in full) Conflicts: carton.lock
| | * Output Cache-Control no-transform header for JS files to work around UK ↵Matthew Somerville2012-04-20-0/+1
| | | | | | | | | | | | mobile operators incompetently rewriting JavaScript over the air.
| | * Merge branch 'master' of https://github.com/2bobsworth/fixmystreetMatthew Somerville2012-04-16-0/+1
| | |\
| | | * Merge remote branch 'upstream/master'FixMyStreet2012-04-14-3/+10
| | | |\
| | | * | Adding postgresql-8.4 to conf/packagesAndrew Perry2012-04-01-0/+1
| | | | |
| | * | | Fix error with RDF literal not being converted to string.Matthew Somerville2012-04-16-9/+3
| | | |/ | | |/|
| | * | Comment out cron job to stop error emails until proper fix can be foundEdmund von der Burg2012-04-11-3/+10
| | |/
| * | remove BARNET_ENDPOINT from general-yml (now in datbase)Dave Whiteland2012-04-02-2/+0
| | |
| * | mail dave for integration-staging crons for nowDave Whiteland2012-03-23-0/+4
| | |
| * | staging not server, gahDave Whiteland2012-03-23-1/+1
| | |
| * | integration-staging server sends reportsDave Whiteland2012-03-23-1/+1
| | |
| * | add ruby-sass as a dependency, remove libsoap-wsdl-perl and ↵Dave Whiteland2012-03-23-2/+0
| | | | | | | | | | | | libclass-std-fast-perl since these should be handled by carton
| * | add dave's dev machine to crontab for testingDave Whiteland2012-03-23-1/+1
| | |
| * | add barnet dependencies to documentationStruan Donald2012-03-23-0/+2
| | |
| * | clarified commentDave Whiteland2012-03-23-1/+1
| | |
| * | initial Barnet WSDL callDave Whiteland2012-03-23-0/+4
| |/
* | Have crontab mail set more appropriately on non-live sites.Matthew Somerville2012-05-15-0/+4
| |
* | new config optionStruan Donald2012-04-05-0/+3
| |
* | enable cron for bromley test and add in populate service listStruan Donald2012-03-28-1/+2
| |
* | add in fetch and send comments to cronStruan Donald2012-03-27-0/+2
|/
* Typo.Matthew Somerville2012-03-14-1/+1
|