Mirror of the github repository of Friendica
Find a file
Simon L'nu 83f0807e59 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  apply max-width to images in posts, duepuntozero
  theming for default group selector
  catch more places to apply default group
  make it difficult to setup a private forum with no privacy
  more private forums, default privacy group for new contacts
  tell browser not to cache permission denied (private) photos so that after authenticating we don't have to fight the browser - plus more prvgroup work

* master:
2012-05-18 12:12:40 -04:00
doc more ' = ' spacing fixes 2012-04-10 23:45:47 -04:00
images modified: images/smiley-thumbsup.gif 2012-05-01 21:05:55 +01:00
include theming for default group selector 2012-05-18 01:38:11 -07:00
js close one menu (like the notifications menu) when another one is opened (like it is done when clicking somewhere else) (thx to ^mw) 2012-04-30 02:00:41 +02:00
library update tinymce to 3.5.0.1 2012-05-15 17:18:46 -07:00
mod theming for default group selector 2012-05-18 01:38:11 -07:00
spec Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
tests rev update, fix autoname test "random" failure 2012-04-26 01:33:41 -07:00
util setup delivery chain for private groups (work in progress) 2012-05-17 19:35:24 -07:00
view apply max-width to images in posts, duepuntozero 2012-05-18 01:46:02 -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
boot.php more private forums, default privacy group for new contacts 2012-05-17 22:44:52 -07:00
build.xml added some tests 2012-03-09 12:16:58 +01:00
database.sql more private forums, default privacy group for new contacts 2012-05-17 22:44:52 -07:00
docblox.dist.xml Added docblox default configuration file. 2012-03-03 16:53:10 -04:00
htconfig.php make comment edit icons look more like base theme 2012-04-26 19:55:20 -07:00
index.php rename get_language() to get_browser_language() 2012-05-13 04:52:29 -07: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
testargs.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
update.php more private forums, default privacy group for new contacts 2012-05-17 22:44:52 -07:00

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.