justauser 3b96b0ed7c Merge branch 'master' into hookhead ...

Conflicts:
	include/functions.php

changes for conflicts with master

2013-07-07 13:57:06 -04:00

..

autoload.php

autoload: include functions.php

2013-04-24 09:05:58 +04:00

ccache.php

Revert "ccache: do not force recalculate child counters on category upgrade because this is handled elsewhere"

2013-05-02 02:12:07 +04:00

colors.php

do no try to pass MS icon files to GD

2013-06-15 13:15:20 +04:00

crypt.php

implement basic feed authentication parameter encryption in the database (FEED_CRYPT_KEY)

2013-04-13 18:24:41 +04:00

db-prefs.php

move db-prefs to OO

2013-04-18 12:00:01 +04:00

db.php

fix blank character after opening bracket in function calls

2013-04-17 18:34:18 +04:00

digest.php

db-prefs: better error output for missing prefs, digest: hide DIGEST_ENABLE pref missing for unitialized users

2013-05-16 21:57:39 +04:00

errorhandler.php

errorhandler: check for Logger class existing

2013-05-13 13:32:51 +04:00

feedbrowser.php

fix blank character after opening bracket in function calls

2013-04-17 18:34:18 +04:00

functions.php

Merge branch 'master' into hookhead

2013-07-07 13:57:06 -04:00

labels.php

fix blank character after opening bracket in function calls

2013-04-17 18:34:18 +04:00

login_form.php

login page: remove version

2013-06-25 22:14:50 +04:00

rssfuncs.php

do not catchup newly subscribed feeds

2013-06-25 10:01:41 +04:00

sanity_check.php

move stylesheets to css/, reference default tt-rss stylesheets from

2013-05-19 21:22:01 +04:00

sanity_config.php

update config checks for SMTP_SECURE

2013-05-30 08:39:53 +04:00

sessions.php

better error reporting in session validation

2013-07-06 12:05:52 +04:00

version.php

Fix version in preferences footer

2013-06-26 09:20:03 -04:00