aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into 2.2Jeremy Benoist2017-01-2612-25/+31
|\
| * Merge pull request #2759 from wallabag/prepare-2162.1.6Nicolas Lœuillet2017-01-182-3/+9
| |\ | | | | | | Prepare wallabag 2.1.6 :rocket:
| | * Prepare wallabag 2.1.6 :rocket:Nicolas Lœuillet2017-01-172-3/+9
| |/
| * Merge pull request #2758 from wallabag/fix-public-sharingNicolas Lœuillet2017-01-179-22/+26
| |\ | | | | | | Fixed possible JS injection via the title edition
| | * Fixed possible JS injection via the title editionNicolas Lœuillet2017-01-179-22/+26
| |/
| * Merge pull request #2736 from lex111/patch-1Thomas Citharel2017-01-042-2/+2
| |\ | | | | | | Update copyright year
| | * Update copyright year in COPYING.mdAlexey Py2017-01-051-1/+1
| | |
| | * Update copyright yearAlexey Py2017-01-041-1/+1
| |/
* | Merge pull request #2646 from wallabag/explain-migrations-in-docNicolas Lœuillet2017-01-2621-113/+2641
|\ \ | | | | | | Added explanations about migrations
| * | Moved queries in a separate fileNicolas Lœuillet2017-01-256-802/+2396
| | |
| * | Fixed update scriptNicolas Lœuillet2017-01-231-1/+1
| | |
| * | Added hardcoded SQL for migration to 2.2Nicolas Lœuillet2017-01-237-17/+840
| | |
| * | Added information about latest migrationsNicolas Lœuillet2017-01-2314-3/+41
| | |
| * | Add translation for :de:Julian Oster2017-01-231-16/+16
| | |
| * | Added french translationNicolas Lœuillet2017-01-233-72/+114
| | |
| * | Added explanations about migrationsNicolas Lœuillet2017-01-232-25/+56
| | |
* | | Merge pull request #2787 from wallabag/lock-rulerzJeremy Benoist2017-01-261-0/+1
|\ \ \ | | | | | | | | Lock kphoen/rulerz to avoid breaking changes
| * | | Lock kphoen/rulerz to avoid breaking changesJeremy Benoist2017-01-261-0/+1
|/ / /
* | | Merge pull request #2750 from wallabag/rename-uuidJeremy Benoist2017-01-251-0/+75
|\ \ \ | | | | | | | | Added migration to rename uuid to uid
| * | | Added migration for SQLiteNicolas Lœuillet2017-01-251-2/+6
| | | |
| * | | Added migration to rename uuid to uidNicolas Lœuillet2017-01-141-0/+71
| | | |
* | | | Merge pull request #2774 from wallabag/cli-exportThomas Citharel2017-01-243-0/+160
|\ \ \ \ | |_|/ / |/| | | add cli export
| * | | Fix phpcs and testsThomas Citharel2017-01-242-14/+10
| | | |
| * | | add filepath testThomas Citharel2017-01-222-2/+19
| | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | | add cli exportThomas Citharel2017-01-223-0/+147
|/ / / | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | Merge pull request #2763 from janLo/sort-tagsThomas Citharel2017-01-181-0/+1
|\ \ \ | |/ / |/| | Sort list of available tags
| * | Order tags by slugJan Losinski2017-01-171-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-falseNicolas Lœuillet2017-01-104-3/+44
|\ \ | | | | | | Avoid false preview image
| * | Use latest bdunogier/guzzle-site-authenticatorJeremy Benoist2017-01-101-1/+1
| | |
| * | Fix registration.submit testJeremy Benoist2017-01-101-1/+1
| | |
| * | Avoid false preview imageJeremy Benoist2017-01-102-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 depsJeremy Benoist2017-01-101-1/+5
| |
* | Merge pull request #2733 from wallabag/fix-no-matching-responseJeremy Benoist2017-01-081-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œuillet2016-12-301-3/+3
| | |
* | | Merge pull request #2735 from wallabag/remove-small-readingtimeNicolas Lœuillet2016-12-3012-24/+24
|\ \ \ | | | | | | | | Removed the small element on reading time
| * | | Removed the small element on reading timeNicolas Lœuillet2016-12-3012-24/+24
| | | |
* | | | Merge pull request #2729 from Simounet/fix/double-overlay-right-sidenavNicolas Lœuillet2016-12-305-8/+8
|\ \ \ \ | | | | | | | | | | Fix double overlay on expanded right sidenav
| * | | | Fix double overlay on expanded right sidenavSimounet2016-12-305-8/+8
| |/ / /
* | | | Merge pull request #2728 from Simounet/fix/side-nav-scrollingNicolas Lœuillet2016-12-303-4/+3
|\ \ \ \ | |/ / / |/| | | Fix right side-nav scrolling on low height window
| * | | Fix action's icons positionSimounet2016-12-302-2/+2
| | | |
| * | | Fix right side-nav scrolling on low height windowSimounet2016-12-303-3/+2
| |/ /
* | | Merge pull request #2725 from lapineige/masterNicolas Lœuillet2016-12-302-2/+2
|\ \ \ | |/ / |/| | Share to Shaarli - Include tags
| * | Share tags to Shaarli - Material themelapineige2016-12-281-1/+1
| | |
| * | Share tags to Shaarli - Baggy themelapineige2016-12-281-1/+1
| |/
* | Merge pull request #2732 from Simounet/fix/firefox-addon-urlNicolas Lœuillet2016-12-301-1/+1
|\ \ | | | | | | Firefox add-on URL updated
| * | Firefox add-on URL updatedSimounet2016-12-301-1/+1
|/ /
* | Merge pull request #2730 from Simounet/feature/all-actions-on-mobileNicolas Lœuillet2016-12-303-34/+54
|\ \ | | | | | | Access to search, filters, export on mobile
| * | Access to search, filters, export on mobileSimounet2016-12-293-34/+54
| | |
* | | Merge pull request #2731 from llune/patch-2Nicolas Lœuillet2016-12-301-4/+4
|\ \ \ | |/ / |/| | Minor typo fix
| * | Minor typo fixllune2016-12-301-4/+4
| |/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 19:45:28 +0000