aboutsummaryrefslogtreecommitdiffstats
path: root/templates
Commit message (Collapse)AuthorAgeLines
* Don't show not-sent-to-council message on main site for Bromley reports that ↵Matthew Somerville2012-05-30-1/+5
| | | | they will be.
* Have Bromley logo on main site too, use short name in confirmation emails.Matthew Somerville2012-05-30-26/+6
|
* Merge remote-tracking branch 'origin/master'Struan Donald2012-05-30-47/+31
|\
| * Use right parameter system for right emails.Matthew Somerville2012-05-29-9/+9
| |
| * Have central email signature for emails.Matthew Somerville2012-05-29-33/+21
| |
| * Make sure same message is displayed on main site for councils.Matthew Somerville2012-05-29-14/+10
| |
* | change confirmation message signoffStruan Donald2012-05-29-0/+20
|/
* Have as a normal div, otherwise no-JS IE7 can't style it and the wrong logo ↵Matthew Somerville2012-05-25-2/+2
| | | | appears.
* Text tweaks.Matthew Somerville2012-05-23-4/+4
|
* Text updates from Bromley.Matthew Somerville2012-05-22-28/+55
|
* Merge branch 'master' into bromleyMatthew Somerville2012-05-22-45/+34
|\ | | | | | | | | | | Conflicts: bin/send-reports perllib/FixMyStreet/App/Controller/Report/New.pm
| * StreetReport seems to have disappeared.Matthew Somerville2012-05-18-45/+34
| |
* | Text on update form, YR13.Matthew Somerville2012-05-21-6/+8
| |
* | Tidy up Bromley templates a bit.Matthew Somerville2012-05-17-223/+25
| |
* | Fixes and improvements for tests.Matthew Somerville2012-05-16-1/+1
| |
* | Merge branch 'master' into bromleyMatthew Somerville2012-05-16-399/+247
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Update council text.Matthew Somerville2012-05-15-8/+13
| |
| * added can_display_external_id because external ids are not always useful for ↵Dave Whiteland2012-05-03-5/+6
| | | | | | | | publishing, using send_method_used to determine that on a council-by-council basis
| * Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreetDave Whiteland2012-05-03-2/+12
| |\
| | * Only include fancybox JS/CSS on pages that need it.Matthew Somerville2012-05-02-2/+12
| | |
| * | Merge branch 'barnet-integration'Dave Whiteland2012-05-02-4/+7
| |\ \ | | |/ | |/|
| | * Merge branch 'master' into barnet-integrationDave Whiteland2012-04-29-378/+207
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | (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
| | * | added council external reference to problem display pageDave Whiteland2012-03-23-2/+5
| | | |
| | * | do not display London Report-It text for BarnetStruan Donald2012-03-23-2/+2
| | | |
| * | | Escape single quotes (from translations).Matthew Somerville2012-05-02-10/+10
| | | |
| * | | Fix bug in admin user search, and add council ID search.Matthew Somerville2012-05-02-1/+5
| | | |
| * | | fix faq links on privacy pageStruan Donald2012-05-01-3/+3
| | |/ | |/|
| * | Shortcircuit email admin search.Matthew Somerville2012-04-20-1/+1
| | |
| * | Update jQuery to 1.7.2.Matthew Somerville2012-04-20-1/+1
| | |
| * | Update privacy policy.Matthew Somerville2012-04-19-17/+83
| | |
| * | Merge branch 'barnet-restyle'Dave Whiteland2012-04-17-239/+107
| |\ \
| | * | removed dependency on staging (dave) for static resources, sharing Barnet ↵Dave Whiteland2012-04-17-9/+9
| | | | | | | | | | | | | | | | pledgebank
| | * | Barnet breadcrumb better to use path rather than title for homeDave Whiteland2012-04-17-1/+1
| | | |
| | * | fixed wrong css class on nav sidebar items in Barnet footerDave Whiteland2012-04-17-4/+4
| | | |
| | * | remove Barnet staging bannerDave Whiteland2012-04-17-5/+0
| | | |
| | * | Barnet breadcrumb home is site home, added title to breadcrumb trailDave Whiteland2012-04-17-2/+2
| | | |
| | * | FMS update for new Barnet style (April 2012)Dave Whiteland2012-04-13-239/+112
| | | |
| * | | Remove more duplicate templates.Matthew Somerville2012-04-17-109/+0
| |/ /
* | | Put photos back at bottom of page, where they should be, and fix desktop ↵Matthew Somerville2012-05-14-12/+12
| | | | | | | | | | | | display in a simpler way.
* | | Better council text on alert page.Matthew Somerville2012-05-14-9/+15
| | |
* | | Bromley questionnaire email text.Matthew Somerville2012-05-14-0/+24
| | |
* | | Fix some URLs so that it works under HTTPS.Matthew Somerville2012-05-11-1/+1
| | |
* | | Merge remote-tracking branch 'origin/bromley' into bromleyStruan Donald2012-05-11-8/+23
|\ \ \
| * | | Get data for dashboard dropdowns and enable faceted lookup using them.Matthew Somerville2012-05-08-8/+23
| | | |
* | | | add ability to suppress alerts to report creator onStruan Donald2012-05-11-0/+5
|/ / / | | | | | | | | | comments updated from open311
* | | Dashboard initial start.Matthew Somerville2012-05-04-0/+131
| | |
* | | Bromley have changed their mind, want all pins one colour again.Matthew Somerville2012-05-02-1/+1
| | |
* | | Enable council user to remove report from site using front end button.Matthew Somerville2012-05-02-2/+8
| | |
* | | Merge remote-tracking branch 'origin/bromley' into bromleyStruan Donald2012-05-02-3/+7
|\ \ \
| * | | Have Bromley logo in their updates.Matthew Somerville2012-05-01-3/+7
| | | |