clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This is a clone of the Friendica repository. https://github.com/friendica/friendica
4,506 Commits 3 Branches 0 Tags 183 MiB
PHP 85.4%
Smarty 6.4%
CSS 4.8%
JavaScript 2.7%
Less 0.4%
Other 0.2%
Go to file
Simon L'nu 803f79e091 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master: (25 commits)
  diabook: theme.php remove code duplication last photos check for user "hidewall" remove unneeded regex move js code to close popup in main.js (missing stop event propagation in popup links)
  user settings: don't show emoticons
  fix in css right_aside
  small fix
  fix 1024resolution
  add right_aside to theme diabook
  ability to change tags in edited posts
  normalise comparison link on delegation page
  quattro(-green) styling the 'filed under: remove' text
  it's only item.filer ;-)
  non static filer text
  new lines removed
  removed some new lines to cut down number of changed files
  removed unneccessary stuff
  removed problem from previous commit
  tests for the template engine
  adding filer functionality to quattro(-green)
  missing tooltip for "file as"
  prevent re-registrations using a deleted username - not an issue with Friendica but could create a serious privacy issue with federated platforms
  add file_as-option to diabook-derivates
  ...

* master:
 		2012-03-23 10:41:55 -04:00
doc doc/Account-Basics.md 2012-03-06 19:15:40 +00:00
images change default profile photo to something more interesting than a reddish brown square 2012-03-20 15:41:06 -07:00
include ability to change tags in edited posts 2012-03-22 16:17:10 -07:00
js diabook: theme.php 2012-03-23 14:09:06 +01:00
library private file in repository 2012-03-21 00:34:12 -07:00
mod user settings: don't show emoticons 2012-03-23 12:07:22 +01:00
spec spec directory 2012-03-09 19:50:31 -08:00
tests tests for the template engine 2012-03-22 12:43:03 +01:00
util removed unneccessary stuff 2012-03-22 12:52:24 +01:00
view diabook: theme.php 2012-03-23 14:09:06 +01:00
.gitignore excludes reports from git 2012-03-08 17:44:57 +01:00
.gitmodules adjust2 2012-03-02 17:18:11 +01:00
.htaccess Merge branch 'master' of git://github.com/friendica/friendica 2012-03-22 12:50:02 +01:00
boot.php ability to change tags in edited posts 2012-03-22 16:17:10 -07:00
build.xml added some tests 2012-03-09 12:16:58 +01:00
database.sql new lines removed 2012-03-22 13:05:34 +01:00
docblox.dist.xml Added docblox default configuration file. 2012-03-03 16:53:10 -04:00
htconfig.php Added config options for the item cache and the ostatus priority 2012-03-11 19:50:51 +01:00
index.php new lines removed 2012-03-22 13:05:34 +01:00
INSTALL.txt INSTALL.txt - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
LICENSE Update LICENSE 2012-02-29 21:09:20 +11:00
README Update README 2012-03-08 16:25:14 +11:00
testargs.php add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
update.php removed some new lines to cut down number of changed files 2012-03-22 13:03:28 +01: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.