Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | better tags on baggy | Thomas Citharel | 2016-10-04 | 2 | -4/+6 | |
|/ / | ||||||
* | | Merge pull request #2353 from wallabag/assets-fix | Thomas Citharel | 2016-10-04 | 2 | -20/+25 | |
|\ \ | | | | | | | Basically, fix everything | |||||
| * | | Fix icon position | Thomas Citharel | 2016-10-04 | 1 | -3/+6 | |
| | | | ||||||
| * | | Fixed calendar icon position with baggy theme | Nicolas Lœuillet | 2016-10-04 | 1 | -1/+2 | |
| | | | ||||||
| * | | Fixed icon position in share menu | Nicolas Lœuillet | 2016-10-04 | 1 | -7/+6 | |
| | | | ||||||
| * | | fix icons | Thomas Citharel | 2016-10-04 | 1 | -8/+6 | |
| | | | ||||||
| * | | Basically, fix everything | Thomas Citharel | 2016-10-03 | 2 | -21/+25 | |
| |/ | | | | | | | | | | | * Remove install.sh * Assets are now provided * Icons font issues are fixed | |||||
* / | Create config even if user is disabled | Jeremy Benoist | 2016-10-04 | 1 | -4/+0 | |
|/ | | | | | When a user register itself AND the wallabag instance is configured to send a confirmation email, the user is disabled when the listener (which create the config) receive the event. There were a check (don't know why) if the user is enabled we create the config. But the user is disabled when confirmation email is actived. | |||||
* | Merge pull request #2341 from mruminski/master | Thomas Citharel | 2016-10-03 | 1 | -31/+31 | |
|\ | | | | | Update messages.pl.yml | |||||
| * | Update messages.pl.yml | Mateusz Rumiński | 2016-10-03 | 1 | -31/+31 | |
| | | | | | | add missing and update existing translation | |||||
* | | improve German translation | Sven Fischer | 2016-10-03 | 1 | -1/+1 | |
|/ | ||||||
* | 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 | |
| | | |