diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-30 19:48:15 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-30 19:48:15 -0400 |
| commit | 301527e5a269d652059bd73172a3a3598287ff9d (patch) | |
| tree | ec1318b325ec3dc5ab2bc4ded5dae1c657b8fc7b /view/diaspora_comment.tpl | |
| parent | c5cb208cb8ac0968bebb416bad5b37b029ccd239 (diff) | |
| parent | aace55df0ad279d74c5e612078c3f29d114389dc (diff) | |
| download | volse-hubzilla-301527e5a269d652059bd73172a3a3598287ff9d.tar.gz volse-hubzilla-301527e5a269d652059bd73172a3a3598287ff9d.tar.bz2 volse-hubzilla-301527e5a269d652059bd73172a3a3598287ff9d.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
don't delete contact from a friend request if friendship was already established
quattro: move quattro-green inside quattro folder. Add config option to select quattro color scheme.
allow themes to use "style.php" instead of "style.css". Load style.php trhu mod/view.php to pass it friendica framework.
css-fixes in diabook-derivates
css-fixes in diabook-derivates
quattro-green: remove settings code Use config.php from quattro
quattro: add config.php
settings: add "display settings" tab, with UI-related settings. Load optional "config.php" from theme folder and show in page. Loading of "config.php" follow theme_info['extends'] property.
catch OpenID login errors in cases when the OpenID server does not answers
css-fixes in diabook-derivates
quattro-green: added Description to the theme.php
* master:
Diffstat (limited to 'view/diaspora_comment.tpl')
0 files changed, 0 insertions, 0 deletions