Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge branch 'master' into wdtk | Robin Houston | 2011-07-14 | -3/+3 |
|\ | ||||
| * | The sense of the "is admin" test was accidentally reversed on the request ↵ | Robin Houston | 2011-07-14 | -3/+3 |
| | | | | | | | | page template | |||
* | | Merge branch 'master' into wdtk | Robin Houston | 2011-07-14 | -2/+5 |
|\| | ||||
| * | Do not specify ADMIN_BASE_URL in the example config file, | Robin Houston | 2011-07-14 | -2/+5 |
| | | | | | | | | | | because the dynamic default value will be correct for most installations. | |||
* | | Merge branch 'master' into wdtk | Robin Houston | 2011-07-14 | -1/+1 |
|\| | ||||
| * | Use the ADMIN_BASE_URL config variable if present, rather than ignoring it | Robin Houston | 2011-07-14 | -1/+1 |
| | | ||||
* | | Merge branch 'master' into wdtk | Robin Houston | 2011-07-14 | -2/+2 |
|\| | ||||
| * | 1) You can’t call an instance method from a class method (d’oh) | Robin Houston | 2011-07-14 | -2/+2 |
| | | | | | | | | | | | | 2) The test coverage is less good than I imagined. XXXX need test for zip file attachments | |||
* | | Oh! Is this going to be reverted every time I merge from master? That’s ↵ | Robin Houston | 2011-07-14 | -1/+1 |
| | | | | | | | | not what I hoped would happen. | |||
* | | Merge branch 'master' into wdtk | Robin Houston | 2011-07-14 | -6/+13 |
|\| | ||||
| * | Reinstate the additional admin links. | Robin Houston | 2011-07-14 | -5/+12 |
| | | ||||
| * | That is only supposed to be disabled in the wdtk branch, not in master. | Robin Houston | 2011-07-14 | -1/+1 |
| | | ||||
| * | Merge branch 'master' of git@github.com:sebbacon/alaveteli | Robin Houston | 2011-07-14 | -5/+54 |
| |\ | ||||
| * \ | Merge branch 'wdtk' of git@github.com:sebbacon/alaveteli | Robin Houston | 2011-07-14 | -1/+1 |
| |\ \ | ||||
* | | | | Merge branch 'master' into wdtk | Robin Houston | 2011-07-14 | -6/+6 |
|\| | | | ||||
| * | | | Rationalise unholy mixture of tabs and spaces | Robin Houston | 2011-07-14 | -6/+6 |
| | | | | ||||
* | | | | Merge branch 'master' of git@github.com:sebbacon/alaveteli into wdtk | Robin Houston | 2011-07-14 | -5/+54 |
|\ \ \ \ | | |_|/ | |/| | | ||||
| * | | | Merge branch 'master' of github.com:sebbacon/alaveteli | Seb Bacon | 2011-07-14 | -114/+39 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: app/views/request/_request_listing_single.rhtml | |||
| * | | | | Fix bug on categorisation page that was stopping game from working | Seb Bacon | 2011-07-14 | -1/+50 |
| | | | | | ||||
* | | | | | Merge branch 'master' into wdtk | Robin Houston | 2011-07-14 | -2/+2 |
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | | | ||||
| * | | | Putting a space before the parenthesis causes a mandatory Ruby warning | Robin Houston | 2011-07-14 | -2/+2 |
| | |/ | |/| | | | | | | | "warning: don't put space before argument parentheses" | |||
* / | | Disable the locale-specific routing, at least till it actually works. | Robin Houston | 2011-07-13 | -1/+1 |
|/ / | ||||
* | | Inconsistent whitespace | Robin Houston | 2011-07-13 | -8/+8 |
| | | ||||
* | | Make the tests work with authentication | Robin Houston | 2011-07-13 | -1/+4 |
| | | ||||
* | | Update commonlib | Robin Houston | 2011-07-13 | -0/+0 |
| | | ||||
* | | Remove the PHP-formatted example config file | Robin Houston | 2011-07-13 | -89/+0 |
| | | ||||
* | | Merge branch 'master' of git@github.com:sebbacon/alaveteli | Robin Houston | 2011-07-13 | -809/+4754 |
|\| | ||||
| * | remove obselete msgids, and update with latest sq translations | Seb Bacon | 2011-07-13 | -806/+4750 |
| | | ||||
| * | Fix bug that meant plugin custom states weren't being loaded | Seb Bacon | 2011-07-13 | -3/+4 |
| | | ||||
* | | Continue processing if we encounter a corrupt zip file | Robin Houston | 2011-07-13 | -21/+31 |
| | | ||||
* | | Add python-yaml to config/packages. | Robin Houston | 2011-07-13 | -0/+1 |
|/ | | | | | (Even though it’s now part of the mySociety base configuration, this packages list is also useful as documentation for outside installations.) | |||
* | test with state other than "requires_admin" (as that state sends emails and ↵ | Seb Bacon | 2011-07-13 | -1/+1 |
| | | | | breaks other tests :() | |||
* | don't test routing filters at same time as other tests | Seb Bacon | 2011-07-13 | -1/+2 |
| | ||||
* | Explicitly set default locale when testing as well as in production | Seb Bacon | 2011-07-13 | -5/+7 |
| | ||||
* | correct link to docs | Seb Bacon | 2011-07-13 | -1/+1 |
| | ||||
* | fix "custom request states" request controller test | Seb Bacon | 2011-07-12 | -0/+3 |
| | ||||
* | Make memcached caching observe language settings | Seb Bacon | 2011-07-12 | -3/+3 |
| | ||||
* | for reasons that are as yet unclear, I18n.default_locale doesn't always ↵ | Seb Bacon | 2011-07-12 | -4/+4 |
| | | | | delegate to FastGettext.default_available_locales; so we set it explicitly here, too | |||
* | remove obselete msgids from de and fr translations | Seb Bacon | 2011-07-12 | -8/+2 |
| | ||||
* | latest POT file | Seb Bacon | 2011-07-12 | -270/+232 |
| | ||||
* | Notes about how to find translatable strings. | Seb Bacon | 2011-07-12 | -0/+8 |
| | ||||
* | Update PO files from Transifex; remove obselete ids from POT file | Seb Bacon | 2011-07-12 | -324/+12199 |
| | ||||
* | some notes about transifex | Seb Bacon | 2011-07-12 | -0/+19 |
| | ||||
* | transifex config file | Seb Bacon | 2011-07-12 | -0/+7 |
| | ||||
* | Remove readme boilerplate | Seb Bacon | 2011-07-12 | -2/+0 |
| | ||||
* | Refactor custom states loading (use class methods where appropriate, ↵ | Seb Bacon | 2011-07-12 | -45/+32 |
| | | | | simplify main code at the cost (small) of test legibility) | |||
* | override config for tests | Seb Bacon | 2011-07-12 | -0/+3 |
| | ||||
* | ensure we don't load custom states from plugins when running tests | Seb Bacon | 2011-07-12 | -3/+15 |
| | ||||
* | update example YAML config file, and corresponding part of install doc | Seb Bacon | 2011-07-12 | -32/+50 |
| | ||||
* | merge IZ/Kosovo fork and refactor | Seb Bacon | 2011-07-12 | -1378/+14835 |
|\ |