Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #1670 from wallabag/v2-mark-imported-articles-as-read | Nicolas Lœuillet | 2016-03-04 | 16 | -8/+359 | |
|\ \ \ | | | | | | | | | Mark all imported articles as read | |||||
| * | | | Adding test | Jeremy Benoist | 2016-03-04 | 10 | -63/+219 | |
| | | | | | | | | | | | | | | | | Reformat json file (thanks pro.jsonlint.com) | |||||
| * | | | cs & tests for wllbg v1 import | Thomas Citharel | 2016-03-03 | 7 | -5/+122 | |
| | | | | ||||||
| * | | | french translation & pocket | Thomas Citharel | 2016-03-03 | 5 | -3/+54 | |
| | | | | ||||||
| * | | | Mark all imported articles as read | Thomas Citharel | 2016-03-03 | 6 | -2/+29 | |
| |/ / | ||||||
* | | | Merge pull request #1754 from wallabag/v2-api-new-properties-light | Nicolas Lœuillet | 2016-03-04 | 2 | -0/+31 | |
|\ \ \ | | | | | | | | | Add starred & archive properties to API | |||||
| * | | | Remove 'content' from API | Jeremy Benoist | 2016-03-04 | 2 | -22/+0 | |
| | | | | | | | | | | | | | | | | Waiting to find a good solution to avoid side problem since user can no define the content | |||||
| * | | | use booleans instead of empty | Thomas Citharel | 2016-03-04 | 1 | -4/+4 | |
| | | | | ||||||
| * | | | add more properties for entries #1634 | Thomas Citharel | 2016-03-04 | 2 | -0/+53 | |
|/ / / | ||||||
* | | | Merge pull request #1753 from Horgix/v2-typo-doc-en | Nicolas Lœuillet | 2016-03-04 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | Doc: fix typo in php-hash ext name | |||||
| * | | Doc: fix typo in php-hash ext name | Alexis 'Horgix' Chotard | 2016-03-04 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #1745 from benages/v2 | Nicolas Lœuillet | 2016-03-02 | 5 | -0/+277 | |
|\ \ | | | | | | | V2 spanish translation | |||||
| * | | Spanish translation | Juanjo Benages | 2016-03-01 | 1 | -0/+1 | |
| | | | ||||||
| * | | Spanish translation | Juanjo Benages | 2016-03-01 | 1 | -0/+2 | |
| | | | ||||||
| * | | Spanish translation | Juanjo Benages | 2016-03-01 | 1 | -0/+29 | |
| | | | ||||||
| * | | Spanish translation | Juanjo Benages | 2016-03-01 | 1 | -0/+3 | |
| | | | ||||||
| * | | Spanish translation | Juanjo Benages | 2016-03-01 | 1 | -131/+131 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'upstream/v2' into v2 | Juanjo Benages | 2016-03-01 | 2 | -0/+68 | |
| |\ \ | |/ / |/| | | ||||||
* | | | Merge pull request #1743 from wallabag/v2-releasing-documentation | Jeremy Benoist | 2016-03-01 | 2 | -9/+40 | |
|\ \ \ | | | | | | | | | Releasing documentation | |||||
| * | | | Add steps in RELEASE_PROCESS | Nicolas Lœuillet | 2016-03-01 | 2 | -54/+39 | |
| | | | | ||||||
| * | | | Releasing documentation | Nicolas Lœuillet | 2016-03-01 | 2 | -0/+46 | |
|/ / / | ||||||
* | | | Merge pull request #1615 from bdunogier/release_process_doc | Nicolas Lœuillet | 2016-03-01 | 1 | -0/+37 | |
|\ \ \ | | | | | | | | | Added RELEASE_PROCESS document | |||||
| * | | | Added RELEASE_PROCESS document | Bertrand Dunogier | 2016-02-27 | 1 | -0/+37 | |
| | | | | ||||||
| | * | | Start of the spanish translation | Juanjo Benages | 2016-03-01 | 1 | -0/+242 | |
| |/ / |/| | | ||||||
* | | | Merge pull request #1740 from goofy-bz/patch-6 | Nicolas Lœuillet | 2016-03-01 | 1 | -15/+15 | |
|\ \ \ | | | | | | | | | minor typofix again | |||||
| * | | | fixing previous stuff and more | goofy-bz | 2016-03-01 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | minor fix | goofy-bz | 2016-03-01 | 1 | -12/+12 | |
| | | | | | | | | | | | | adding non-breaking spaces here and there + small piece of translation and relevant French link | |||||
| * | | | minor typofix again | goofy-bz | 2016-02-29 | 1 | -6/+6 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #1742 from wallabag/v2-issue-template-package | Jeremy Benoist | 2016-03-01 | 1 | -0/+1 | |
|\ \ \ | | | | | | | | | Add the way to install (package or composer) | |||||
| * | | | Add the way to install (package or composer) | Nicolas Lœuillet | 2016-03-01 | 1 | -0/+1 | |
|/ / / | ||||||
* | | | Merge pull request #1738 from wallabag/v2-prepare-beta1 | Jeremy Benoist | 2016-03-01 | 5 | -5/+5 | |
|\ \ \ | | | | | | | | | Prepare wallabag for first beta :rocket: | |||||
| * | | | Prepare wallabag for first beta :rocket: | Nicolas Lœuillet | 2016-02-29 | 5 | -5/+5 | |
| |/ / | ||||||
* | | | Merge pull request #1739 from goofy-bz/patch-5 | Nicolas Lœuillet | 2016-03-01 | 1 | -6/+6 | |
|\ \ \ | |/ / |/| | | minor typofix + missing quotes | |||||
| * | | minor typofix + missing quotes | goofy-bz | 2016-02-29 | 1 | -6/+6 | |
|/ / | | | | | Added quotes to be reviewed | |||||
* | | Merge pull request #1736 from wallabag/v2-update-capistrano-gem | Jeremy Benoist | 2016-02-29 | 2 | -15/+10 | |
|\ \ | | | | | | | Update Capistrano libraries with last versions | |||||
| * | | Update Capistrano libraries with last versions | Nicolas Lœuillet | 2016-02-29 | 2 | -15/+10 | |
|/ / | ||||||
* | | Merge pull request #1734 from wallabag/v2-todo | Nicolas Lœuillet | 2016-02-29 | 4 | -28/+20 | |
|\ \ | |/ |/| | Remove extra definition | |||||
| * | Skipping all Posgres test for wallabag:install | Jeremy Benoist | 2016-02-29 | 2 | -21/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already faced this problem but we are facing it again. https://github.com/wallabag/wallabag/commit/d502762598db68ec822078642df8f6a8214202f7 It seems we can drop a database properly using wallabag:install. The server log keep saying: ERROR: source database "template1" is being accessed by other users DETAIL: There is 1 other session using the database. STATEMENT: CREATE DATABASE "wallabag_test" Which means, it can't remove the database wallabag_test because one other person is using it. | |||||
| * | Defining Github token is now useless | Jeremy Benoist | 2016-02-29 | 1 | -1/+0 | |
| | | | | | | | | We are using it differently with .composer-auth.json file | |||||
| * | Fix postgres database creation | Jeremy Benoist | 2016-02-29 | 1 | -1/+1 | |
| | | | | | | | | Test database was renamed in https://github.com/wallabag/wallabag/pull/1639 but the travis configuration was missed | |||||
| * | Remove extra definition | Jeremy Benoist | 2016-02-29 | 1 | -5/+0 | |
|/ | | | | Since Symfony 3.0.3 has been released | |||||
* | Merge pull request #1732 from mjjzf/v2 | Jeremy Benoist | 2016-02-28 | 5 | -0/+165 | |
|\ | | | | | Adding Danish translations to Wallabag v2 | |||||
| * | added newline | Morten Juhl-Johansen Zölde-Fejér | 2016-02-27 | 1 | -1/+2 | |
| | | ||||||
| * | Fixed indentation issue | Morten Juhl-Johansen Zölde-Fejér | 2016-02-27 | 1 | -1/+1 | |
| | | ||||||
| * | config.yml edit to include Danish | Morten Juhl-Johansen Zölde-Fejér | 2016-02-27 | 1 | -0/+1 | |
| | | ||||||
| * | Adding Danish translations to Wallabag v2 | Morten Juhl-Johansen Zölde-Fejér | 2016-02-27 | 4 | -0/+163 | |
|/ | ||||||
* | Merge pull request #1731 from wallabag/v2-fix-travis-auth | Jeremy Benoist | 2016-02-27 | 2 | -0/+10 | |
|\ | | | | | Fix: #1703: authentication for PR by external contributors | |||||
| * | Replace token by a no scope one | Nicolas Lœuillet | 2016-02-27 | 1 | -1/+1 | |
| | | ||||||
| * | Fix authentication for PR by external contributors | Nicolas Lœuillet | 2016-02-27 | 2 | -0/+10 | |
|/ | ||||||
* | Merge pull request #1653 from wallabag/v2-annotator-comments | Nicolas Lœuillet | 2016-02-26 | 27 | -13/+891 | |
|\ | | | | | V2 annotator comments |