Thomas Citharel e9d4d17693 fix merge confict

2014-11-19 16:54:28 +01:00

..

config.inc.default.php

fix merge confict

2014-11-19 16:54:28 +01:00

Database.class.php

Merge pull request #843 from rros/mysql-utf8mb4

2014-10-14 19:56:50 +02:00

global.inc.php

Refactor

2014-07-12 19:01:11 +02:00

Language.class.php

Adding 'en_US' locale (issue #901)

2014-10-30 15:32:00 -04:00

Poche.class.php

implementing carrot into wallabag

2014-11-19 16:27:56 +01:00

pochePictures.php

fix pictures display when DOWNLOAD_PICTURES is enabled

2014-09-16 20:27:03 +02:00

Routing.class.php

fix #882

2014-10-22 15:10:38 +02:00

Template.class.php

Adjusting Template class so that _global is ignored as a theme

2014-11-17 17:11:33 -05:00

Tools.class.php

add about page

2014-11-03 07:44:56 +01:00

Url.class.php

WHAT. A. BIG. REFACTOR. + new license (we moved to MIT one)

2014-07-11 16:03:59 +02:00

User.class.php

WHAT. A. BIG. REFACTOR. + new license (we moved to MIT one)

2014-07-11 16:03:59 +02:00

WallabagEpub.class.php

fixed bug for epub export #755 ; also better metadata title

2014-07-20 00:45:45 +02:00