Mirror von https://github.com/friendica/friendica
093c3a936f
* 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: |
||
|---|---|---|
| doc | ||
| images | ||
| include | ||
| js | ||
| library | ||
| mod | ||
| spec | ||
| tests | ||
| util | ||
| view | ||
| .gitignore | ||
| .gitmodules | ||
| .htaccess | ||
| boot.php | ||
| build.xml | ||
| database.sql | ||
| docblox.dist.xml | ||
| htconfig.php | ||
| index.php | ||
| INSTALL.txt | ||
| LICENSE | ||
| README | ||
| testargs.php | ||
| update.php | ||
Friendica Social Communications Server ====================================== http://friendica.com Welcome to the free social web. Friendica is a communications platform for integrated social communications utilising decentralised communications and linkage to several indie social projects - as well as popular mainstream providers. Our mission is to free our friends and families from the clutches of data-harvesting corporations, and pave the way to a future where social communications are free and open and flow between alternate providers as easily as email does today.