Commit Graph

315 Commits

Author SHA1 Message Date
Thomas Citharel 82978fbd57 Merge branch 'master' into dev
To get the errors
2015-01-03 11:38:32 +01:00
Thomas Citharel 37cad52229 don't call flattr if flattr is disabled 2014-12-22 16:26:23 +01:00
Jean Baptiste Favre 81315897f0 Make call to FTRSS silent to avoid warnings which can break import 2014-12-21 22:41:04 +01:00
Thomas Citharel 5ea5310ab4 enable showing or not for epub/mobi/pdf export buttons 2014-12-14 15:17:39 +01:00
Thomas Citharel dc69d3e8d8 merge epub with all the dev evolutions 2014-12-14 00:16:22 +01:00
Thomas Citharel 7c2c49d9b1 added diaspora sharing 2014-12-06 18:42:29 +01:00
Nicolas Lœuillet 85c5a1ff8d failover if theme folder doesn't exist 2014-11-24 13:11:57 +01:00
Thomas Citharel e9d4d17693 fix merge confict 2014-11-19 16:54:28 +01:00
Thomas Citharel d25a3f13c2 default deactivated 2014-11-19 16:40:02 +01:00
Thomas Citharel b13376e918 fix Flattrs 2014-11-19 16:35:44 +01:00
Thomas Citharel c8b4ef7fed implementing carrot into wallabag 2014-11-19 16:27:56 +01:00
Jay Sitter ca6c0de380 Adjusting Template class so that _global is ignored as a theme 2014-11-17 17:11:33 -05:00
Nicolas Lœuillet 3c133bff49 add about page 2014-11-03 07:44:56 +01:00
Jay Sitter bbbda080bf Adding 'en_US' locale (issue #901) 2014-10-30 15:32:00 -04:00
Nicolas Lœuillet b40cd4e73f Merge pull request #889 from wallabag/fix#871
Fix#871
2014-10-27 20:58:13 +01:00
tcit 1b6e21d7a6 translation fix finished for #871 and bring add tag from search feature to all themes 2014-10-27 15:12:46 +01:00
tcit 606bea72e1 fix #882 2014-10-22 15:10:38 +02:00
Nicolas Lœuillet 8fd0512a3c Merge pull request #848 from 11mariom/dev
Add support for custom http port
2014-10-14 19:57:16 +02:00
Nicolas Lœuillet 5b16d508b5 Merge pull request #843 from rros/mysql-utf8mb4
Convert the MySQL charset to utf8mb4 to support the full range of unicode
2014-10-14 19:56:50 +02:00
tcit ffcd442989 get up to date for merge 2014-09-28 17:31:02 +02:00
tcit 9f86454b48 deleting send to kindle function 2014-09-28 17:20:35 +02:00
tcit b852df020c add extension for pdf file 2014-09-28 12:18:47 +02:00
tcit fa926fb47c offering download for pdf file and comment in code 2014-09-27 19:59:43 +02:00
tcit 6fc2c29daa revert routing bad deleting 2014-09-27 19:47:50 +02:00
tcit a1b31d93b6 get up to date 2014-09-27 19:42:37 +02:00
tcit 824f8c45ed changed mpdf with tcpdf 2014-09-27 19:34:17 +02:00
tcit 04a7674bdd merge refactor and dev 2014-09-27 17:54:13 +02:00
Mariusz Kozakowski 2d4cfc58ec Add support for custom http port
Now you can use wallabag behind reverse proxy (i.e Squid or Varnish)
without problem with urls like wallabag.example.com:8080.
2014-09-23 18:44:14 +02:00
Robert Ros b668db242d Convert the MySQL charset to utf8mb4 to support the full range of unicode characters 2014-09-18 22:29:22 +02:00
Thomas Citharel aa1083bdac fix pictures display when DOWNLOAD_PICTURES is enabled 2014-09-16 20:27:03 +02:00
André König 5af2555f59 Implemented additional check for using the 'X-Forwarded-Port' header. 2014-09-11 13:17:19 +02:00
Thomas Citharel d5c481c2f4 remove old function 2014-08-28 21:01:43 +02:00
Thomas Citharel 8763e4efde Fix downloading SQLite database from all users 2014-08-26 12:43:56 +02:00
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 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
tcit ab86a5124a more translations 2014-07-26 13:04:12 +02:00
tcit f8c3798522 little better 2014-07-26 11:52:43 +02:00
tcit 046b931624 added email field 2014-07-25 08:42:03 +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 fb9df0c269 use directly MOBIClass 2014-07-24 21:56:04 +02:00
tcit c70bfefc68 add mobi and pdf to routing 2014-07-24 15:59:08 +02:00