aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | 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 mobileSimounet2016-12-293-34/+54
* | | Merge pull request #2731 from llune/patch-2Nicolas Lœuillet2016-12-301-4/+4
|\ \ \ | |/ / |/| |
| * | Minor typo fixllune2016-12-301-4/+4
| |/
* | Merge pull request #2702 from wallabag/add-index-uuidNicolas Lœuillet2016-12-296-29/+85
|\ \
| * | Renamed uuid to uidNicolas Lœuillet2016-12-295-30/+30
| * | Changed uuid type in databaseNicolas Lœuillet2016-12-256-11/+5
| * | Fixed index on entry.uuid and changed uuid field typeNicolas Lœuillet2016-12-254-4/+12
| * | Added index on table creationNicolas Lœuillet2016-12-231-1/+2
| * | Added index on entry.uuidNicolas Lœuillet2016-12-231-0/+53
* | | Merge pull request #2724 from Simounet/fix/reading-timeThomas Citharel2016-12-283-10/+9
|\ \ \
| * | | Fix entry reading timeSimounet2016-12-273-10/+9
| |/ /
* | | Merge pull request #2723 from wallabag/fix-export-tag-spaceNicolas Lœuillet2016-12-284-5/+5
|\ \ \ | |/ / |/| |
| * | Fixed export by tags with a tag which contains spaceNicolas Lœuillet2016-12-274-5/+5
|/ /
* | Merge pull request #2696 from wallabag/run-migrationNicolas Lœuillet2016-12-2312-30/+299
|\ \
| * | Fix bad migration for PostreSQLJeremy Benoist2016-12-231-8/+68
| * | Be consistent between migration & schema definitionJeremy Benoist2016-12-194-3/+4
| * | fixup! Run migration in test, ready for MySQLJeremy Benoist2016-12-191-1/+1
| * | Use actual database nameJeremy Benoist2016-12-191-2/+2
| * | pocket_consumer_key can be nullJeremy Benoist2016-12-191-1/+1
| * | fixup! Manually import file for PostgreSQLJeremy Benoist2016-12-191-6/+6