Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Prepare wallabag 2.2.0 :rocket: | Nicolas Lœuillet | 2017-01-27 | 2 | -5/+89 |
| | |||||
* | Merge pull request #2789 from wallabag/add-index-starred-archived | Nicolas Lœuillet | 2017-01-27 | 7 | -0/+314 |
|\ | | | | | Added indexes on is_archived and is_starred | ||||
| * | Fixed check on index | Nicolas Lœuillet | 2017-01-27 | 1 | -4/+2 |
| | | |||||
| * | Added indexes on is_archived and is_starred | Nicolas Lœuillet | 2017-01-27 | 7 | -0/+316 |
|/ | |||||
* | Merge pull request #2416 from wallabag/2.2 | Jeremy Benoist | 2017-01-27 | 282 | -1079/+9826 |
|\ | | | | | wallabag 2.2.0 | ||||
| * | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2017-01-26 | 12 | -25/+31 |
| |\ | |/ |/| | |||||
* | | Merge pull request #2759 from wallabag/prepare-2162.1.6 | Nicolas Lœuillet | 2017-01-18 | 2 | -3/+9 |
|\ \ | | | | | | | Prepare wallabag 2.1.6 :rocket: | ||||
| * | | Prepare wallabag 2.1.6 :rocket: | Nicolas Lœuillet | 2017-01-17 | 2 | -3/+9 |
|/ / | |||||
* | | Merge pull request #2758 from wallabag/fix-public-sharing | Nicolas Lœuillet | 2017-01-17 | 9 | -22/+26 |
|\ \ | | | | | | | Fixed possible JS injection via the title edition | ||||
| * | | Fixed possible JS injection via the title edition | Nicolas Lœuillet | 2017-01-17 | 9 | -22/+26 |
|/ / | |||||
* | | Merge pull request #2736 from lex111/patch-1 | Thomas Citharel | 2017-01-04 | 2 | -2/+2 |
|\ \ | | | | | | | Update copyright year | ||||
| * | | Update copyright year in COPYING.md | Alexey Py | 2017-01-05 | 1 | -1/+1 |
| | | | |||||
| * | | Update copyright year | Alexey Py | 2017-01-04 | 1 | -1/+1 |
|/ / | |||||
| * | Merge pull request #2646 from wallabag/explain-migrations-in-doc | Nicolas Lœuillet | 2017-01-26 | 21 | -113/+2641 |
| |\ | | | | | | | Added explanations about migrations | ||||
| | * | Moved queries in a separate file | Nicolas Lœuillet | 2017-01-25 | 6 | -802/+2396 |
| | | | |||||
| | * | Fixed update script | Nicolas Lœuillet | 2017-01-23 | 1 | -1/+1 |
| | | | |||||
| | * | Added hardcoded SQL for migration to 2.2 | Nicolas Lœuillet | 2017-01-23 | 7 | -17/+840 |
| | | | |||||
| | * | Added information about latest migrations | Nicolas Lœuillet | 2017-01-23 | 14 | -3/+41 |
| | | | |||||
| | * | Add translation for :de: | Julian Oster | 2017-01-23 | 1 | -16/+16 |
| | | | |||||
| | * | Added french translation | Nicolas Lœuillet | 2017-01-23 | 3 | -72/+114 |
| | | | |||||
| | * | Added explanations about migrations | Nicolas Lœuillet | 2017-01-23 | 2 | -25/+56 |
| | | | |||||
| * | | Merge pull request #2787 from wallabag/lock-rulerz | Jeremy Benoist | 2017-01-26 | 1 | -0/+1 |
| |\ \ | | | | | | | | | Lock kphoen/rulerz to avoid breaking changes | ||||
| | * | | Lock kphoen/rulerz to avoid breaking changes | Jeremy Benoist | 2017-01-26 | 1 | -0/+1 |
| |/ / | |||||
| * | | Merge pull request #2750 from wallabag/rename-uuid | Jeremy Benoist | 2017-01-25 | 1 | -0/+75 |
| |\ \ | | | | | | | | | Added migration to rename uuid to uid | ||||
| | * | | Added migration for SQLite | Nicolas Lœuillet | 2017-01-25 | 1 | -2/+6 |
| | | | | |||||
| | * | | Added migration to rename uuid to uid | Nicolas Lœuillet | 2017-01-14 | 1 | -0/+71 |
| | | | | |||||
| * | | | Merge pull request #2774 from wallabag/cli-export | Thomas Citharel | 2017-01-24 | 3 | -0/+160 |
| |\ \ \ | | |_|/ | |/| | | add cli export | ||||
| | * | | Fix phpcs and tests | Thomas Citharel | 2017-01-24 | 2 | -14/+10 |
| | | | | |||||
| | * | | add filepath test | Thomas Citharel | 2017-01-22 | 2 | -2/+19 |
| | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| | * | | add cli export | Thomas Citharel | 2017-01-22 | 3 | -0/+147 |
| |/ / | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | | Merge pull request #2763 from janLo/sort-tags | Thomas Citharel | 2017-01-18 | 1 | -0/+1 |
| |\ \ | | |/ | |/| | Sort list of available tags | ||||
| | * | Order tags by slug | Jan Losinski | 2017-01-17 | 1 | -0/+1 |
| |/ | | | | | | | | | | | | | | | This adds an orderBy clause to findAllTags(). This makes the list of tags more useful, as the tags appear in alphanumerical order instead of somehow random. Signed-off-by: Jan Losinski <losinski@wh2.tu-dresden.de> | ||||
| * | Merge pull request #2742 from wallabag/fix-og-image-false | Nicolas Lœuillet | 2017-01-10 | 4 | -3/+44 |
| |\ | | | | | | | Avoid false preview image | ||||
| | * | Use latest bdunogier/guzzle-site-authenticator | Jeremy Benoist | 2017-01-10 | 1 | -1/+1 |
| | | | |||||
| | * | Fix registration.submit test | Jeremy Benoist | 2017-01-10 | 1 | -1/+1 |
| | | | |||||
| | * | Avoid false preview image | Jeremy Benoist | 2017-01-10 | 2 | -1/+42 |
| |/ | | | | | | | | | If the website doesn't provide an og_image, the value will be false and so it'll be saved like that in the database. We prefer to leave it as null instead of false. | ||||
| * | Update deps | Jeremy Benoist | 2017-01-10 | 1 | -1/+5 |
| | | |||||
| * | Merge pull request #2733 from wallabag/fix-no-matching-response | Jeremy Benoist | 2017-01-08 | 1 | -3/+3 |
| |\ | | | | | | | Fixed API error No matching accepted Response format could be determined | ||||
| | * | Fixed API error 'No matching accepted Response format could be determined' | Nicolas Lœuillet | 2016-12-30 | 1 | -3/+3 |
| | | | |||||
| * | | Merge pull request #2735 from wallabag/remove-small-readingtime | Nicolas Lœuillet | 2016-12-30 | 12 | -24/+24 |
| |\ \ | | | | | | | | | Removed the small element on reading time | ||||
| | * | | Removed the small element on reading time | Nicolas Lœuillet | 2016-12-30 | 12 | -24/+24 |
| | | | | |||||
| * | | | Merge pull request #2729 from Simounet/fix/double-overlay-right-sidenav | Nicolas Lœuillet | 2016-12-30 | 5 | -8/+8 |
| |\ \ \ | | | | | | | | | | | Fix double overlay on expanded right sidenav | ||||
| | * | | | Fix double overlay on expanded right sidenav | Simounet | 2016-12-30 | 5 | -8/+8 |
| | |/ / | |||||
| * | | | Merge pull request #2728 from Simounet/fix/side-nav-scrolling | Nicolas Lœuillet | 2016-12-30 | 3 | -4/+3 |
| |\ \ \ | | |/ / | |/| | | Fix right side-nav scrolling on low height window | ||||
| | * | | Fix action's icons position | Simounet | 2016-12-30 | 2 | -2/+2 |
| | | | | |||||
| | * | | Fix right side-nav scrolling on low height window | Simounet | 2016-12-30 | 3 | -3/+2 |
| | |/ | |||||
| * | | Merge pull request #2725 from lapineige/master | Nicolas Lœuillet | 2016-12-30 | 2 | -2/+2 |
| |\ \ | | |/ | |/| | Share to Shaarli - Include tags | ||||
| | * | Share tags to Shaarli - Material theme | lapineige | 2016-12-28 | 1 | -1/+1 |
| | | | |||||
| | * | Share tags to Shaarli - Baggy theme | lapineige | 2016-12-28 | 1 | -1/+1 |
| |/ |/| | |||||
| * | Merge pull request #2732 from Simounet/fix/firefox-addon-url | Nicolas Lœuillet | 2016-12-30 | 1 | -1/+1 |
| |\ | | | | | | | Firefox add-on URL updated |