Commit graph

1643 commits

Author SHA1 Message Date
Marmo
76b1e0babe update zeit.de.txt for removal of inline ads 2014-10-21 19:33:40 +02:00
Nicolas Lœuillet
f2248e604d Merge pull request #878 from wallabag/greybuttonread
fix #873
2014-10-20 15:07:24 +02:00
tcit
f56791e6c4 fix #873 2014-10-19 11:12:25 +02:00
tcit
750d904a16 fix translation issues 2014-10-17 21:08:08 +02:00
Nicolas Lœuillet
691a03f176 Merge pull request #868 from wallabag/popupoverlap
fix for #830
2014-10-15 16:53:06 +02:00
tcit
48fb171d7a fix for #830 2014-10-15 16:47: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
Nicolas Lœuillet
05e313ad28 Merge pull request #867 from wallabag/zindex-menu-bug
fix z-index-menu mobile view bug #834
2014-10-14 19:50:28 +02:00
tcit
b9fa7d2c9c fix z-index-menu mobile view bug #834 2014-10-12 10:24:07 +02:00
Thomas Citharel
8ce508cab0 Create adme.ru.txt
Siteconfig
2014-10-12 10:00:35 +02:00
Thomas Citharel
dffbec1c44 Merge pull request #865 from Marmo/patch-1
update heise.de.txt
2014-10-11 15:30:51 +02:00
Marmo
ad0eccb4cd update heise.de.txt
Multi-page Telepolis-articles (www.heise.de/tp/...) are not fetched correctly atm. My addition to the single_page_link makes it work (tested with http://www.heise.de/tp/artikel/42/42579/1.html).
2014-10-11 15:22:53 +02:00
Nicolas Lœuillet
44d35257e8 Merge branch 'dev' 2014-10-10 13:33:54 +02:00
Nicolas Lœuillet
cf8a5e1eed Merge branch 'master' into dev
Conflicts:
	index.php
2014-10-10 13:33:36 +02:00
Thomas Citharel
6b0894c66a Merge pull request #860 from wallabag/compatibility_file
Move compatibility file (fixes #858)
2014-10-08 21:36:51 +02:00
tcit
a7058a5a13 Right redirect from the new path 2014-10-08 21:35:21 +02:00
Thomas Citharel
1403af5be3 Merge pull request #861 from wallabag/fix-query-sqlite-install
query for populate mysql/postgres was called when we choosed sqlite
2014-10-08 21:32:03 +02:00
Nicolas Lœuillet
20b4d7d621 query for populate mysql/postgres was called when we choosed sqlite 2014-10-08 21:23:34 +02:00
Nicolas Lœuillet
7331ed3e80 change href in install/index.php 2014-10-08 21:11:56 +02:00
Nicolas Lœuillet
79dd109e37 Fixes #858: move compatibility file into install folder 2014-10-08 21:08:21 +02:00
Thomas Citharel
a305326973 Merge pull request #787 from wallabag/data-for-mysql
Add data for mysql installation, see #624
2014-10-08 19:32:39 +02:00
tcit
3dca040a0b Fix bug for #787 2014-10-08 19:31:15 +02:00
tcit
8327f1c371 Merge branch 'dev' into data-for-mysql 2014-10-08 19:26:26 +02:00
Nicolas Lœuillet
73c833780c Merge pull request #855 from wallabag/fix-828
Fix #828
2014-10-04 21:27:05 +02:00
Nicolas Lœuillet
f2cc1db1a8 Merge pull request #856 from wallabag/fix-826
Fix #826
2014-10-04 20:34:40 +02:00
tcit
34c2d1bdd1 get content 2014-10-04 20:17:00 +02:00
Nicolas Lœuillet
29e95769b5 Merge pull request #854 from wallabag/saveclick2search
Saveclick2search (fix for #831)
2014-10-04 20:13:10 +02:00
tcit
e3c44f9c0f get full content 2014-10-04 19:45:02 +02:00
tcit
40d2042228 small fix for better width for search translations full display 2014-10-04 19:08:56 +02:00
tcit
ab494e4ede translate search messages 2014-10-04 19:01:43 +02:00
tcit
1cd02d55fb autofocus on all themes 2014-10-04 18:51:43 +02:00
tcit
f183f72bf4 Merge branch 'dev' into saveclick2search 2014-10-04 18:47:56 +02:00
tcit
8b6c710b09 fixed bug in config screen for default theme 2014-10-04 18:45:43 +02:00
tcit
04b589420e search field selected 2014-10-04 18:44:18 +02:00
Thomas Citharel
e38e46ecdb Merge pull request #853 from wallabag/fix-for-#797
Fix for #797
2014-10-04 17:50:01 +02:00
tcit
ace428669b fix for #758 2014-09-28 19:12:28 +02:00
tcit
b37110cc82 Merge branch 'issue-844' of https://github.com/rros/wallabag into dev 2014-09-28 17:48:06 +02:00
tcit
cde2fc3842 Merge branch 'dev' of https://github.com/wallabag/wallabag into dev 2014-09-28 17:32:50 +02:00
tcit
ffcd442989 get up to date for merge 2014-09-28 17:31:02 +02:00
Thomas Citharel
76dd27e7f7 Merge pull request #802 from tcitworld/traductionfix
Traductionfix
2014-09-28 17:25:40 +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
tcitworld
a0822259e7 Merge pull request #841 from wallabag/fixGDdetection
Fix #766 - GD detection
2014-09-27 18:13:35 +02:00
tcit
9b8283d0fc Merge branch 'refactor' into dev 2014-09-27 17:54:24 +02:00
tcit
04a7674bdd merge refactor and dev 2014-09-27 17:54:13 +02:00