Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Remove .idea stuff | Thomas Citharel | 2016-09-28 | 1 | -5/+1 | |
| * | Assets work | Thomas Citharel | 2016-09-28 | 23 | -417/+445 | |
* | | Merge pull request #2331 from wallabag/api-links | Thomas Citharel | 2016-10-02 | 3 | -4/+115 | |
|\ \ | ||||||
| * | | Fix parameters in API _links | Jeremy Benoist | 2016-10-02 | 3 | -4/+115 | |
* | | | 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 | Paulino Michelazzo | 2016-10-02 | 1 | -1/+1 | |
| |/ / | ||||||
* | | | Merge pull request #2327 from wallabag/user-management | Jeremy Benoist | 2016-10-02 | 31 | -346/+917 | |
|\ \ \ | ||||||
| * | | | Disabled delete button for the logged user | Jeremy Benoist | 2016-10-02 | 2 | -1/+12 | |
| * | | | 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 | |
* | | | | Merge pull request #2325 from wallabag/api-entries-exists | Nicolas Lœuillet | 2016-10-02 | 2 | -0/+54 | |
|\ \ \ \ | ||||||
| * | | | | 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 | |
* | | | | | Merge pull request #2328 from wallabag/avoid-duplicate-url | Nicolas Lœuillet | 2016-10-02 | 2 | -1/+45 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Remove additional entry | Jeremy Benoist | 2016-10-02 | 1 | -0/+9 | |
| * | | | | 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 | |
|\ \ \ \ | ||||||
| * | | | | 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 | |
|\ \ \ \ \ | ||||||
| * | | | | | 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 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #2323 from wallabag/footer-stats | Jeremy Benoist | 2016-10-02 | 15 | -5/+82 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add simple stats in footer | Jeremy Benoist | 2016-10-01 | 15 | -5/+82 | |
* | | | | | | Merge pull request #2329 from wallabag/Quent-in-patch-1 | Jeremy Benoist | 2016-10-02 | 11 | -35/+37 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | 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 | 7 | -9/+107 | |
|\ \ \ \ \ | ||||||
| * | | | | | Customize errors templates | Jeremy Benoist | 2016-10-01 | 7 | -9/+107 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #2320 from wallabag/user-config | Nicolas Lœuillet | 2016-10-01 | 7 | -43/+51 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Fix bad template name | Jeremy Benoist | 2016-09-30 | 1 | -0/+0 | |
| * | | | | Create user config in one place | Jeremy Benoist | 2016-09-30 | 6 | -43/+51 | |
|/ / / / | ||||||
* | | | | Merge remote-tracking branch 'origin/master' into 2.1 | Jeremy Benoist | 2016-09-30 | 4 | -5/+6 | |
|\ \ \ \ | |/ / / |/| / / | |/ / | ||||||
| * | | Merge pull request #2319 from pmartin/docker-php-gd-extension | Jeremy Benoist | 2016-09-30 | 4 | -5/+6 | |
| |\ \ | ||||||
| | * | | Add PHP 'gd' extension to docker | Pascal MARTIN | 2016-09-30 | 1 | -2/+3 | |
| | * | | Fix doc: 'bin/console' instead of 'app/console' | Pascal MARTIN | 2016-09-30 | 3 | -3/+3 | |
| |/ / | ||||||
* | | | Merge pull request #2318 from wallabag/refactor-templates | Nicolas Lœuillet | 2016-09-30 | 26 | -494/+18 | |
|\ \ \ | ||||||
| * | | | 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 | 23 | -33/+555 | |
|\ \ \ | ||||||
| * | | | Added french documentation about Redis and RabbitMQ | Nicolas Lœuillet | 2016-09-29 | 6 | -11/+195 | |
| * | | | Added links to async config in german doc | Sven Fischer | 2016-09-29 | 1 | -0/+2 | |
| * | | | add German redis.rst | Sven Fischer | 2016-09-29 | 1 | -0/+62 | |
| * | | | add German rabbitmq.rst | Sven Fischer | 2016-09-29 | 1 | -0/+67 | |
| * | | | Added links to async config in french doc | Nicolas Lœuillet | 2016-09-28 | 1 | -0/+2 |