Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1820 from wallabag/import-refacto | Nicolas Lœuillet | 2016-03-28 | 8 | -316/+361 |
|\ | | | | | Refacto wallabag import | ||||
| * | Refacto wallabag import | Jeremy Benoist | 2016-03-28 | 6 | -308/+353 |
| | | | | | | | | | | Use an abstract class to store all common action from wallabag vX import. Move specificity in v1 & v2 import. | ||||
| * | Remove some complexicity in InstallCommand | Jeremy Benoist | 2016-03-28 | 2 | -8/+8 |
| | | |||||
* | | Merge pull request #1821 from jami7/patch-3 | Thomas Citharel | 2016-03-28 | 1 | -10/+10 |
|\ \ | |/ |/| | Update messages.es.yml | ||||
| * | Update messages.es.yml | jami7 | 2016-03-28 | 1 | -10/+10 |
|/ | |||||
* | Merge pull request #1805 from wallabag/v2-assign-comma-tags | Nicolas Lœuillet | 2016-03-28 | 3 | -15/+40 |
|\ | | | | | Fix #1768 Split tags with commas from UI | ||||
| * | Simplify tag creation from entry | Jeremy Benoist | 2016-03-27 | 3 | -21/+40 |
| | | | | | | | | | | Testing that a tag exist or is assigned to the current entry isn't important in the tag controler since the `assignTagsToEntry` is already doing that job. So it simplify the controller. | ||||
| * | Split tags with commas from UI | Nicolas Loeuillet | 2016-03-21 | 1 | -2/+8 |
| | | |||||
* | | Merge pull request #1819 from wallabag/cleanup | Nicolas Lœuillet | 2016-03-28 | 17 | -92/+247 |
|\ \ | | | | | | | Some cleanup | ||||
| * | | Tags were not imported in wallabag v2 import | Jeremy Benoist | 2016-03-27 | 6 | -54/+58 |
| | | | | | | | | | | | | Also, simplify exportAs matching format | ||||
| * | | Fix some Scrutinizer issues | Jeremy Benoist | 2016-03-27 | 9 | -31/+182 |
| | | | |||||
| * | | Some cleanup | Jeremy Benoist | 2016-03-27 | 3 | -7/+7 |
| | | | | | | | | | | | | | | | - travis tabulation - extra namespace definition in entities | ||||
* | | | Merge pull request #1818 from wallabag/v2-add-migration-doc | Nicolas Lœuillet | 2016-03-28 | 5 | -0/+80 |
|\ \ \ | |/ / |/| | | add migration docs | ||||
| * | | add migration docs | Thomas Citharel | 2016-03-27 | 5 | -0/+80 |
|/ / | |||||
* | | Merge pull request #1817 from mruminski/v2 | Nicolas Lœuillet | 2016-03-27 | 1 | -1/+1 |
|\ \ | | | | | | | Correct translation | ||||
| * | | Correct translation | Mateusz Rumiński | 2016-03-26 | 1 | -1/+1 |
|/ / | |||||
* | | Fix Indentation problem | Mateusz Rumiński | 2016-03-26 | 1 | -15/+15 |
| | | |||||
* | | Update messages.pl.yml | Mateusz Rumiński | 2016-03-25 | 1 | -219/+219 |
| | | | | | | Complete polish translation of messages file | ||||
* | | Create FOSUserBundle.pl.yml | Mateusz Rumiński | 2016-03-25 | 1 | -0/+2 |
| | | | | | | Add polish version of FOSUserBundle file | ||||
* | | Merge pull request #1813 from wallabag/v2-translation-de | Jeremy Benoist | 2016-03-24 | 3 | -225/+256 |
|\ \ | | | | | | | [v2] German translation | ||||
| * | | Complete messages.de.yml | Julian Oster | 2016-03-24 | 1 | -225/+225 |
| | | | |||||
| * | | Translate FOSUserBundle to german. | Julian Oster | 2016-03-24 | 1 | -0/+2 |
| | | | |||||
| * | | Translate CraueConfigBundle to german. | Julian Oster | 2016-03-24 | 1 | -0/+29 |
|/ / | |||||
* | | Merge pull request #1807 from nikaro/patch-1 | Jeremy Benoist | 2016-03-21 | 1 | -1/+1 |
|\ \ | | | | | | | fix typo diaspora* share | ||||
| * | | fix type diaspora* share | Nicolas | 2016-03-21 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #1806 from wallabag/v2-translation-flash-baggy | Jeremy Benoist | 2016-03-21 | 1 | -1/+1 |
|\ \ | |/ |/| | Translate flash message in baggy theme | ||||
| * | Translate flash message in baggy theme | Nicolas Lœuillet | 2016-03-21 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1774 from wallabag/v2-key-translation | Nicolas Lœuillet | 2016-03-21 | 115 | -2322/+4704 |
|\ | | | | | Switch to keys in translated files | ||||
| * | Update docs about translation | Jeremy Benoist | 2016-03-21 | 2 | -2/+2 |
| | | |||||
| * | Add reading time translation | Jeremy Benoist | 2016-03-21 | 12 | -7/+78 |
| | | |||||
| * | Put more validations on travis | Jeremy Benoist | 2016-03-21 | 3 | -1/+9 |
| | | | | | | | | | | Run php-cs-fixer to avoid CS on commits Add a check on translation message using the built-in yaml validator. It'll avoid typo in translation yaml files. | ||||
| * | Convert more languages | Jeremy Benoist | 2016-03-20 | 14 | -1064/+2851 |
| | | |||||
| * | Translation typos | Jeremy Benoist | 2016-03-20 | 1 | -3/+3 |
| | | | | | | | | Fix #1793 | ||||
| * | Add missing developer page | Jeremy Benoist | 2016-03-20 | 12 | -74/+176 |
| | | |||||
| * | Convert french translation | Jeremy Benoist | 2016-03-20 | 2 | -269/+346 |
| | | |||||
| * | CS | Jeremy Benoist | 2016-03-20 | 1 | -0/+2 |
| | | |||||
| * | Add flashes messages | Jeremy Benoist | 2016-03-20 | 11 | -40/+94 |
| | | |||||
| * | Improve test failure readability | Jeremy Benoist | 2016-03-20 | 3 | -16/+18 |
| | | | | | | | | | | If the response content isn't the one expected, instead of checking into the whole DOM (with node tag, etc ..) we only check the text. So if it fails, phpunit will display only the text, not all node tag. It'll be easier to read. | ||||
| * | Convert english translation file | Jeremy Benoist | 2016-03-20 | 80 | -864/+1141 |
| | | | | | | | | | | | | | | - convert english translation to translate key - remove baggy template for login (never used since user isn't logged in and it'll use the default theme: material) - fix tests about text in response (now checking translation key instead of translated text) - remove all ugly `<div class="hidden">{{ form_rest(form) }}</div>` | ||||
| * | Disable translation in test | Jeremy Benoist | 2016-03-20 | 1 | -0/+2 |
|/ | | | | We don't want to test translation in test | ||||
* | Revert "Transferring API Description file from Apiary.io" | Nicolas Lœuillet | 2016-03-18 | 1 | -80/+0 |
| | | | | This reverts commit 169d60abc7e0ee191bfb66ecb1fbbac14ab88095. | ||||
* | Transferring API Description file from Apiary.io | Nicolas Lœuillet | 2016-03-18 | 1 | -0/+80 |
| | |||||
* | Merge pull request #1767 from wallabag/v2-setting-for-reading-time | Jeremy Benoist | 2016-03-18 | 15 | -7/+103 |
|\ | | | | | Setting for reading time | ||||
| * | Improved tests | Nicolas Lœuillet | 2016-03-18 | 3 | -7/+18 |
| | | |||||
| * | Fix documentation and add help message in Baggy | Nicolas Lœuillet | 2016-03-18 | 3 | -4/+3 |
| | | |||||
| * | Replace slider with select | Nicolas Lœuillet | 2016-03-14 | 5 | -7/+14 |
| | | |||||
| * | Translation and documentation | Nicolas Lœuillet | 2016-03-14 | 3 | -0/+13 |
| | | |||||
| * | Fix default value and add baggy implementation | Nicolas Lœuillet | 2016-03-14 | 2 | -1/+10 |
| | | |||||
| * | Fixed fixtures for config | Nicolas Lœuillet | 2016-03-14 | 1 | -0/+3 |
| | | |||||
| * | Added setting to have a personal reading time | Nicolas Lœuillet | 2016-03-14 | 9 | -2/+56 |
| | |