aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/quattro/config.php
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-04-13 04:11:17 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-04-13 04:11:17 -0400
commit093c3a936fc40e4d66f5bc5dffd1fce4ddbedcdc (patch)
tree13c8bfee5f3df28e4e4cc0a46d5ac048eeb1c858 /view/theme/quattro/config.php
parentdf1904b204a969780609cac64bbb1a03a8dd3fcb (diff)
downloadvolse-hubzilla-093c3a936fc40e4d66f5bc5dffd1fce4ddbedcdc.tar.gz
volse-hubzilla-093c3a936fc40e4d66f5bc5dffd1fce4ddbedcdc.tar.bz2
volse-hubzilla-093c3a936fc40e4d66f5bc5dffd1fce4ddbedcdc.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: (22 commits) stray debug statements, forgot to filter pending contacts bug #369 - show contacts who are not in any groups extended the "interesting" profile attributes send link directly to profile tab stray log statements profile change activities allow setting default new friend notify turn off new friend activity by default rev update diabook-themes: fixed css for settings aside-links diabook-themes: css-fixes in aside fix css in aside query to find un-grouped contacts reverting recent db driver changes - won't install cleanly, won't update cleanly, and leaks DB credentials over the web if there's a connection problem turn off update transactions until we figure out how to do them safely. table cleanup quattro: icons for "Mark all sys notifs read" and "See all notifs" as icons in a toolbar in notifications menu main.js: set notifications icon "on" with new unread notifcations. Show "Nothing new here" with no notifications at all settings: remove call to profile_load() quattro: move center css to style.php. add tpl for generic_links_widget ... * master:
Diffstat (limited to 'view/theme/quattro/config.php')
0 files changed, 0 insertions, 0 deletions