1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-09-15 18:57:05 +00:00

Merge branch 'dev' into register

This commit is contained in:
Thomas Citharel 2015-02-13 19:15:31 +01:00
commit 0eae6d14b8
41 changed files with 2062 additions and 1076 deletions

View file

@ -46,6 +46,7 @@
@define ('SHARE_MAIL', TRUE);
@define ('SHARE_SHAARLI', FALSE);
@define ('SHAARLI_URL', 'http://myshaarliurl.com');
@define ('SHARE_EVERNOTE', FALSE);
@define ('SHARE_DIASPORA', FALSE);
@define ('DIASPORA_URL', 'http://diasporapod.com'); # Don't add a / at the end
@define ('FLATTR', TRUE);
@ -60,10 +61,14 @@
@define ('MOBI', FALSE);
@define ('PDF', FALSE);
// registration
@define ('SEND_CONFIRMATION_EMAIL', TRUE); // TO BE CHANGED DEPENDING ON POLL
// display or not print link in article view
@define ('SHOW_PRINTLINK', '1');
// display or not percent of read in article view. Affects only default theme.
@define ('SHOW_READPERCENT', '1');
@define ('RELOAD_ARTICLE', TRUE);
@define ('ABS_PATH', 'assets/');
@define ('DEFAULT_THEME', 'baggy');