moparisthebest
/
wallabag
mirror of https://github.com/moparisthebest/wallabag
1
0
Fork 0
Code Issues Releases Wiki Activity
1,008 Commits 13 Branches 34 Tags 42 MiB
Commit Graph

1008 Commits

Author SHA1 Message Date
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
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
Robert Ros 0dc4797a4c Fix the PostgreSQL install errors 2014-09-21 00:39:40 +02:00
Thomas Citharel bbfe6fa50b Fix #766 - GD detection 2014-09-17 16:36:10 +02:00
Nicolas Lœuillet a15108e65b Merge pull request #839 from wallabag/fixlocalpictures 
fix pictures display when DOWNLOAD_PICTURES is enabled
 2014-09-16 21:18:41 +02:00
Thomas Citharel aa1083bdac fix pictures display when DOWNLOAD_PICTURES is enabled 2014-09-16 20:27:03 +02:00
Nicolas Lœuillet b3c720b1c3 Merge pull request #836 from akoenig/x-forwarded-port 
Implemented additional check for using the 'X-Forwarded-Port' header.
 2014-09-16 20:09:58 +02:00
Nicolas Lœuillet 657245dcbd Merge pull request #771 from tcitworld/refactor 
fixed bug for epub export #755 ; also better metadata title
 2014-09-16 15:21:12 +02:00
André König 5af2555f59 Implemented additional check for using the 'X-Forwarded-Port' header. 2014-09-11 13:17:19 +02:00
tcitworld 49882dc151 Merge pull request #819 from wallabag/fixSQLiteDownloadDB 
Fix downloading SQLite database from all users
 2014-09-10 20:05:07 +02:00
Nicolas Lœuillet 19438d3021 Merge pull request #816 from zinnober/dev 
Complete rework of faz.net-template
 2014-09-03 13:14:29 +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
zinnober ecb8c1389c Complete rework of faz.net-template adding multipage support and major article cleanup 2014-08-23 16:47:29 +02:00
Maryana Rozhankivska d05f5eeb1d added moreQueries for postgressql 2014-08-21 19:07:19 +03: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 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