Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into origin/norway3origin/norway3norway3 | utvk | 2017-11-10 | -21/+64 |
|\ | ||||
| * | Remove obsolete partial | Louise Crow | 2017-09-22 | -1/+0 |
| | | | | | | | | No longer needed after core commit d80e0ec0bc2bf81a0714cd44750da46faad44c06 | |||
| * | Remove deprecated disable_with button option | Gareth Rees | 2017-03-22 | -2/+2 |
| | | | | | | | | Now a subkey of the :data option | |||
| * | Fix incorrect conflict resolution | Gareth Rees | 2016-12-14 | -2/+2 |
| | | | | | | | | Missed including the <dt> in the conditional when resolving a merge conflict. | |||
| * | Fix unclosed <dd> tag | Gareth Rees | 2016-12-14 | -1/+1 |
| | | | | | | | | | | - Added a closing slash - Fixed indentation | |||
| * | Merge remote-tracking branch 'origin/master' into develop | Gareth Rees | 2016-12-14 | -922/+1125 |
| |\ | ||||
| | * | Add request reporting sections to the help/about page | lizconlan | 2016-12-13 | -1/+29 |
| | | | ||||
| | * | Add text on request closure. | Louise Crow | 2016-11-24 | -0/+9 |
| | | | ||||
| * | | Update templates to match new ENABLE_ANNOTATIONS setting | Steven Day | 2016-03-31 | -25/+33 |
| | | | | | | | | | | | | | | | | | | Alaveteli has added a feature to turn off annotations and some of the views use this to hide certain bits of text, so this makes the theme do the same. | |||
* | | | Fix typo in contact page.norway2 | Petter Reinholdtsen | 2017-03-02 | -1/+1 |
| | | | ||||
* | | | Missing " | utvk | 2017-02-12 | -1/+1 |
| | | | ||||
* | | | activate piwik | utvk | 2017-02-12 | -3/+3 |
| | | | ||||
* | | | merged unhappy template with upstream | utvk | 2017-02-11 | -4/+4 |
| | | | ||||
* | | | removed outgoing mailer view | utvk | 2017-02-11 | -15/+0 |
| | | | ||||
* | | | Revert "Removed captcha on signup" | utvk | 2016-12-17 | -52/+0 |
| | | | | | | | | | | | | This reverts commit 639b70aae5e68e52745d58052d330809c5d87344. | |||
* | | | Removed captcha on signup | utvk | 2016-12-16 | -0/+52 |
| | | | ||||
* | | | Fix typo, change ahref to 'a href'. | Petter Reinholdtsen | 2016-06-13 | -1/+1 |
| | | | ||||
* | | | Improved suggestions for unhappy users. | Petter Reinholdtsen | 2016-06-09 | -4/+13 |
| | | | ||||
* | | | merged into credits | utvk | 2016-05-12 | -1/+0 |
| | | | ||||
* | | | Merge branch 'master' into norway2 | utvk | 2016-05-11 | -980/+951 |
|\ \ \ | | |/ | |/| | ||||
| * | | Add generic example version of each required help page. | Louise Crow | 2016-04-26 | -875/+1080 |
| | | | ||||
| * | | Make code customization commented out examples. | Louise Crow | 2016-04-06 | -39/+0 |
| |/ | | | | | | | Rather than having them be live code. | |||
| * | Use new version of law_used_full method | Gareth Rees | 2016-03-08 | -1/+1 |
| | | ||||
* | | Removed frontpage intro, now use strings from transifex | utvk | 2015-12-27 | -8/+0 |
| | | ||||
* | | Adjustments after update to responsive theme | utvk | 2015-12-27 | -8/+10 |
| | | ||||
* | | Rebased changes from norway | utvk | 2015-12-26 | -87/+1288 |
|/ | ||||
* | Use https for google fonts | Gareth Rees | 2015-09-07 | -1/+1 |
| | ||||
* | Default typeface is now Source Sans | Martin Wright | 2015-08-21 | -1/+1 |
| | ||||
* | add hero styling and background image | Martin Wright | 2015-08-07 | -4/+0 |
| | ||||
* | add locale switcher from WDTK theme | Martin Wright | 2015-08-07 | -0/+7 |
| | ||||
* | Merge branch 'sidebar-url-helpers' into develop | Louise Crow | 2014-10-09 | -10/+10 |
|\ | ||||
| * | Use url helpers in the sidebar. | Louise Crow | 2014-09-09 | -10/+10 |
| | | | | | | | | Generally good practice. | |||
* | | Merge branch 'add_example_template' into develop | Louise Crow | 2014-09-19 | -0/+3 |
|\ \ | ||||
| * | | Add example template to indicate that this needs to be customized/translated. | Louise Crow | 2014-09-02 | -0/+3 |
| |/ | ||||
* / | Remove old template for help page. | Louise Crow | 2014-08-26 | -9/+0 |
|/ | | | | Superceded by help_out.html.erb | |||
* | Preserve old logo | Louise Crow | 2014-06-04 | -1/+1 |
| | | | | Used when RESPONSIVE_STYLING set to false | |||
* | Use a protocol-less link for font loading | Louise Crow | 2014-06-02 | -1/+1 |
| | ||||
* | Get rid of Bitter, get normal and bold and extended charsets for Roboto | Louise Crow | 2014-06-02 | -1/+1 |
| | | | | Bitter doesn't handle latin-ext or cyrillic so isn't much use to us here. | |||
* | Add Google fonts with some basic fallbacks. | Louise Crow | 2014-06-02 | -0/+1 |
| | ||||
* | Remove before_head_end | Louise Crow | 2014-05-15 | -1/+0 |
| | ||||
* | Update links to point to public body change request form. | Louise Crow | 2014-03-04 | -1/+7 |
| | ||||
* | Revert renaming of the logo.png fileno-logo-rename | Mark Longair | 2013-11-25 | -1/+1 |
| | ||||
* | Move images out of /public and into the asset pipeline | Mark Longair | 2013-11-20 | -1/+1 |
| | | | | | | | | | | An oddity here is that I had to rename logo.png to alaveteli-logo.png, or the version from the alaveteli repository was used after precompiling the assets. (This suggests that generation of precompiled assets with "rake assets:precompile" is picking the wrong version; i.e. not going through the asset path in reverse order.) | |||
* | Refer to the precompiled application.css, which includes custom.css | Mark Longair | 2013-11-20 | -1/+1 |
| | ||||
* | Switch to work with the feature/wip-switch-to-asset-pipeline branch | Mark Longair | 2013-11-11 | -1/+1 |
| | ||||
* | Merge branch 'master' into develop | Louise Crow | 2013-08-20 | -3/+3 |
|\ | ||||
| * | Update initial_request.text.erb | Jody McIntyre | 2013-07-17 | -1/+1 |
| | | | | | | Use the raw helper so that characters like ' are not HTML escaped in outgoing email messages. This is already done in the initial_request.text.erb shipped with Alaveteli. | |||
| * | Configuration is now AlaveteliConfiguration | Mark Longair | 2013-04-10 | -2/+2 |
| | | ||||
| * | Since mailer views are plain text, they should be text.erb | Mark Longair | 2013-04-10 | -0/+0 |
| | | | | | | | | | | Thanks to Henare Degan for pointing this out in his theme upgrade document. | |||
| * | Rename the .rhtml files to .html.erb for Rails 3 | Mark Longair | 2013-04-09 | -0/+0 |
| | |