803f79e091
* 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: |
||
|---|---|---|
| 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.