Commit graph

1235 commits

Author SHA1 Message Date
tcit
404adf970d Merge branch 'epub' into dev
Conflicts:
	themes/baggy/home.twig
2014-05-16 16:31:18 +02:00
tcitworld
7d5d9ea449 Merge pull request #693 from tcitworld/dev
better wallabag in wallabag button (see #685)
2014-05-16 15:54:54 +02:00
tcit
74e09e562b better wallabag in wallabag button (see #685) 2014-05-16 15:34:13 +02:00
Nicolas Lœuillet
60c3a4d3e1 Merge pull request #689 from tcitworld/dev
Tag-related features
2014-05-16 13:31:53 +02:00
tcit
f3f0b11393 Better names for epub files and epub in all themes now 2014-05-15 15:42:36 +02:00
tcit
f2b6b4e230 Fix bugs and improved epub rendering 2014-05-14 22:03:16 +02:00
tcit
6a3c510157 Merge branch 'dev' of https://github.com/wallabag/wallabag into epub 2014-05-14 19:17:51 +02:00
tcit
4555c38d3b Changed theme for better translation method 2014-05-14 19:08:33 +02:00
tcit
24696800e5 Simplifed function which does tag cleanup 2014-05-14 18:51:02 +02:00
Nicolas Lœuillet
818b186f8a Merge pull request #680 from m-r-r/fr-1.6.1
French translation update
2014-05-13 16:44:16 +02:00
tcit
4910af33ff Removed unnecessary function for cleaning tags 2014-05-11 16:14:47 +02:00
tcit
0626e52f3c Merge branch 'dev' of https://github.com/wallabag/wallabag into dev 2014-05-11 15:44:43 +02:00
tcitworld
f034640ca3 Added advices to submit a bug
Discussion at #662.
2014-05-11 15:33:44 +02:00
m-r-r
1829b362fc Updated the french translation 2014-05-10 20:11:00 +02:00
tcit
34acb02cbb Added translation capabilities for epub system 2014-05-07 12:48:46 +02:00
tcit
4877836b12 Many improvements to epub produced : better cover, better tags 2014-05-07 12:40:09 +02:00
Nicolas LOEUILLET
07ed2b0231 #568 missing rss.png files 2014-05-02 17:04:08 +02:00
tcit
9c743ab965 Clean old unused tags when deleting a tag 2014-04-30 12:14:20 +02:00
tcit
78bddb22be Remove unnecessary line 2014-04-30 11:31:21 +02:00
tcit
decc23aaf2 Added save search as tag functionality 2014-04-30 11:25:03 +02:00
tcit
2395a3802a Changed template organisation 2014-04-29 19:57:59 +02:00
tcit
7ec445b06e Big changes for epub export. Now possible to do it from a tag, a category and a search. Also, improved ebook rendering. 2014-04-25 16:20:25 +02:00
Nicolas Lœuillet
21f29fe492 Merge pull request #667 from mariroz/dev
fix of putenv warning under safe mode, issue #646
2014-04-25 13:03:09 +02:00
Maryana Rozhankivska
5b5e47c3ae fix of already defined constant notice, issue #653 2014-04-25 13:41:42 +03:00
Maryana Rozhankivska
b6413975c3 fix of putenv warning under safe mode, issue #646 2014-04-25 13:25:03 +03:00
Nicolas Lœuillet
d151b51c67 Merge pull request #665 from mariroz/dev
fix of rss headers problem
2014-04-24 18:05:16 +02:00
Maryana Rozhankivska
827f5b42a6 fix of rss headers problem 2014-04-24 11:48:00 +03:00
tcit
ef17914960 Fix for #664 - Missing source url attribute in RSS feeds 2014-04-24 09:39:50 +02:00
tcit
72a857158c Fixed a bug into PHPePub with special caracters 2014-04-24 03:08:31 +02:00
tcit
87090d8ae7 Added epub export function 2014-04-24 03:04:02 +02:00
tcit
8af31ae0f7 Added default statement for db system 2014-04-23 22:48:33 +02:00
tcit
feecea2806 Fix #657 and postgresql problems 2014-04-23 22:39:43 +02:00
tcit
07da861126 Added multi-user functionnality in all themes 2014-04-23 10:53:57 +02:00
tcit
c97d23c533 Merge branch 'dev' of https://github.com/wallabag/wallabag into dev 2014-04-23 10:34:22 +02:00
tcit
4d99bae893 Fixed Multi-user system 2014-04-23 10:29:53 +02:00
Nicolas Lœuillet
2a6440c134 Merge pull request #659 from mariroz/dev
last error: config.inc.default.php missed
2014-04-22 21:44:12 +02:00
Maryana Rozhankivska
4dbba60439 last error: config.inc.default.php missed 2014-04-22 22:38:10 +03:00
Nicolas Lœuillet
29cf52b677 Merge pull request #658 from mariroz/dev
inc/poche/config.inc.php.new removed
2014-04-22 20:48:42 +02:00
Maryana Rozhankivska
fd86559a5b inc/poche/config.inc.php.new removed 2014-04-22 21:39:03 +03:00
Nicolas Lœuillet
d70dd7ac69 Merge pull request #653 from mariroz/dev
print view fixed in baggy; print link added; read percent added in default theme; archive and favorite re-factored to be ajax action in article view
2014-04-22 20:18:46 +02:00
Maryana Rozhankivska
43c7b978c3 config.inc.php.new renamed in config.inc.default.php 2014-04-22 20:58:40 +03:00
Nicolas Lœuillet
dfff18f81b Merge pull request #655 from julien-m/patch-2
parse mobile.lemondeinformatique.fr
2014-04-22 18:24:17 +02:00
Maryana Rozhankivska
a4a870e1ec default config is included after user config to prevent undefined constant warning 2014-04-22 19:11:26 +03:00
jmlrt
03303cd71b parse mobile.lemondeinformatique.fr
site_config file created because the title isn't parsed by default for mobile version of lemondeinformatique.fr
2014-04-22 14:44:31 +02:00
Maryana Rozhankivska
c2cf7075c2 print view fixed in baggy; print link added; read percent added in default theme; archive and favorite re-factored to be ajax action in article view 2014-04-22 10:45:09 +03:00
Nicolas Lœuillet
bfe1ad6dbc Merge pull request #643 from wallabag/fix-636
[fix] rss feed content type set to text/xml #636
2014-04-15 21:49:37 +02:00
Nicolas Lœuillet
6212acfc81 [fix] rss feed content type set to text/xml #636 2014-04-15 21:49:00 +02:00
Nicolas Lœuillet
847f57686e Merge pull request #642 from jplock/patch-2
Added IF NOT EXISTS
2014-04-14 15:42:09 +02:00
Justin Plock
44fd0faa23 Added IF NOT EXISTS 2014-04-14 09:40:35 -04:00
Nicolas Lœuillet
df6c8b3be9 Merge pull request #637 from Bubbendorf/dev
Improvements on french translation
2014-04-13 12:50:48 +02:00