Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2340 from wallabag/improve-ger-transl | Thomas Citharel | 2016-10-03 | 1 | -1/+1 |
|\ | | | | | small improvement for german translation | ||||
| * | improve German translation | Sven Fischer | 2016-10-03 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #2338 from wallabag/install-2.1 | Thomas Citharel | 2016-10-03 | 12 | -23/+31 |
|\ | | | | | Fix for 2.1 installation | ||||
| * | Ensure cache is clear before upgrading | Jeremy Benoist | 2016-10-03 | 6 | -0/+6 |
| | | | | | | | | If we changed some namespace / classes, we need to refresh the cache before anything else. | ||||
| * | Use install_dev.sh for Travis | Jeremy Benoist | 2016-10-03 | 3 | -23/+22 |
| | | | | | | | | Add `--no-dev` to `composer install` for prod env | ||||
| * | Re-add wallabag:install | Jeremy Benoist | 2016-10-03 | 3 | -0/+3 |
|/ | |||||
* | Update md5 hash for wallabag 2.1.0 | Nicolas Lœuillet | 2016-10-03 | 6 | -6/+6 |
| | |||||
* | Merge pull request #2334 from wallabag/prepare-21 | Jeremy Benoist | 2016-10-03 | 5 | -4/+57 |
|\ | | | | | Prepare wallabag 2.1.0 :rocket: | ||||
| * | Prepare wallabag 2.1.0 :rocket: | Nicolas Lœuillet | 2016-10-03 | 5 | -4/+57 |
| | | |||||
* | | Merge pull request #2335 from wallabag/fix-quickstart-css | Nicolas Lœuillet | 2016-10-03 | 2 | -3/+7 |
|\ \ | | | | | | | Fixed CSS for quickstart links | ||||
| * | | Fixed CSS for quickstart links | Nicolas Lœuillet | 2016-10-03 | 2 | -3/+7 |
|/ / | |||||
* | | Merge pull request #2333 from wallabag/translation-german-for-2.1 | Jeremy Benoist | 2016-10-03 | 1 | -51/+51 |
|\ \ | |/ |/| | for 2.1, translate all strings to German, which haven't been translated yet | ||||
| * | Update messages.de.yml | Jeremy Benoist | 2016-10-03 | 1 | -1/+1 |
| | | |||||
| * | Fixed typos | Nicolas Lœuillet | 2016-10-03 | 1 | -2/+1 |
| | | |||||
| * | Better translation for the weird sentence | Julian Oster | 2016-10-02 | 1 | -1/+2 |
| | | |||||
| * | Improve the german translation a bit | Julian Oster | 2016-10-02 | 1 | -10/+10 |
| | | | | | | Just some little mistakes, good work so far :) | ||||
| * | translate all strings to German, which haven't been translated yet | Sven Fischer | 2016-10-02 | 1 | -51/+51 |
| | | |||||
* | | Merge pull request #2314 from wallabag/assets | Nicolas Lœuillet | 2016-10-03 | 28 | -502/+498 |
|\ \ | |/ |/| | Assets work | ||||
| * | remove bower dependency from npm | Thomas Citharel | 2016-09-29 | 1 | -1/+0 |
| | | |||||
| * | remove bower | Thomas Citharel | 2016-09-29 | 4 | -51/+2 |
| | | |||||
| * | fonts & ligatures | Thomas Citharel | 2016-09-29 | 4 | -26/+24 |
| | | |||||
| * | remove autocomplete and bring fonts through npm | Thomas Citharel | 2016-09-28 | 3 | -8/+32 |
| | | |||||
| * | Remove .idea stuff | Thomas Citharel | 2016-09-28 | 1 | -5/+1 |
| | | |||||
| * | Assets work | Thomas Citharel | 2016-09-28 | 23 | -417/+445 |
| | | | | | | | | | | | | | | | | | | | | * ES6 all the things ! * ESLint checks everything * CSS fixes (use stylelint) * Fix #2231 | ||||
* | | Merge pull request #2331 from wallabag/api-links | Thomas Citharel | 2016-10-02 | 3 | -4/+115 |
|\ \ | | | | | | | Fix parameters in API _links | ||||
| * | | Fix parameters in API _links | Jeremy Benoist | 2016-10-02 | 3 | -4/+115 |
| | | | | | | | | | | | | We forgot to pass them to the factory | ||||
* | | | Merge remote-tracking branch 'origin/master' into 2.1 | Jeremy Benoist | 2016-10-02 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Merge pull request #2330 from pmichelazzo/master | Jeremy Benoist | 2016-10-02 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Remove error message when creating ePub versions | ||||
| | * | | Remove error message when creating ePub versions | Paulino Michelazzo | 2016-10-02 | 1 | -1/+1 |
| |/ / | | | | | | | | | | | | | | | | Trying to create a ePub version, the first page shows a message of a “missing >”. This change solve this problem (and, for sure, in any download version that’s use HTML). | ||||
* | | | Merge pull request #2327 from wallabag/user-management | Jeremy Benoist | 2016-10-02 | 31 | -346/+917 |
|\ \ \ | | | | | | | | | Add users management UI | ||||
| * | | | Disabled delete button for the logged user | Jeremy Benoist | 2016-10-02 | 2 | -1/+12 |
| | | | | | | | | | | | | | | | | To avoid some bad things to happen… | ||||
| * | | | Remove NewUser test from Config | Jeremy Benoist | 2016-10-02 | 1 | -114/+0 |
| | | | | |||||
| * | | | Cleanup & add link on baggy menu | Jeremy Benoist | 2016-10-02 | 3 | -60/+1 |
| | | | | |||||
| * | | | Add users management UI | Jeremy Benoist | 2016-10-02 | 29 | -223/+956 |
| | | | | | | | | | | | | | | | | | | | | | | | | - remove the “add a user” from the config page - add a CRUD on user - fix some missing translations (+ bad indentation) | ||||
* | | | | Merge pull request #2325 from wallabag/api-entries-exists | Nicolas Lœuillet | 2016-10-02 | 2 | -0/+54 |
|\ \ \ \ | | | | | | | | | | | Add an exists endpoint in API | ||||
| * | | | | CS | Jeremy Benoist | 2016-10-02 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add test when url doesn’t exist | Jeremy Benoist | 2016-10-01 | 1 | -0/+11 |
| | | | | | |||||
| * | | | | Add an exists endpoint in API | Jeremy Benoist | 2016-10-01 | 2 | -0/+43 |
| | | | | | | | | | | | | | | | | | | | | It should allow third party to check if an url was already saved by a user | ||||
* | | | | | Merge pull request #2328 from wallabag/avoid-duplicate-url | Nicolas Lœuillet | 2016-10-02 | 2 | -1/+45 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Avoid duplicate url with accents | ||||
| * | | | | Remove additional entry | Jeremy Benoist | 2016-10-02 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | After the test is done, cleanup what we’ve done | ||||
| * | | | | Avoid duplicate url with accents | Jeremy Benoist | 2016-10-01 | 2 | -1/+36 |
| |/ / / | |||||
* | | | | Merge pull request #2326 from wallabag/update-quickstart | Jeremy Benoist | 2016-10-02 | 14 | -53/+171 |
|\ \ \ \ | | | | | | | | | | | Changed quickstart layout | ||||
| * | | | | Update test | Jeremy Benoist | 2016-10-02 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fixed french translation | Nicolas Lœuillet | 2016-10-01 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Changed translations | Nicolas Lœuillet | 2016-10-01 | 11 | -10/+11 |
| | | | | | |||||
| * | | | | Changed quickstart layout | Nicolas Lœuillet | 2016-10-01 | 13 | -52/+169 |
| | | | | | |||||
* | | | | | Merge pull request #2324 from wallabag/edit-tagging-rule | Jeremy Benoist | 2016-10-02 | 14 | -17/+106 |
|\ \ \ \ \ | | | | | | | | | | | | | Add ability to edit a tagging rule | ||||
| * | | | | | CS | Jeremy Benoist | 2016-10-01 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Introduce validateRuleAction | Jeremy Benoist | 2016-10-01 | 1 | -5/+13 |
| | | | | | | |||||
| * | | | | | Add ability to edit a tagging rule | Jeremy Benoist | 2016-10-01 | 14 | -14/+95 |
| | |/ / / | |/| | | |