Commit graph

1277 commits

Author SHA1 Message Date
Thomas Citharel
4362417495 Merge branch 'dev' of https://github.com/wallabag/wallabag into dev 2014-08-21 16:42:22 +02:00
tcitworld
a9bbe11169 Merge pull request #814 from wallabag/fix-issue813
vendor dir is not accessible before install, sqlite db dir write check moved into db class
2014-08-21 16:28:16 +02:00
Thomas Citharel
45e60cb52a Merge branch 'dev' of https://github.com/wallabag/wallabag into dev 2014-08-21 16:24:13 +02:00
Maryana Rozhankivska
211068ce50 vendor dir is not accessible before install, sqlite db dir write check moved into db class 2014-08-21 17:17:36 +03:00
Nicolas Lœuillet
051f7fb28c Merge pull request #783 from wallabag/message-after-login
#763 fix to display the login successful message with the translation
2014-08-18 14:41:09 +02:00
Nicolas Lœuillet
79666a3046 Merge pull request #784 from wallabag/fix-successful-add-message
fix display of 'Done' message when we add a link from 'save a link' item
2014-08-18 14:40:54 +02:00
Nicolas Lœuillet
78abff6a52 Merge pull request #785 from wallabag/change-default-pagination
change default pagination, set it to 12, to have a nice baggy display
2014-08-18 14:40:17 +02:00
Thomas Citharel
1daa8e4a0f merge fix 776 2014-08-16 00:54:46 +02:00
Maryana Rozhankivska
dc76489221 minimum of control on server side added 2014-08-15 19:22:55 +03:00
tcitworld
7c503c4438 Fix for #797 2014-08-05 22:19:46 +02:00
tcitworld
b83690ebd8 removing examples for mpdf 2014-08-04 21:34:44 +02:00
tcit
a34d920847 Improved instructions 2014-08-03 18:17:43 +02:00
tcit
358c689cec little fix in locale files 2014-08-03 18:06:37 +02:00
tcit
2e8625c25f little fix 2014-07-29 22:18:15 +02:00
tcit
ab86a5124a more translations 2014-07-26 13:04:12 +02:00
tcit
280972a66c changes in all themes 2014-07-26 12:44:55 +02:00
tcit
200c758ff4 Translations 2014-07-26 12:42:48 +02:00
tcit
8492f37323 translation stuff (en & fr done) 2014-07-26 12:22:33 +02:00
tcit
f8c3798522 little better 2014-07-26 11:52:43 +02:00
tcit
9f3477a279 precision 2014-07-25 08:42:30 +02:00
tcit
046b931624 added email field 2014-07-25 08:42:03 +02:00
Nicolas Lœuillet
70549136ba link to guidelines in contributing file 2014-07-25 07:52:00 +02:00
Nicolas Lœuillet
6c0c750000 thank you @mariroz & @tcitworld :) 2014-07-25 07:50:56 +02:00
Nicolas Lœuillet
2f3c05651e guidelines for wallabag 2014-07-25 07:50:15 +02:00
Nicolas Lœuillet
fa9a7bbb3c Merge branch 'fix/securityAllowedActions' into dev 2014-07-25 07:27:21 +02:00
Nicolas Lœuillet
830612f555 typo 2014-07-25 07:26:56 +02:00
tcit
d49446ff98 bug with extension in the filename 2014-07-25 01:38:28 +02:00
tcit
dc59f164a9 send2kindle 2014-07-25 01:33:31 +02:00
tcit
deab6280d3 mobi (not tested on actual device) and pdf working 2014-07-25 00:33:19 +02:00
tcit
d07abb5c42 updated mpdf to 5.7.2 2014-07-24 22:01:35 +02:00
tcit
fb9df0c269 use directly MOBIClass 2014-07-24 21:56:04 +02:00
Nicolas Lœuillet
af8292c1de Merge branch 'fix/securityMaster' 2014-07-24 21:41:16 +02:00
Nicolas Lœuillet
38cf3413df 1.7.2 2014-07-24 21:41:01 +02:00
Maryana Rozhankivska
800868e27e security fix 2014-07-24 17:47:23 +03:00
tcit
c70bfefc68 add mobi and pdf to routing 2014-07-24 15:59:08 +02:00
tcit
15317991f3 from epub to all kind of ebooks 2014-07-24 15:53:23 +02:00
tcit
4188f38ad5 add pdf and mobi libraries 2014-07-24 15:49:36 +02:00
Maryana Rozhankivska
7dd8b5026d security issue 2014-07-24 16:48:41 +03:00
Nicolas Lœuillet
6da20812ce Merge branch 'dev' of github.com:wallabag/wallabag into dev 2014-07-23 13:45:07 +02:00
Nicolas Lœuillet
887b015def Merge branch 'refactor' into dev 2014-07-23 13:44:48 +02:00
Nicolas Lœuillet
505a74ad1d Merge branch 'dev' into refactor
Conflicts:
	check_setup.php
	index.php
2014-07-23 13:42:30 +02:00
Nicolas Lœuillet
83cac9ac05 Merge pull request #789 from wallabag/feature/someMoreSitesConfig
config for habrahabr.ru to grab articles with comments
2014-07-23 13:38:21 +02:00
Nicolas Lœuillet
a818ff2000 removed permissions test on htmlpurifier 2014-07-23 13:35:19 +02:00
Maryana Rozhankivska
0ce85e0a7f config for habrahabr.ru to grep articles with comments 2014-07-23 14:27:57 +03:00
Nicolas Lœuillet
86edff4447 Add data for mysql installation, see #624 2014-07-22 21:48:21 +02:00
Nicolas Lœuillet
ebd6bf6007 Merge branch 'anno1337-dev' into dev 2014-07-22 21:45:21 +02:00
Nicolas Lœuillet
1f78bd8471 Merge branch 'dev' of github.com:anno1337/wallabag into anno1337-dev 2014-07-22 21:26:02 +02:00
Nicolas Lœuillet
f83ffc3ac3 Merge branch 'feature/programmingCodeSyntaxHighlighting' into dev 2014-07-22 19:33:34 +02:00
Nicolas Lœuillet
392f9a1b9c Merge branch 'dev' into feature/programmingCodeSyntaxHighlighting 2014-07-22 19:32:24 +02:00
Maryana Rozhankivska
9f8541ef2a highlight.js library added to highlight programming code examples in article view 2014-07-22 20:17:15 +03:00