Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1868 from wallabag/v2-tagrule-baggy | Jeremy Benoist | 2016-04-07 | 3 | -84/+156 |
|\ | | | | | Remove keyboard shortcut and add tagging rule panel in baggy | ||||
| * | Remove keybaord shortcut and add tagging rule panel in baggy | Nicolas Lœuillet | 2016-04-05 | 3 | -84/+156 |
| | | |||||
* | | Lock ocramius/proxy-manager | Jeremy Benoist | 2016-04-06 | 1 | -1/+2 |
| | | | | | | To avoid problem with PHP < 7.0 | ||||
* | | Documentation about wallabag API | Nicolas Lœuillet | 2016-04-06 | 16 | -3/+486 |
|/ | |||||
* | Merge pull request #1862 from wallabag/v2-doc-import-wllbg1-cli | Jeremy Benoist | 2016-04-05 | 2 | -2/+2 |
|\ | | | | | Add production environment for CLI import | ||||
| * | Add production environment for CLI import | Nicolas Lœuillet | 2016-04-05 | 2 | -2/+2 |
| | | |||||
* | | Merge pull request #1861 from wallabag/v2-round-estimated-time | Jeremy Benoist | 2016-04-05 | 2 | -11/+9 |
|\ \ | |/ |/| | Round estimated time and add reading speed for Baggy | ||||
| * | Round estimated time and add reading speed for Baggy | Nicolas Lœuillet | 2016-04-05 | 2 | -11/+9 |
| | | |||||
* | | Merge pull request #1856 from wallabag/v2-doc-import-wllbg1-cli | Thomas Citharel | 2016-04-05 | 2 | -0/+44 |
|\ \ | |/ |/| | Documentation about wallabag v1 CLI import | ||||
| * | Documentation about wallabag v1 CLI import | Nicolas Lœuillet | 2016-04-05 | 2 | -0/+44 |
|/ | |||||
* | Add migrate link in french documentation | Nicolas Lœuillet | 2016-04-05 | 1 | -0/+1 |
| | |||||
* | Add migrate link in english documentation | Nicolas Lœuillet | 2016-04-05 | 1 | -0/+1 |
| | |||||
* | Merge pull request #1840 from wallabag/v2-fix-archive-page-title | Jeremy Benoist | 2016-04-04 | 10 | -10/+10 |
|\ | | | | | Fix Archive page title translation | ||||
| * | Fix Archive page title translation | Nicolas Lœuillet | 2016-04-04 | 10 | -10/+10 |
|/ | |||||
* | Merge pull request #1835 from wallabag/v2-prepare-v22.0.0 | Thomas Citharel | 2016-04-03 | 10 | -44/+23 |
|\ | | | | | :rocket: Prepare v2.0.0 :birthday: | ||||
| * | Remove useless CSS | Nicolas Lœuillet | 2016-04-03 | 1 | -14/+0 |
| | | |||||
| * | :rocket: Prepare v2.0.0 :birthday: | Nicolas Lœuillet | 2016-04-03 | 9 | -30/+23 |
| | | |||||
* | | Merge pull request #1838 from wallabag/v2-hide-search | Thomas Citharel | 2016-04-03 | 2 | -4/+4 |
|\ \ | |/ |/| | Hide search buttons | ||||
| * | Hide search buttons | Nicolas Lœuillet | 2016-04-03 | 2 | -4/+4 |
|/ | |||||
* | Merge pull request #1832 from wallabag/pdo-driver | Nicolas Lœuillet | 2016-04-02 | 1 | -3/+4 |
|\ | | | | | Check selected PDO driver on install | ||||
| * | Check selected PDO driver on install | Jeremy Benoist | 2016-04-01 | 1 | -3/+4 |
|/ | | | | Instead of checking that one of the DB driver is installed we retrieve the selected driver (in parameters) and see if the extension exists. | ||||
* | Merge branch 'Quent-in-v2' into v2 | Jeremy Benoist | 2016-04-01 | 4 | -0/+456 |
|\ | |||||
| * | Add Occitan to available language | Jeremy Benoist | 2016-04-01 | 1 | -0/+1 |
| | | |||||
| * | Fix quotes for OC | Jeremy Benoist | 2016-04-01 | 1 | -6/+6 |
| | | |||||
| * | Merge pull request #3 from j0k3r/patch-1 | Quent-in | 2016-04-01 | 1 | -3/+3 |
| |\ | | | | | | | Fix simple quote | ||||
| | * | Fix simple quote | Jeremy Benoist | 2016-04-01 | 1 | -3/+3 |
| |/ | |||||
| * | Occitan version | Quent-in | 2016-04-01 | 1 | -0/+2 |
| | | |||||
| * | OC version | Quent-in | 2016-04-01 | 1 | -0/+29 |
| | | |||||
| * | Update oc version | Quent-in | 2016-04-01 | 1 | -194/+194 |
| | | | | | | Complet | ||||
| * | Trad. Occitan | Quent-in | 2016-03-30 | 1 | -0/+424 |
|/ | | | WIP | ||||
* | Merge pull request #1822 from jami7/patch-4 | Jeremy Benoist | 2016-03-29 | 1 | -4/+4 |
|\ | | | | | Update messages.es.yml | ||||
| * | Update messages.es.yml | jami7 | 2016-03-28 | 1 | -4/+4 |
|/ | |||||
* | 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 |