* remotes/upstream/master:
bogus empty list element in dfrn_request page when emailnet not enabled
zrl on random profile
zrl hook
bug #372 - category feeds
pass zrl's to/through global directory
* master:
* remotes/upstream/master:
well that was a silly mistake...
setting wasn't being applied
rev update
diabook-themes: theme-settings: users can set font-size and line-height for posts and comments
diabook: theme-settings: users can set font-size and line-height for posts and comments
diabook-themes: small fixes
quattro: language icon in navbar
move html out of lang_selector() and new template lang_selector.tpl
display settings: show theme screenshot on page load
quattro: add admin theme settigs. darker items background with a bottom border.
admin: change global theme settings
quattro: work on "like" activitiy items less visible fixes to widths popup notification out of navbar category input in jot
validate_url allow naked subdomain if is "localhost"
* 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:
