aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Prepare wallabag 2.2.0 :rocket:Nicolas Lœuillet2017-01-272-5/+89
|/ / /
* | | Merge pull request #2789 from wallabag/add-index-starred-archivedNicolas Lœuillet2017-01-277-0/+314
|\ \ \
| * | | Fixed check on indexNicolas Lœuillet2017-01-271-4/+2
| * | | Added indexes on is_archived and is_starredNicolas Lœuillet2017-01-277-0/+316
|/ / /
* | | Merge pull request #2416 from wallabag/2.2Jeremy Benoist2017-01-27282-1079/+9826
|\ \ \ | |/ / |/| |
| * | 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: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 editionNicolas Lœuillet2017-01-179-22/+26
|/ / /
* | | Merge pull request #2736 from lex111/patch-1Thomas Citharel2017-01-042-2/+2
|\ \ \ | |_|/ |/| |
| * | 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
| |\
| | * 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 changesJeremy Benoist2017-01-261-0/+1
| |/ /
| * | Merge pull request #2750 from wallabag/rename-uuidJeremy Benoist2017-01-251-0/+75
| |\ \
| | * | 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
| |\ \ \ | | |_|/ | |/| |
| | * | Fix phpcs and testsThomas Citharel2017-01-242-14/+10
| | * | add filepath testThomas Citharel2017-01-222-2/+19
| | * | add cli exportThomas Citharel2017-01-223-0/+147
| |/ /
| * | Merge pull request #2763 from janLo/sort-tagsThomas Citharel2017-01-181-0/+1
| |\ \ | | |/ | |/|
| | * Order tags by slugJan Losinski2017-01-171-0/+1
| |/
| * Merge pull request #2742 from wallabag/fix-og-image-falseNicolas Lœuillet2017-01-104-3/+44
| |\
| | * 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
| |/
| * 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'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 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 sidenavSimounet2016-12-305-8/+8
| | |/ /
| * | | Merge pull request #2728 from Simounet/fix/side-nav-scrollingNicolas Lœuillet2016-12-303-4/+3
| |\ \ \ | | |/ / | |/| |
| | * | 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 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
| |\