aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* Merge commit 'petter/catalyst-norwegian-translation'Matthew Somerville2011-09-05-2/+3
|\
| * Add link to personal page.Petter Reinholdtsen2011-09-01-0/+1
| |
| * Fix typo in confirm email.Petter Reinholdtsen2011-09-01-1/+1
| |
| * Fix typo, missing space.Petter Reinholdtsen2011-09-01-1/+1
| |
* | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreetStruan Donald2011-09-05-41/+47
|\ \
| * | Version the JS files.Matthew Somerville2011-09-02-35/+44
| | |
| * | Better call to SASS to only do it if needed etc.Matthew Somerville2011-09-02-4/+1
| | |
| * | Disable address in RSS temporarily.Matthew Somerville2011-09-02-2/+2
| | |
* | | display link to site for all visible states plus fix a few other hardcodedStruan Donald2011-09-05-4/+11
|/ / | | | | | | states. fixes #154
* | Versioning of CSS files, remove generated CSS files from repo.Matthew Somerville2011-09-02-848/+26
| |
* | Fix questionnaire test (broke due to being 6 months after fixed date); more ↵Matthew Somerville2011-09-02-17/+18
| | | | | | | | fixes to update tests.
* | more sensible test for non authority users making forbidden state changesStruan Donald2011-09-02-5/+1
|/
* Check for processes hanging around.Matthew Somerville2011-08-30-1/+7
|
* Merge branch 'catalyst-norwegian-translation' of ↵Matthew Somerville2011-08-30-196/+121
|\ | | | | | | git://github.com/petterreinholdtsen/fixmystreet
| * Complete translations.Petter Reinholdtsen2011-08-29-24/+12
| |
| * A few more translations.Petter Reinholdtsen2011-08-28-5/+5
| |
| * Fix and unfuzzy some more.Petter Reinholdtsen2011-08-20-31/+20
| |
| * Fix and unfuzzy some more.Petter Reinholdtsen2011-08-19-19/+15
| |
| * Fix and unfuzzy.Petter Reinholdtsen2011-08-19-15/+7
| |
| * Typo.Petter Reinholdtsen2011-08-19-1/+1
| |
| * Update PO-Revision-Date, Last-TranslatorKagee2011-08-20-2/+2
| |
| * Fix typoKagee2011-08-20-1/+1
| |
| * More translations (complete?)Kagee2011-08-20-34/+38
| |
| * More translations.Petter Reinholdtsen2011-08-18-81/+37
| |
* | Add address information to description in RSS feedsStruan Donald2011-08-29-11/+67
| |
* | add enc type to mapForm to make photo uploading workStruan Donald2011-08-29-1/+1
| |
* | show user flagged status on user search pageStruan Donald2011-08-26-0/+2
| |
* | test for removing flag and make it workStruan Donald2011-08-26-1/+15
| |
* | add flagged checkbox to user edit admin pageStruan Donald2011-08-26-0/+22
| |
* | Merge branch 'new_statuses'Struan Donald2011-08-19-149/+2376
|\ \ | |/ |/|
| * correct council list delimiterStruan Donald2011-08-19-2/+2
| |
| * few more static statesStruan Donald2011-08-18-4/+4
| |
| * regenerate cssStruan Donald2011-08-18-9/+649
| |
| * use correct skipStruan Donald2011-08-18-60/+62
| |
| * show closed problems on my pageStruan Donald2011-08-18-1/+6
| |
| * do not use raw problem state to categorise problemsStruan Donald2011-08-18-1/+2
| |
| * avoid warnings about uninitalized valuesStruan Donald2011-08-18-1/+1
| |
| * remove hard coded state stringsStruan Donald2011-08-18-7/+10
| |
| * remove hard coded references to fixedStruan Donald2011-08-18-8/+9
| |
| * Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵Struan Donald2011-08-17-1310/+3501
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | update test for changed maps and fix state checkingStruan Donald2011-07-28-10/+10
| | |
| * | use the correct council separator characterStruan Donald2011-07-27-3/+3
| | |
| * | Merge branch 'new_statuses' of ↵Struan Donald2011-07-27-2/+3
| |\ \ | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/fixmystreet into new_statuses
| | * | Couple of typos in bits of code.Matthew Somerville2011-07-19-2/+3
| | | |
| * | | use belongs_to_council in admin update listStruan Donald2011-07-27-1/+1
| | | |
| * | | allow council user to update state on problem sent to multiple councilsStruan Donald2011-07-27-5/+59
| | | |
| * | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵Struan Donald2011-07-26-2811/+3668
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | brief documentation on statesStruan Donald2011-07-01-0/+74
| | | |
| * | | Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet ↵Struan Donald2011-07-01-1/+1
| |\ \ \ | | | | | | | | | | | | | | | into new_statuses
| * | | | check we have a council user before comparing with problem councilStruan Donald2011-06-30-1/+1
| | | | |