Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | | Firefox add-on URL updated | Simounet | 2016-12-30 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #2730 from Simounet/feature/all-actions-on-mobile | Nicolas Lœuillet | 2016-12-30 | 3 | -34/+54 |
|\ \ | | | | | | | Access to search, filters, export on mobile | ||||
| * | | Access to search, filters, export on mobile | Simounet | 2016-12-29 | 3 | -34/+54 |
| | | | |||||
* | | | Merge pull request #2731 from llune/patch-2 | Nicolas Lœuillet | 2016-12-30 | 1 | -4/+4 |
|\ \ \ | |/ / |/| | | Minor typo fix | ||||
| * | | Minor typo fix | llune | 2016-12-30 | 1 | -4/+4 |
| |/ | |||||
* | | Merge pull request #2702 from wallabag/add-index-uuid | Nicolas Lœuillet | 2016-12-29 | 6 | -29/+85 |
|\ \ | | | | | | | Added index on entry.uuid | ||||
| * | | Renamed uuid to uid | Nicolas Lœuillet | 2016-12-29 | 5 | -30/+30 |
| | | | |||||
| * | | Changed uuid type in database | Nicolas Lœuillet | 2016-12-25 | 6 | -11/+5 |
| | | | |||||
| * | | Fixed index on entry.uuid and changed uuid field type | Nicolas Lœuillet | 2016-12-25 | 4 | -4/+12 |
| | | | |||||
| * | | Added index on table creation | Nicolas Lœuillet | 2016-12-23 | 1 | -1/+2 |
| | | | |||||
| * | | Added index on entry.uuid | Nicolas Lœuillet | 2016-12-23 | 1 | -0/+53 |
| | | | | | | | | | | | | Useful for entry sharing | ||||
* | | | Merge pull request #2724 from Simounet/fix/reading-time | Thomas Citharel | 2016-12-28 | 3 | -10/+9 |
|\ \ \ | | | | | | | | | Fix entry reading time | ||||
| * | | | Fix entry reading time | Simounet | 2016-12-27 | 3 | -10/+9 |
| |/ / | |||||
* | | | Merge pull request #2723 from wallabag/fix-export-tag-space | Nicolas Lœuillet | 2016-12-28 | 4 | -5/+5 |
|\ \ \ | |/ / |/| | | Fixed export by tags with a tag which contains space | ||||
| * | | Fixed export by tags with a tag which contains space | Nicolas Lœuillet | 2016-12-27 | 4 | -5/+5 |
|/ / | |||||
* | | Merge pull request #2696 from wallabag/run-migration | Nicolas Lœuillet | 2016-12-23 | 12 | -30/+299 |
|\ \ | | | | | | | Run migration on each test | ||||
| * | | Fix bad migration for PostreSQL | Jeremy Benoist | 2016-12-23 | 1 | -8/+68 |
| | | | | | | | | | | | | Queries weren’t executed for PostgreSQL, bad syntax. | ||||
| * | | Be consistent between migration & schema definition | Jeremy Benoist | 2016-12-19 | 4 | -3/+4 |
| | | | |||||
| * | | fixup! Run migration in test, ready for MySQL | Jeremy Benoist | 2016-12-19 | 1 | -1/+1 |
| | | | |||||
| * | | Use actual database name | Jeremy Benoist | 2016-12-19 | 1 | -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 null | Jeremy Benoist | 2016-12-19 | 1 | -1/+1 |
| | | | |||||
| * | | fixup! Manually import file for PostgreSQL | Jeremy Benoist | 2016-12-19 | 1 | -6/+6 |
| | | | |||||
| * | | Remove comment | Jeremy Benoist | 2016-12-19 | 1 | -11/+0 |
| | | | | | | | | | | | | "The string "--" is not permitted within comments." | ||||
| * | | Add orignal DB schema | Jeremy Benoist | 2016-12-19 | 3 | -0/+120 |
| | | | |||||
| * | | And of course it doesn't work for SQLite | Jeremy Benoist | 2016-12-19 | 1 | -0/+9 |
| | | | |||||
| * | | Manually import file for PostgreSQL | Jeremy Benoist | 2016-12-19 | 1 | -8/+13 |
| | | | |||||
| * | | Run migration in test, ready for MySQL | Jeremy Benoist | 2016-12-19 | 3 | -13/+98 |
| | | | |||||
* | | | Merge pull request #2714 from Simounet/fix/entry-card-shadow | Jeremy Benoist | 2016-12-20 | 2 | -11/+10 |
|\ \ \ | |/ / |/| | | Fix the box shadow on the card entry | ||||
| * | | Fix the box shadow on the card entry | Simounet | 2016-12-20 | 2 | -11/+10 |
|/ / | |||||
* | | Merge pull request #2616 from mathieui/doc-https-links | Jeremy Benoist | 2016-12-19 | 6 | -12/+12 |
|\ \ | | | | | | | Change documentation links to HTTPS | ||||
| * | | Change documentation links to HTTPS | mathieui | 2016-11-20 | 6 | -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-config | Jeremy Benoist | 2016-12-18 | 4 | -4/+52 |
|\ \ \ | | | | | | | | | Ensure craue_config_setting migration are ok | ||||
| * | | | Replaced quotes for Postgres | Nicolas Lœuillet | 2016-12-18 | 4 | -6/+6 |
| | | | | |||||
| * | | | Ensure craue_config_setting migration are ok | Jeremy Benoist | 2016-12-15 | 4 | -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-config | Nicolas Lœuillet | 2016-12-16 | 5 | -0/+12 |
|\ \ \ \ | | | | | | | | | | | Added QoS for RabbitMQ | ||||
| * | | | | Moved RabbitMQ QoS to parameters | Nicolas Lœuillet | 2016-12-15 | 5 | -8/+12 |
| | | | | | |||||
| * | | | | Added QoS for RabbitMQ | Nicolas Lœuillet | 2016-12-15 | 1 | -0/+8 |
| |/ / / | |||||
* | | | | Merge pull request #2701 from wallabag/disable-outputWalkers | Nicolas Lœuillet | 2016-12-16 | 3 | -6/+4 |
|\ \ \ \ | |/ / / |/| | | | Removed outputWalkers for pagination | ||||
| * | | | Removed outputWalkers for RSS and API | Nicolas Lœuillet | 2016-12-15 | 2 | -2/+2 |
| | | | |