aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |/
* | Merge pull request #2702 from wallabag/add-index-uuidNicolas Lœuillet2016-12-296-29/+85
|\ \ | | | | | | Added index on entry.uuid
| * | 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
| | | | | | | | | | | | Useful for entry sharing
* | | Merge pull request #2724 from Simounet/fix/reading-timeThomas Citharel2016-12-283-10/+9
|\ \ \ | | | | | | | | Fix entry reading time
| * | | 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 space
| * | 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
|\ \ | | | | | | Run migration on each test
| * | Fix bad migration for PostreSQLJeremy Benoist2016-12-231-8/+68
| | | | | | | | | | | | Queries weren’t executed for PostgreSQL, bad syntax.
| * | 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
| | | | | | | | | | | | | | | | | | We can't retrieve the environment within the migration. And when we ran migration on Travis, database name isn't `database_name` but `test_database_name`. Retrieve the database name from the connection is more accurate
| * | pocket_consumer_key can be nullJeremy Benoist2016-12-191-1/+1
| | |
| * | fixup! Manually import file for PostgreSQLJeremy Benoist2016-12-191-6/+6
| | |
| * | Remove commentJeremy Benoist2016-12-191-11/+0
| | | | | | | | | | | | "The string "--" is not permitted within comments."
| * | Add orignal DB schemaJeremy Benoist2016-12-193-0/+120
| | |
| * | And of course it doesn't work for SQLiteJeremy Benoist2016-12-191-0/+9
| | |
| * | Manually import file for PostgreSQLJeremy Benoist2016-12-191-8/+13
| | |
| * | Run migration in test, ready for MySQLJeremy Benoist2016-12-193-13/+98
| | |
* | | Merge pull request #2714 from Simounet/fix/entry-card-shadowJeremy Benoist2016-12-202-11/+10
|\ \ \ | |/ / |/| | Fix the box shadow on the card entry
| * | Fix the box shadow on the card entrySimounet2016-12-202-11/+10
|/ /
* | Merge pull request #2616 from mathieui/doc-https-linksJeremy Benoist2016-12-196-12/+12
|\ \ | | | | | | Change documentation links to HTTPS
| * | Change documentation links to HTTPSmathieui2016-11-206-12/+12
| | | | | | | | | | | | | | | | | | Even though all the websites used in the commands redirect http to https, a man in the middle can happen with the initial request, leading to arbitrary code execution.
* | | Merge pull request #2682 from wallabag/migration-configJeremy Benoist2016-12-184-4/+52
|\ \ \ | | | | | | | | Ensure craue_config_setting migration are ok
| * | | Replaced quotes for PostgresNicolas Lœuillet2016-12-184-6/+6
| | | |
| * | | Ensure craue_config_setting migration are okJeremy Benoist2016-12-154-4/+52
| | | | | | | | | | | | | | | | We now can run the migration every time, new line from `craue_config_setting` are properly checked.
* | | | Merge pull request #2690 from wallabag/improve-rmq-configNicolas Lœuillet2016-12-165-0/+12
|\ \ \ \ | | | | | | | | | | Added QoS for RabbitMQ
| * | | | Moved RabbitMQ QoS to parametersNicolas Lœuillet2016-12-155-8/+12
| | | | |
| * | | | Added QoS for RabbitMQNicolas Lœuillet2016-12-151-0/+8
| |/ / /
* | | | Merge pull request #2701 from wallabag/disable-outputWalkersNicolas Lœuillet2016-12-163-6/+4
|\ \ \ \ | |/ / / |/| | | Removed outputWalkers for pagination
| * | | Removed outputWalkers for RSS and APINicolas Lœuillet2016-12-152-2/+2
| | | |