Commit graph

3674 commits

Author SHA1 Message Date
Nicolas Lœuillet
05fa529bcf Merge pull request #2759 from wallabag/prepare-216
Prepare wallabag 2.1.6 🚀
2017-01-18 10:24:24 +01:00
Jan Losinski
32755d5091 Order tags by slug
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>
2017-01-17 19:22:20 +01:00
Nicolas Lœuillet
1ba542ce04 Prepare wallabag 2.1.6 🚀 2017-01-17 13:59:39 +01:00
Nicolas Lœuillet
9123cb3053 Merge pull request #2758 from wallabag/fix-public-sharing
Fixed possible JS injection via the title edition
2017-01-17 11:59:14 +01:00
Nicolas Lœuillet
3d9950792c
Fixed possible JS injection via the title edition 2017-01-17 10:09:04 +01:00
Nicolas Lœuillet
5ed503ab28
Added migration to rename uuid to uid 2017-01-14 13:46:20 +01:00
Nicolas Lœuillet
b4d81c91de Merge pull request #2742 from wallabag/fix-og-image-false
Avoid false preview image
2017-01-10 21:25:27 +01:00
Jeremy Benoist
1ff2e71c1c
Use latest bdunogier/guzzle-site-authenticator 2017-01-10 18:50:55 +01:00
Jeremy Benoist
72e634b06c
Fix registration.submit test 2017-01-10 18:50:45 +01:00
Jeremy Benoist
3d71d40349
Avoid false preview image
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.
2017-01-10 17:42:36 +01:00
Jeremy Benoist
e4ccd3effe
Update deps 2017-01-10 17:35:17 +01:00
Jeremy Benoist
a4180d0b8e Merge pull request #2733 from wallabag/fix-no-matching-response
Fixed API error No matching accepted Response format could be determined
2017-01-08 10:22:31 +01:00
Thomas Citharel
96e2827605 Merge pull request #2736 from lex111/patch-1
Update copyright year
2017-01-04 22:43:58 +01:00
Alexey Py
de84b135e2 Update copyright year in COPYING.md 2017-01-05 00:06:09 +03:00
Alexey Py
c20d9e311f Update copyright year 2017-01-04 23:57:33 +03:00
Nicolas Lœuillet
cace43dd7b Merge pull request #2735 from wallabag/remove-small-readingtime
Removed the small element on reading time
2016-12-30 15:45:19 +01:00
Nicolas Lœuillet
144f2039e4 Merge pull request #2729 from Simounet/fix/double-overlay-right-sidenav
Fix double overlay on expanded right sidenav
2016-12-30 15:01:39 +01:00
Nicolas Lœuillet
4da856ef11 Merge pull request #2728 from Simounet/fix/side-nav-scrolling
Fix right side-nav scrolling on low height window
2016-12-30 14:57:39 +01:00
Nicolas Lœuillet
70d99765c7
Removed the small element on reading time 2016-12-30 14:17:18 +01:00
Simounet
ccb9e79a35 Fix double overlay on expanded right sidenav 2016-12-30 14:00:19 +01:00
Simounet
bb2934d476 Fix action's icons position 2016-12-30 13:54:13 +01:00
Simounet
8e2419a5cf Fix right side-nav scrolling on low height window 2016-12-30 13:50:59 +01:00
Nicolas Lœuillet
339b1e689d Merge pull request #2725 from lapineige/master
Share to Shaarli - Include tags
2016-12-30 13:50:44 +01:00
Nicolas Lœuillet
0bacc9e175
Fixed API error 'No matching accepted Response format could be determined' 2016-12-30 13:23:02 +01:00
Nicolas Lœuillet
510b02573f Merge pull request #2732 from Simounet/fix/firefox-addon-url
Firefox add-on URL updated
2016-12-30 13:18:22 +01:00
Simounet
db769f6061 Firefox add-on URL updated 2016-12-30 12:01:38 +01:00
Nicolas Lœuillet
5f4667e3e8 Merge pull request #2730 from Simounet/feature/all-actions-on-mobile
Access to search, filters, export on mobile
2016-12-30 11:10:47 +01:00
Nicolas Lœuillet
af54b2c959 Merge pull request #2731 from llune/patch-2
Minor typo fix
2016-12-30 08:55:15 +01:00
llune
9ad7475c74 Minor typo fix 2016-12-30 02:20:58 +01:00
Simounet
22d0c929e3 Access to search, filters, export on mobile 2016-12-29 19:19:51 +01:00
Nicolas Lœuillet
8527238846 Merge pull request #2702 from wallabag/add-index-uuid
Added index on entry.uuid
2016-12-29 10:54:07 +01:00
Nicolas Lœuillet
7239082a5e
Renamed uuid to uid 2016-12-29 10:09:44 +01:00
Thomas Citharel
90f6ee4dbe Merge pull request #2724 from Simounet/fix/reading-time
Fix entry reading time
2016-12-28 18:11:01 +01:00
lapineige
d5d4708fe3 Share tags to Shaarli - Material theme 2016-12-28 12:27:09 +01:00
lapineige
0a0aa70098 Share tags to Shaarli - Baggy theme 2016-12-28 12:27:00 +01:00
Nicolas Lœuillet
92ba3b5c0d Merge pull request #2723 from wallabag/fix-export-tag-space
Fixed export by tags with a tag which contains space
2016-12-28 09:10:14 +01:00
Simounet
6ed615ac74 Fix entry reading time 2016-12-27 22:37:42 +01:00
Nicolas Lœuillet
c8de7ab94c
Fixed export by tags with a tag which contains space 2016-12-27 21:26:53 +01:00
Nicolas Lœuillet
89cd670abf Changed uuid type in database 2016-12-25 10:51:25 +01:00
Nicolas Lœuillet
8137515171 Fixed index on entry.uuid and changed uuid field type 2016-12-25 10:51:25 +01:00
Nicolas Lœuillet
af131cb513 Added index on table creation 2016-12-23 10:26:33 +01:00
Nicolas Lœuillet
74b7c0985d Added index on entry.uuid
Useful for entry sharing
2016-12-23 10:26:33 +01:00
Nicolas Lœuillet
7719346328 Merge pull request #2696 from wallabag/run-migration
Run migration on each test
2016-12-23 09:31:41 +01:00
Jeremy Benoist
a72f3dc308
Fix bad migration for PostreSQL
Queries weren’t executed for PostgreSQL, bad syntax.
2016-12-23 09:00:13 +01:00
Jeremy Benoist
cd77a7e7ef Merge pull request #2714 from Simounet/fix/entry-card-shadow
Fix the box shadow on the card entry
2016-12-20 14:52:50 +01:00
Simounet
78d6c3090a Fix the box shadow on the card entry 2016-12-20 13:04:51 +01:00
Jeremy Benoist
3ef75cc4e3
Be consistent between migration & schema definition 2016-12-19 14:24:19 +01:00
Jeremy Benoist
6514f0ed37
fixup! Run migration in test, ready for MySQL 2016-12-19 10:35:25 +01:00
Jeremy Benoist
d44016b072
Use actual database name
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
2016-12-19 10:35:25 +01:00
Jeremy Benoist
3ad4061dba
pocket_consumer_key can be null 2016-12-19 10:35:24 +01:00