3450 Commits

Author SHA1 Message Date
Jeremy Benoist
7005b425e0
Remove the left margin of tag
In the entries list, the first tag below the link isn’t stick to the left. Now it is.
2016-11-08 22:15:37 +01:00
Thomas Citharel
a0fb3b1b7a Merge pull request from wallabag/Rurik19-patch-2259
fix 
2016-11-08 18:38:37 +01:00
Yuriy Evdokimov
d99a7c2206 fix 2016-11-08 22:14:32 +05:00
Nicolas Lœuillet
89e167a45a Merge pull request from wallabag/add-tagform-mobile
Added new tag form in mobile view for Material theme
2016-11-08 15:42:05 +01:00
Nicolas Lœuillet
df30af69d2 Added new tag form in mobile view for Material theme
Fix 
2016-11-08 14:24:00 +01:00
Jeremy Benoist
41c2178685 Merge pull request from wallabag/pinboard
Add Pinboard import
2016-11-08 14:19:40 +01:00
Strubbl
82f9a52078 docs: update german import.rst 2016-11-07 21:00:57 +01:00
Nicolas Lœuillet
40f3ab5311 Merge pull request from dkrmr/fix_update_script
Reorder variable assignation in update.sh script, fix 
2016-11-07 11:14:05 +01:00
Nicolas Lœuillet
a4de2351a0 Merge pull request from wallabag/replace-tokenstorage
Replaced TokenStorage with TokenStorageInterface
2016-11-07 11:13:50 +01:00
Nicolas Lœuillet
94766a8962
PHP CS 2016-11-07 10:41:11 +01:00
Nicolas Lœuillet
2fe2e411a7
Replaced TokenStorage with TokenStorageInterface 2016-11-07 10:34:49 +01:00
Darius Kramer
7d173a28c7 Reorder variable assignation in update.sh script, fix 2016-11-07 09:55:03 +01:00
Jeremy Benoist
94060509b8
Use more explicit check 2016-11-07 08:36:52 +01:00
Jeremy Benoist
06283bef72 Merge pull request from wallabag/reading-time-round
Round readingtime to avoid crazy number
2016-11-06 23:32:39 +01:00
Jeremy Benoist
2e4efb5965
Add english doc into german one 2016-11-06 23:27:55 +01:00
Strubbl
56e6216485 Update messages.en.yml
Instapaper->Pinboard
2016-11-06 22:29:49 +01:00
Strubbl
e8e72daaa6 Update messages.de.yml 2016-11-06 22:29:08 +01:00
Jeremy Benoist
01ad4d6a89 Merge pull request from wallabag/remove-maintenance-bundle
Removed Maintenance bundle
2016-11-06 21:47:16 +01:00
Jeremy Benoist
d61b24e459
Round readingtime to avoid crazy number
Like `8.666666666667 min`
2016-11-06 21:41:32 +01:00
Jeremy Benoist
31151d70f2
Add doc 2016-11-06 21:23:38 +01:00
Nicolas Lœuillet
db3838545c
Removed Maintenance bundle 2016-11-06 15:34:08 +01:00
Jeremy Benoist
e92fbdc852
Fix tests 2016-11-06 09:58:07 +01:00
Nicolas Lœuillet
24692715de Merge pull request from wallabag/update-parameters-doc
Updated default parameters.yml file in documentation
2016-11-06 09:52:09 +01:00
Nicolas Lœuillet
0c256e2e70
Updated default parameters.yml file in documentation 2016-11-06 09:11:12 +01:00
Nicolas Lœuillet
16037570bf Merge pull request from wallabag/update-doc
Update the upgrade documentation
2016-11-05 14:16:21 +01:00
Nicolas Lœuillet
bc12f08bda
Update the upgrade documentation 2016-11-05 14:15:09 +01:00
Jeremy Benoist
9ab024b4f5
Add Pinboard import 2016-11-04 22:44:31 +01:00
Jeremy Benoist
b5571b52cc Merge pull request from wallabag/mruminski-patch-1
Update messages.pl.yml
2016-11-04 21:49:42 +01:00
Thomas Citharel
cbdbd9d683 Merge pull request from wallabag/Quent-in-patch-1
Update of the OC version
2016-11-04 19:29:27 +01:00
Mateusz Rumiński
ff7f551f5a Update messages.pl.yml
missing polish translation added
2016-11-04 19:26:06 +01:00
Quent-in
eaa0bf00a6 Update of the OC version 2016-11-04 18:13:11 +01:00
Nicolas Lœuillet
4ec9f5c334 Merge pull request from wallabag/prepare-213
Prepare wallabag 2.1.3 🚀
2016-11-04 13:32:47 +01:00
Nicolas Lœuillet
505e8acd46 Update CHANGELOG
Usage of github-changes from @lalitkapoor
2016-11-04 13:32:30 +01:00
Jeremy Benoist
4775fed6a7 Merge pull request from wallabag/default-sort-2.2
Use created_at as default sort
2016-11-04 09:38:03 +01:00
Nicolas Lœuillet
a3f7d8a870
Prepare wallabag 2.1.3 🚀 2016-11-04 09:10:15 +01:00
Nicolas Lœuillet
2db9142bfc Merge pull request from wallabag/ui-changes
UI Changes
2016-11-04 08:49:52 +01:00
Nicolas Lœuillet
f53f542fa5 Merge pull request from wallabag/default-sort
Use created_at as default sort
2016-11-04 08:48:42 +01:00
Jeremy Benoist
7e9c1d65b1
Add index into Table definition 2016-11-04 08:02:02 +01:00
Jeremy Benoist
1e7b04d4ea
Use created_at as default sort
With index (following https://github.com/wallabag/wallabag/pull/2534)
2016-11-04 07:56:04 +01:00
Jeremy Benoist
ce11952447
Use created_at as default sort
Imported content use the real creation date. If we sort by id, it'll
display contents in reverse order.
2016-11-04 07:34:38 +01:00
Jeremy Benoist
001cc7168a
Cleanup 2016-11-03 18:01:25 +01:00
Jeremy Benoist
864c1dd23a
Fix rest controller merge 2016-11-03 17:29:16 +01:00
Jeremy Benoist
5a619812ca
Merge remote-tracking branch 'origin/master' into 2.2 2016-11-03 16:41:29 +01:00
Jeremy Benoist
da41365579 Merge pull request from wallabag/download-pictures
Download pictures
2016-11-03 16:22:07 +01:00
Jeremy Benoist
ca08d02f2f
Add warning message for import + download images
When import isn't async and downloading images is enabled, we warn the user that import can fail.
Also, added missing translations
2016-11-03 15:59:20 +01:00
Nicolas Lœuillet
816c0940d1 Merge pull request from wallabag/qrcode-android-app
Added QRCode and link to configure android application
2016-11-03 14:55:24 +01:00
Thomas Citharel
32508ef07a
avoid eslint warning by disabling line
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-11-03 14:23:09 +01:00
Thomas Citharel
d56d416d9b
Deal with more resolution issues
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-11-03 12:49:57 +01:00
Thomas Citharel
3221b2e413
Fix resolution issues and 'title' issues
Also, modify editorconfig for css files.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-11-03 11:28:40 +01:00
Nicolas Lœuillet
84795d015b Merge pull request from wallabag/add-doc-failed-load-external-entity
Added documentation about failed to load external entity error
2016-11-02 20:07:10 +01:00