Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2314 from wallabag/assets | Nicolas Lœuillet | 2016-10-03 | 3 | -21/+3 |
|\ | |||||
| * | Assets work | Thomas Citharel | 2016-09-28 | 3 | -21/+3 |
* | | Merge pull request #2331 from wallabag/api-links | Thomas Citharel | 2016-10-02 | 2 | -3/+16 |
|\ \ | |||||
| * | | Fix parameters in API _links | Jeremy Benoist | 2016-10-02 | 2 | -3/+16 |
* | | | 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 |
* | | | Merge pull request #2327 from wallabag/user-management | Jeremy Benoist | 2016-10-02 | 27 | -232/+829 |
|\ \ \ | |||||
| * | | | Disabled delete button for the logged user | Jeremy Benoist | 2016-10-02 | 1 | -1/+1 |
| * | | | 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 |
* | | | | Merge pull request #2325 from wallabag/api-entries-exists | Nicolas Lœuillet | 2016-10-02 | 1 | -0/+32 |
|\ \ \ \ | |||||
| * | | | | CS | Jeremy Benoist | 2016-10-02 | 1 | -1/+1 |
| * | | | | Add an exists endpoint in API | Jeremy Benoist | 2016-10-01 | 1 | -0/+32 |
* | | | | | Merge pull request #2328 from wallabag/avoid-duplicate-url | Nicolas Lœuillet | 2016-10-02 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | 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 |
|\ \ \ \ | |||||
| * | | | | 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 |
|\ \ \ \ \ | |||||
| * | | | | | 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 | Jeremy Benoist | 2016-10-01 | 13 | -4/+64 |
| | |/ / / | |/| | | | |||||
* | | | | | Fix OC typos | Jeremy Benoist | 2016-10-02 | 11 | -20/+20 |
* | | | | | Occitan version update | Quent-in | 2016-10-01 | 1 | -24/+26 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #2322 from wallabag/v2-404 | Nicolas Lœuillet | 2016-10-01 | 5 | -4/+103 |
|\ \ \ \ | |||||
| * | | | | Customize errors templates | Jeremy Benoist | 2016-10-01 | 5 | -4/+103 |
| |/ / / | |||||
* | | | | Fix bad template name | Jeremy Benoist | 2016-09-30 | 1 | -0/+0 |
* | | | | Create user config in one place | Jeremy Benoist | 2016-09-30 | 5 | -36/+42 |
|/ / / | |||||
* | | | 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 |
|\ \ \ | |||||
| * | | | 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 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 |
| |/ |/| | |||||
* | | Update messages.pl.yml | Mateusz Rumiński | 2016-09-27 | 1 | -12/+12 |
* | | Merge pull request #2192 from wallabag/import-browser-bookmarks | Jeremy Benoist | 2016-09-26 | 24 | -7/+747 |
|\ \ | |||||
| * | | Move prepareEntry to dedicated place | Jeremy Benoist | 2016-09-26 | 3 | -35/+42 |
| * | | Update Firefox file | Jeremy Benoist | 2016-09-25 | 1 | -12/+24 |
| * | | Fix bad date format in Browser import | Jeremy Benoist | 2016-09-25 | 3 | -62/+23 |
| * | | Fixed tests by removing clear() | Nicolas Lœuillet | 2016-09-25 | 1 | -4/+0 |
| * | | fix tests | Thomas Citharel | 2016-09-25 | 3 | -24/+24 |
| * | | cs & fixes | Thomas Citharel | 2016-09-25 | 5 | -33/+14 |
| * | | bring chrome and firefox as separate imports | Thomas Citharel | 2016-09-25 | 23 | -189/+558 |
| * | | Indentation and renamed fixtures file | Nicolas Lœuillet | 2016-09-25 | 9 | -27/+27 |
| * | | Add Chrome path for Mac OS | Nicolas Lœuillet | 2016-09-25 | 5 | -14/+4 |