Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into origin/norway3origin/norway3norway3 | utvk | 2017-11-10 | -23/+81 |
|\ | ||||
| * | Remove obsolete partial | Louise Crow | 2017-09-22 | -1/+0 |
| | | | | | | | | No longer needed after core commit d80e0ec0bc2bf81a0714cd44750da46faad44c06 | |||
| * | Use HTTP methods for custom routes | Louise Crow | 2017-09-22 | -2/+2 |
| | | ||||
| * | Add extra theme assets to the asset path | Louise Crow | 2017-09-22 | -0/+14 |
| | | | | | | | | | | | | | | The new version of Sprockets for Rails 4.2 only adds assets from the base path so we need to add this ourselves. https://github.com/rails/sprockets-rails/blob/v3.2.0/lib/sprockets/railtie.rb#L84-L87 | |||
| * | Remove deprecated disable_with button option | Gareth Rees | 2017-03-22 | -2/+2 |
| | | | | | | | | Now a subkey of the :data option | |||
| * | Move assets to app/assets | Gareth Rees | 2017-03-22 | -0/+1 |
| | | | | | | | | | | | | | | Latest version of assets:precompile task requires path to match app/assets: https://github.com/rails/sprockets-rails/blob/v2.3.3/lib/sprockets/railtie.rb#L60-L62 | |||
| * | Add encoding line to Ruby files | Gareth Rees | 2017-01-19 | -0/+7 |
| | | | | | | | | Fixes https://github.com/mysociety/alavetelitheme/issues/69. | |||
| * | 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 | -1001/+1227 |
| |\ | ||||
| | * | Add request reporting sections to the help/about page | lizconlan | 2016-12-13 | -1/+29 |
| | | | ||||
| | * | Merge remote-tracking branch 'origin/add-text-on-request-closure' | Gareth Rees | 2016-12-12 | -0/+9 |
| | |\ | ||||
| | | * | Add text on request closure. | Louise Crow | 2016-11-24 | -0/+9 |
| | | | | ||||
| | * | | Update model patch example to include the default_letter param override | lizconlan | 2016-12-05 | -0/+4 |
| | |/ | ||||
| * | | 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 |
| | | | ||||
* | | | merge changes upstream | utvk | 2017-02-11 | -0/+11 |
| | | | ||||
* | | | 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 |
| | | | ||||
* | | | Reduced self.remove_quoted_sections() to only recognize Norwegian top posters. | Petter Reinholdtsen | 2016-11-04 | -60/+3 |
| | | | | | | | | | | | | Approved by Gorm. | |||
* | | | Copy self.remove_quoted_sections() implementation from Alaveteli source. | Petter Reinholdtsen | 2016-11-04 | -0/+77 |
| | | | ||||
* | | | 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 | -1059/+1049 |
|\ \ \ | | |/ | |/| | ||||
| * | | Add generic example version of each required help page. | Louise Crow | 2016-04-26 | -875/+1080 |
| | | | ||||
| * | | Convert to two-space indentation. | Louise Crow | 2016-04-06 | -94/+94 |
| | | | ||||
| * | | Make code customization commented out examples. | Louise Crow | 2016-04-06 | -74/+54 |
| |/ | | | | | | | 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/+1326 |
|/ | ||||
* | 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 |
| | ||||
* | Remove public body categories. | Louise Crow | 2014-12-05 | -16/+0 |
| | | | | Fixes #31. | |||
* | 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 | |||
* | Handle theme names that include a hyphen | Louise Crow | 2014-08-05 | -1/+3 |
| | | | | | Ruby doesn't allow method names with hyphens, which it interprets as a minus sign. Fixes #20. | |||
* | 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. |