Mirror of the github repository
Go to file
Simon L'nu 093c3a936f 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:
2012-04-13 04:11:17 -04:00
doc more ' = ' spacing fixes 2012-04-10 23:45:47 -04:00
images Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
include stray debug statements, forgot to filter pending contacts 2012-04-12 23:14:41 -07:00
js main.js: set notifications icon "on" with new unread notifcations. Show "Nothing new here" with no notifications at all 2012-04-12 09:15:08 +02:00
library Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
mod bug #369 - show contacts who are not in any groups 2012-04-12 23:06:41 -07:00
spec Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
tests had arg order backwards 2012-04-07 02:23:11 -07:00
util rev update 2012-04-12 16:12:51 -07:00
view bug #369 - show contacts who are not in any groups 2012-04-12 23:06:41 -07:00
.gitignore Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
.gitmodules adjust2 2012-03-02 17:18:11 +01:00
.htaccess Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
INSTALL.txt Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
LICENSE Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
README Update README 2012-03-08 16:25:14 +11:00
boot.php profile change activities 2012-04-12 21:10:32 -07:00
build.xml added some tests 2012-03-09 12:16:58 +01:00
database.sql 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 2012-04-12 06:50:11 -07:00
docblox.dist.xml Added docblox default configuration file. 2012-03-03 16:53:10 -04:00
htconfig.php Merge commit 'upstream/master' 2012-04-07 18:35:29 +02:00
index.php Merge pull request #223 from campino/master 2012-04-10 15:21:37 -07:00
testargs.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
update.php extensible item_id table for managing all the different message-ids generated by multiple services 2012-04-11 16:13:57 -07:00

README

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.