friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
Mirror of the github repository
14,091 Commits 2 Branches 63 Tags 237 MiB
PHP 85.4%
Smarty 5.4%
JavaScript 4.3%
CSS 4.2%
Less 0.4%
Other 0.2%
Go to file
Hypolite Petovan c38a5e443d Merge branch 'develop' into issue/#3062 
* develop: (68 commits)
  Added documentation
  update to the translation
  update to the translations
  translation docs now contain basic usage of the Transifex client
  - Replace TinyMCE-enabled filebrowser.tpl by filebrowser_plain.tpl content
  - Remove misc TinyMCE mentions in docs and minifyjs
  - Remove $theme_richtext_editor boot var - Remove "richtext" feature - Remove fix_mce_lf() function - Remove nomce parameter
  - Remove TinyMCE mentions in themes
  - Remove tinyMCE mentions or convert to addeditortext() - Remove $editselect template value
  Remove tinyMCE libraries
  limit the description of the meta tag to 160 characters in /mod/display
  Improved handling of non string values in the config
  Bugfix: Caching of non string cache values now works.
  Reformatted stuff, improved query
  Auto-focus first input field of modal when shown
  Use cache instead of config for storing last proc_run time
  Some added logging
  Bugfix for masses of php warnings
  Rearranged the logging
  Some changed logging
  ...

# Conflicts:
#	view/theme/frost-mobile/js/theme.js
#	view/theme/frost/js/theme.js
 		2017-01-27 15:30:21 -05:00
.tx transifex-client config 2017-01-18 14:05:57 +01:00
doc Merge pull request #3109 from Hypolite/issue/scrap-tinymce 2017-01-27 21:08:33 +01:00
images attend functionality for duepuntozero 2015-10-12 20:09:33 +02:00
include Merge pull request #3109 from Hypolite/issue/scrap-tinymce 2017-01-27 21:08:33 +01:00
js Merge branch 'develop' into issue/#3062 2017-01-27 15:30:21 -05:00
library Remove tinyMCE libraries 2017-01-25 16:04:42 -05:00
mod Merge branch 'develop' into issue/#3062 2017-01-27 15:30:21 -05:00
mods added configuration reg. curl and lighttpd with error code 417 2016-07-13 09:33:28 +02:00
object Merge remote-tracking branch 'upstream/develop' into develop 2016-12-31 17:59:14 +01:00
spec update contact request $ confirmation graphics 2016-11-29 16:00:07 +01:00
tests Continued rewriting: 2016-05-01 14:24:44 +02:00
util Merge pull request #3109 from Hypolite/issue/scrap-tinymce 2017-01-27 21:08:33 +01:00
view Merge branch 'develop' into issue/#3062 2017-01-27 15:30:21 -05:00
.gitattributes Required for github/Windows 2012-06-14 18:39:48 +10:00
.gitignore transifex-client config 2017-01-18 14:05:57 +01:00
.gitmodules adjust2 2012-03-02 17:18:11 +01:00
.htaccess recreate fix for #2617 on correct branch 2016-06-18 08:16:09 -04:00
CHANGELOG missing bracket 2016-09-11 08:03:12 +02:00
INSTALL.txt reflect requirements from install.md also in install.txt 2016-09-13 14:49:21 +02:00
LICENSE happy 2017 2017-01-11 08:09:13 +01:00
README.md move READMEs to .md, added some notes about addon translations 2014-07-07 13:03:05 +02:00
README.translate.md translation docs now contain basic usage of the Transifex client 2017-01-27 12:39:21 +01:00
Vagrantfile Switched to a vagrant box that works for Ubuntu Xenial 2016-11-20 15:32:57 +01:00
boot.php Merge branch 'develop' into issue/#3062 2017-01-27 15:30:21 -05:00
build.xml added some tests 2012-03-09 12:16:58 +01:00
database.sql Changed database.sql 2017-01-20 15:00:14 +00:00
docblox.dist.xml Added docblox default configuration file. 2012-03-03 16:53:10 -04:00
friendica_test_data.sql Get rid of the table "unique_contacts" 2016-01-06 22:23:12 +01:00
htconfig.php make vier also the default from the emergency htconfig file 2016-12-10 07:04:39 +01:00
index.php The config class now makes less database reads. 2017-01-18 21:45:32 +00:00
testargs.php Replaced $argv and $argc with the $_SERVER array 2015-01-04 13:24:16 +01:00
update.php Deactivated the alternative update script by now 2017-01-16 21:35:35 +00:00

README.md

Friendica Social Communications Server

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.