Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed CSS for quickstart links | Nicolas Lœuillet | 2016-10-03 | 1 | -1/+1 |
| | |||||
* | 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 | 3 | -21/+3 |
|\ \ | |/ |/| | Assets work | ||||
| * | Assets work | Thomas Citharel | 2016-09-28 | 3 | -21/+3 |
| | | | | | | | | | | | | | | | | | | | | * 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 | 2 | -3/+16 |
|\ \ | | | | | | | Fix parameters in API _links | ||||
| * | | Fix parameters in API _links | Jeremy Benoist | 2016-10-02 | 2 | -3/+16 |
| | | | | | | | | | | | | 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 |
|\ \ \ | |/ / |/| | | |||||
| * | | 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 | 27 | -232/+829 |
|\ \ \ | | | | | | | | | Add users management UI | ||||
| * | | | Disabled delete button for the logged user | Jeremy Benoist | 2016-10-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | To avoid some bad things to happen… | ||||
| * | | | Cleanup & add link on baggy menu | Jeremy Benoist | 2016-10-02 | 3 | -60/+1 |
| | | | | |||||
| * | | | Add users management UI | Jeremy Benoist | 2016-10-02 | 26 | -223/+879 |
| | | | | | | | | | | | | | | | | | | | | | | | | - 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 | 1 | -0/+32 |
|\ \ \ \ | | | | | | | | | | | Add an exists endpoint in API | ||||
| * | | | | CS | Jeremy Benoist | 2016-10-02 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add an exists endpoint in API | Jeremy Benoist | 2016-10-01 | 1 | -0/+32 |
| | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Avoid duplicate url with accents | ||||
| * | | | | Avoid duplicate url with accents | Jeremy Benoist | 2016-10-01 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #2326 from wallabag/update-quickstart | Jeremy Benoist | 2016-10-02 | 12 | -50/+168 |
|\ \ \ \ | | | | | | | | | | | Changed quickstart layout | ||||
| * | | | | 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 | 12 | -50/+167 |
| | | | | | |||||
* | | | | | Merge pull request #2324 from wallabag/edit-tagging-rule | Jeremy Benoist | 2016-10-02 | 13 | -4/+58 |
|\ \ \ \ \ | | | | | | | | | | | | | 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 | 13 | -1/+47 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #2323 from wallabag/footer-stats | Jeremy Benoist | 2016-10-02 | 13 | -4/+64 |
|\ \ \ \ \ | | | | | | | | | | | | | Add simple stats in footer | ||||
| * | | | | | Add simple stats in footer | Jeremy Benoist | 2016-10-01 | 13 | -4/+64 |
| | |/ / / | |/| | | | |||||
* | | | | | Fix OC typos | Jeremy Benoist | 2016-10-02 | 11 | -20/+20 |
| | | | | | | | | | | | | | | | | | | | | + remove extra sentence | ||||
* | | | | | Occitan version update | Quent-in | 2016-10-01 | 1 | -24/+26 |
| |/ / / |/| | | | | | | | to be ready for the future of Wallabag :) | ||||
* | | | | Merge pull request #2322 from wallabag/v2-404 | Nicolas Lœuillet | 2016-10-01 | 5 | -4/+103 |
|\ \ \ \ | | | | | | | | | | | Customize errors templates | ||||
| * | | | | Customize errors templates | Jeremy Benoist | 2016-10-01 | 5 | -4/+103 |
| |/ / / | | | | | | | | | | | | | All error goes to the same template which only display the error message and the status code. | ||||
* | | | | Fix bad template name | Jeremy Benoist | 2016-09-30 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | When a user register, the template displayed saying it should now check its email was misspelled. Resulting in displaying the default one (with margin issue). | ||||
* | | | | Create user config in one place | Jeremy Benoist | 2016-09-30 | 5 | -36/+42 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | Using a listener, user config is now created when a user: - is created from the command line - register (with or without email confirmation) - is created from the config panel | ||||
* | | | Removed duplicated templates files | Nicolas Lœuillet | 2016-09-30 | 26 | -494/+18 |
| | | | |||||
* | | | Merge pull request #2315 from wallabag/fixes-about-upgrade | Nicolas Lœuillet | 2016-09-29 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fixes about upgrade | ||||
| * | | | Reordered upgrade documentation | Nicolas Lœuillet | 2016-09-28 | 1 | -1/+0 |
| | | | | |||||
| * | | | Some fixes about upgrade from 2.0.x -> 2.1.0 | Nicolas Lœuillet | 2016-09-28 | 1 | -0/+1 |
| | | | | |||||
* | | | | Update messages.pl.yml | Mateusz Rumiński | 2016-09-29 | 1 | -2/+2 |
|/ / / | | | | | | | add missing translation for Instapaper importer | ||||
* | | | Add Instapaper translations | Jeremy Benoist | 2016-09-27 | 11 | -52/+96 |
| | | | |||||
* | | | Add controller test for Instapaper | Jeremy Benoist | 2016-09-27 | 4 | -0/+12 |
| | | | |||||
* | | | Add Instapaper import | Jeremy Benoist | 2016-09-27 | 9 | -3/+308 |
| |/ |/| | | | | | Also update ImportController with latest import (chrome, firefox & instapaper). | ||||
* | | Update messages.pl.yml | Mateusz Rumiński | 2016-09-27 | 1 | -12/+12 |
| | | | | | | add missing translation for Firefox and Chrome imports | ||||
* | | Merge pull request #2192 from wallabag/import-browser-bookmarks | Jeremy Benoist | 2016-09-26 | 24 | -7/+747 |
|\ \ | | | | | | | Import Firefox & Chrome bookmarks into wallabag | ||||
| * | | Move prepareEntry to dedicated place | Jeremy Benoist | 2016-09-26 | 3 | -35/+42 |
| | | | | | | | | | | | | | | | Yeah first try was ugly, now each part are in the dedicated place. Also, the date is hardly truncated to 10 chars because Firefox date are 16 chars long and Chrome are 17 chars long. So instead of divised them by a huge number, I prefer to truncate them. | ||||
| * | | Update Firefox file | Jeremy Benoist | 2016-09-25 | 1 | -12/+24 |
| | | | | | | | | | | | | | | | With real data, the previous looks more than a Chrome converted file. Also, fix date conversion (hope so). |