Commit graph

3542 commits

Author SHA1 Message Date
Jeremy Benoist 78295b99dd
Merge remote-tracking branch 'origin/master' into 2.2 2017-01-26 13:32:07 +01:00
Nicolas Lœuillet 463cb376e3 Merge pull request #2646 from wallabag/explain-migrations-in-doc
Added explanations about migrations
2017-01-26 13:15:06 +01:00
Jeremy Benoist 012b2d453e Merge pull request #2787 from wallabag/lock-rulerz
Lock kphoen/rulerz to avoid breaking changes
2017-01-26 11:33:42 +01:00
Jeremy Benoist 363e2a9ce9 Lock kphoen/rulerz to avoid breaking changes 2017-01-26 11:01:25 +01:00
Jeremy Benoist 73eb2b4ed5 Merge pull request #2750 from wallabag/rename-uuid
Added migration to rename uuid to uid
2017-01-25 13:57:26 +01:00
Nicolas Lœuillet 6dfd1a6c78
Added migration for SQLite 2017-01-25 12:59:04 +01:00
Nicolas Lœuillet 5d916d03af
Moved queries in a separate file 2017-01-25 12:34:20 +01:00
Thomas Citharel b8805fad03 Merge pull request #2774 from wallabag/cli-export
add cli export
2017-01-24 21:07:49 +01:00
Thomas Citharel 3b0380f049 Fix phpcs and tests 2017-01-24 20:42:02 +01:00
Nicolas Lœuillet c8cd1660af
Fixed update script 2017-01-23 14:43:00 +01:00
Nicolas Lœuillet 4acbeb9371
Added hardcoded SQL for migration to 2.2 2017-01-23 14:16:00 +01:00
Nicolas Lœuillet b87f171233 Added information about latest migrations 2017-01-23 12:42:58 +01:00
Julian Oster 500ae20c94 Add translation for 🇩🇪 2017-01-23 12:42:58 +01:00
Nicolas Lœuillet 80aee45fa8 Added french translation 2017-01-23 12:42:58 +01:00
Nicolas Lœuillet c8ef0583af Added explanations about migrations 2017-01-23 12:42:58 +01:00
Thomas Citharel a607b7a9c0 add filepath test
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-01-22 13:19:46 +01:00
Thomas Citharel 8303b037fb add cli export
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2017-01-22 12:51:14 +01:00
Thomas Citharel afaee1cc0a Merge pull request #2763 from janLo/sort-tags
Sort list of available tags
2017-01-18 15:15:19 +01:00
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