aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* Merge remote-tracking branch 'upstream/master' into origin/norway3origin/norway3norway3utvk2017-11-10-42/+187
|\
| * Merge branch 'develop'Louise Crow2017-10-23-277/+62
| |\
| | * Merge branch 'release/0.30.0.0' into developLouise Crow2017-09-27-277/+62
| | |\
| | | * Remove non-responsive assetsLouise Crow2017-09-22-274/+0
| | | * Remove obsolete partialLouise Crow2017-09-22-1/+0
| | | * Add menu stylingLouise Crow2017-09-22-0/+46
| | | * Move file content type icons to subdirectoryLouise Crow2017-09-22-0/+0
| | | * Use HTTP methods for custom routesLouise Crow2017-09-22-2/+2
| | | * Add extra theme assets to the asset pathLouise Crow2017-09-22-0/+14
| | |/
| | * Merge branch 'master' into developGareth Rees2017-03-22-18/+75
| | |\ | | |/ | |/|
| * | Remove deprecated disable_with button optionGareth Rees2017-03-22-2/+2
| * | Move assets to app/assetsGareth Rees2017-03-22-0/+1
| * | Merge branch 'pro-beta-release-tweaks'Louise Crow2017-02-14-0/+11
| |\ \
| | * | make user menu links visibleMartin Wright2017-02-08-0/+11
| | |/
| * | Remove duplication of action bar button stylesHEADmasterGareth Rees2017-01-19-26/+26
| * | Style action menu buttonsGareth Rees2017-01-19-9/+38
| * | Add extra default coloursGareth Rees2017-01-19-0/+4
| * | Remove example overrideGareth Rees2017-01-19-3/+3
| * | Rspec uses expect, not assertGareth Rees2017-01-19-2/+2
| * | 2-space indentGareth Rees2017-01-19-3/+3
| * | Add encoding line to Ruby filesGareth Rees2017-01-19-0/+12
| * | Merge branch 'develop'Gareth Rees2016-12-14-17/+42
| |\|
| | * Style request page action barGareth Rees2016-12-14-0/+17
| | * Fix incorrect conflict resolutionGareth Rees2016-12-14-2/+2
| | * Fix unclosed <dd> tagGareth Rees2016-12-14-1/+1
| | * Merge remote-tracking branch 'origin/master' into developGareth Rees2016-12-14-1090/+1319
| | |\ | | |/ | |/|
| * | Merge branch '83-request-status-text-colour'Gareth Rees2016-12-14-0/+4
| |\ \
| | * | Make request status text blackGareth Rees2016-12-14-0/+4
| * | | Merge branch '84-sidebar-make-request'Gareth Rees2016-12-14-23/+31
| |\ \ \
| | * | | Style sidebar CTA buttonGareth Rees2016-12-12-0/+8
| | * | | Move hero CTA to homepage-hero scopeGareth Rees2016-12-12-23/+23
| | |/ /
| * / / Add request reporting sections to the help/about pagelizconlan2016-12-13-1/+29
| |/ /
| * | Merge remote-tracking branch 'origin/add-text-on-request-closure'Gareth Rees2016-12-12-0/+9
| |\ \
| | * | Add text on request closure.Louise Crow2016-11-24-0/+9
| * | | Merge branch '85-correspondence-date-link-colour'Gareth Rees2016-12-12-1/+6
| |\ \ \
| | * | | Tweak scope of incoming correspondence link colourGareth Rees2016-12-06-1/+1
| | * | | Force correspondence date links to always be greyGareth Rees2016-12-06-0/+5
| |/ / /
| * / / Update model patch example to include the default_letter param overridelizconlan2016-12-05-0/+4
| |/ /
| * | Merge branch 'settings-file'lizconlan2016-09-16-53/+51
| |\ \
| | * | Remove #logo_wrapper from stylesheetlizconlan2016-08-22-17/+0
| | * | Move scss settings to _settings.scsslizconlan2016-08-22-36/+51
| |/ /
| | * Merge remote-tracking branch 'origin/enable-annotations' into developGareth Rees2016-04-01-25/+33
| | |\
| | | * Update templates to match new ENABLE_ANNOTATIONS settingSteven Day2016-03-31-25/+33
| | * | Merge branch 'master' into developGareth Rees2016-03-16-0/+0
| | |\|
* | | | Fix typo in contact page.norway2Petter Reinholdtsen2017-03-02-1/+1
* | | | Missing "utvk2017-02-12-1/+1
* | | | activate piwikutvk2017-02-12-3/+3
* | | | adjust color on profile menuutvk2017-02-11-1/+6
* | | | make profile menu readableutvk2017-02-11-0/+5
* | | | moved sass settings to _settings.scssutvk2017-02-11-41/+58