| Commit message (Collapse) | Author | Age | Lines |
|
|
|
|
| |
Reads information from a theme object if present, and icons from a
theme directory, with fallbacks.
|
|
|
|
|
|
| |
This adds details of our Docker images and the example Docker
Compose environment, including notes on how to use this with
a cobrand and how to customise the database configuration.
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
This cobrand comes from the fixmystreet-commercial repository.
|
| |
|
| |
|
| |
|
|
|
|
|
| |
This lets you choose to e.g. minimize JS files during a deploy, without
making it mandatory as with the CSS.
|
| |
|
| |
|
|
|
|
|
|
|
|
| |
Move to using libsass via CSS::Sass, and stop using compass, supplying
any used mixins directly. This removes the need for any ruby/gem based
installation, and greatly increases the speed of compilation. make_css
is also enhanced, bringing in the file monitoring previously done by a
separate script and improving its dependency monitoring.
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
| |
The MakeMyIsland cobrand files now live in a separate repository:
mysociety/fixmystreet-international
The idea is that this repo will be checked out alongside the main fixmystreet
one and cobrand-specific files symlinked into place. To this end, the commit
also adds the MakeMyIsland symlinks to .gitignore.
|
|
|
|
| |
Fixes #786.
|
|
|
|
|
|
|
|
| |
Switching to bundler saves confusion about gem paths when running
sass/compass to compile the CSS.
Trusty can use precisely the same packages as precise, with a few tweaks
to generalise the contents.
|
|
|
|
|
|
|
| |
This makes it easier to set up, as you can do:
$ git clone --recursive https://github.com/mysociety/fixmystreet
$ cd fixmystreet
$ vagrant up --no-color
|
| |
|
|
|
|
| |
This keeps the dependencies of carton separate from those of FixMyStreet.
|
|
|
|
| |
that.
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
.gitignore
bin/make_css
conf/crontab.ugly
perllib/FixMyStreet/Cobrand/Default.pm
perllib/Open311.pm
templates/web/fixmystreet/around/postcode_form.html
|
| | |
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
.gitignore
bin/make_css
perllib/FixMyStreet/Cobrand/FixMyStreet.pm
|
| |\ |
|
| | | |
|
| | | |
|
| | |\ |
|
| | | | |
|
| | | | |
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | |/
| | |/| |
|
| | | | |
|
|\| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| |/ / |
|
|/ / |
|
|/ |
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
.gitignore
notes/INSTALL
perllib/FixMyStreet/App/Controller/Photo.pm
perllib/FixMyStreet/Cobrand/FixMyStreet.pm
|
| |
| |
| |
| | |
Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>
|