Commit graph

3572 commits

Author SHA1 Message Date
Jeremy Benoist 5397d820fe Merge pull request #2838 from wallabag/Quent-in-patch-1
Update Oc version
2017-02-04 21:54:43 +01:00
Jeremy Benoist 6837c3989a Merge pull request #2840 from wallabag/fix-frameworkbundle
Restored correct version for framework-extra-bundle
2017-02-04 21:53:26 +01:00
Nicolas Lœuillet 7db1bdf1e4 Restored correct version for framework-extra-bundle
The bundle was fixed in latest version.
2017-02-04 18:26:16 +01:00
Quent-in 289ce94bd8 Update Oc version
I'll be ready for next train
2017-02-04 15:21:13 +01:00
Nicolas Lœuillet 5b9cf67529 Merge pull request #2818 from Kdecherf/fix-search-bar
Fix nav-panel-search height
2017-02-03 09:04:33 +01:00
Nicolas Lœuillet 8138fd390b Added minified CSS files 2017-02-02 21:48:59 +01:00
Kevin Decherf 3cc0cc0ae7 Fix nav-panel-search height
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-02-02 21:48:59 +01:00
Jeremy Benoist 8a098044bf Merge pull request #2831 from wallabag/Quent-in-patch-1
Update of CraueConfigBundle in Occitan
2017-02-02 17:11:40 +01:00
Quent-in 20fa5ca02a Update of CraueConfigBundle in Occitan 2017-02-02 16:29:28 +01:00
Nicolas Lœuillet c7d05059ca Merge pull request #2824 from wallabag/simplify-strings
Renamed Developer section to API client management
2017-02-02 15:35:22 +01:00
Nicolas Lœuillet d3ef28c092
Freezed sensio/framework-extra-bundle version 2017-02-02 14:39:17 +01:00
Jeremy Benoist f217cf48d9 Merge pull request #2826 from wallabag/jlnostr-patch-1
Translate missing strings for de-DE.
2017-02-02 09:13:21 +01:00
Jeremy Benoist ab5c68facc Merge pull request #2829 from wallabag/mruminski-patch-1
Update polish strings
2017-02-02 09:12:52 +01:00
Mateusz Rumiński 51ca217d2e Update polish strings
update missing polish strings
2017-02-01 22:29:03 +01:00
Julian Oster f41b085c76 Translate missing strings for de-DE. 2017-02-01 22:06:04 +01:00
Julian Oster 74ba949d7e Update german strings. 2017-02-01 21:29:59 +01:00
Nicolas Lœuillet 013f426d10
Renamed Developer section to API client management 2017-02-01 13:23:13 +01:00
Nicolas Lœuillet d3a8322a64 Merge pull request #2816 from wallabag/add-details-update
Added details about upgrade from 2.1.x or 2.2.0
2017-01-31 14:09:51 +01:00
Nicolas Lœuillet 1a6e0725d3
Added details about upgrade from 2.1.x or 2.2.0 2017-01-31 12:53:22 +01:00
Nicolas Lœuillet 713f35bafd Merge pull request #2812 from wallabag/prepare-221
Prepare wallabag 2.2.1 🚀
2017-01-31 11:31:45 +01:00
Nicolas Lœuillet 4021c928be
Prepare wallabag 2.2.1 🚀 2017-01-31 11:06:35 +01:00
Nicolas Lœuillet 38c73f9691 Merge pull request #2809 from wallabag/fix-22-migrations
Fixed duplicate entry for share_public in craue_setting_table
2017-01-31 11:03:58 +01:00
Nicolas Lœuillet a5cd696b22
Added check in migration about uuid field 2017-01-30 21:21:49 +01:00
Nicolas Lœuillet 7a340375c3
Fixed duplicate entry for share_public in craue_setting_table 2017-01-30 16:22:03 +01:00
Nicolas Lœuillet ec67907420 Merge pull request #2790 from wallabag/prepare-220
Prepare wallabag 2.2.0 🚀
2017-01-27 19:03:13 +01:00
Nicolas Lœuillet c833d576a9
Prepare wallabag 2.2.0 🚀 2017-01-27 17:28:58 +01:00
Nicolas Lœuillet f0c5154d68 Merge pull request #2789 from wallabag/add-index-starred-archived
Added indexes on is_archived and is_starred
2017-01-27 14:46:50 +01:00
Nicolas Lœuillet 01e760691b
Fixed check on index 2017-01-27 14:11:21 +01:00
Nicolas Lœuillet b564d350b0
Added indexes on is_archived and is_starred 2017-01-27 11:44:04 +01:00
Jeremy Benoist 6fb06904ec Merge pull request #2416 from wallabag/2.2
wallabag 2.2.0
2017-01-27 09:34:32 +01:00
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