moparisthebest/wallabag
1
0
Fork 0
mirror of https://github.com/moparisthebest/wallabag synced 2024-11-23 17:42:15 -05:00
Code Issues Releases Wiki Activity
954 Commits 13 Branches 34 Tags 42 MiB
b3c720b1c3
Commit Graph

954 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Nicolas Lœuillet
cca9284b6a change default pagination, set it to 12, to have a nice baggy display 2014-07-22 18:14:41 +02:00
Nicolas Lœuillet
3e87066506 fix display of 'Done' message when we add a link from 'save a link' item 2014-07-22 18:12:03 +02:00
Nicolas Lœuillet
9cf6bac1a5 fix to display the login successful message with the translation 2014-07-22 18:01:27 +02:00
Nicolas Lœuillet
b738bea9ca Fix #776 2014-07-22 16:37:13 +02:00
Marc Wilhelm
9c67b1b829 Split up check_setup.php into two files. The new file check_essentials.php takes care of stuff like the PHP version and is executed before the config files are included which are needed by check_setup. This patch addresses issue #773 2014-07-22 11:52:18 +02:00
Nicolas Lœuillet
955fc67438 Merge pull request #775 from wallabag/feature/someMoreSitesConfig 
issue #750 - config for dn.pt site added
 2014-07-21 21:31:45 +02:00
Nicolas Lœuillet
91b6be3186 Merge branch 'skibbipl-dev' into dev 2014-07-21 21:22:34 +02:00
Nicolas Lœuillet
17065e613f Merge branch 'dev' of github.com:skibbipl/wallabag into skibbipl-dev 
Conflicts:
	locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo
	locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po
 2014-07-21 21:21:55 +02:00
skibbipl
cec19bd866 Updated polish translation 2014-07-21 20:58:58 +02:00
Maryana Rozhankivska
5594d7d054 issue #750 - config for dn.pt site added 2014-07-21 19:34:59 +03:00
Nicolas Lœuillet
6a4bbf0fe5 Merge branch 'refactor' of github.com:wallabag/wallabag into refactor 2014-07-18 11:29:05 +02:00
Nicolas Lœuillet
8e68391a57 remove .idea in gitignore 2014-07-18 11:28:49 +02:00
Nicolas Lœuillet
93edcab52e Merge pull request #764 from tcitworld/refactor 
Refactor Flattr class.
 2014-07-17 16:06:53 +02:00
tcitworld
ccd0b381b6 camelCase for FlattrItem class (following) 2014-07-17 15:42:59 +02:00
tcitworld
d259f73665 camelCase for FlattrItem class 2014-07-17 15:34:55 +02:00
Nicolas Lœuillet
4e067ceabd updated specific configuration for parsing 2014-07-13 10:15:40 +02:00
Nicolas Lœuillet
58dbe10388 #584 check permissions for HTMLPurifier/DefinitionCache/Serializer folder 2014-07-12 22:08:48 +02:00