aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* basic ssl_policy for important modulesfriendica2012-03-142-20/+28
|
* ssl_policy stufffriendica2012-03-141-0/+17
|
* more work on filer, comment level and file tag removalfriendica2012-03-133-20/+28
|
* file as widget and basic filing implementation for duepuntozero,slackrfriendica2012-03-133-1/+32
| | | | much more work needed - this is just for test/evaluation currently
* Merge pull request #129 from CatoTH/masterfriendica2012-03-136-9/+64
|\ | | | | CSRF-Protection and minor changes
| * Some security against XSRF-attacksTobias Hößl2012-03-121-0/+46
| |
| * Merge branch 'master' of git://github.com/friendica/friendicaTobias Hößl2012-03-121-0/+73
| |\
| * \ Merge branch 'master' of git://github.com/friendica/friendicaTobias Hößl2012-03-111-3/+3
| |\ \
| * \ \ Merge branch 'master' of git://github.com/friendica/friendicaTobias Hößl2012-03-0911-206/+405
| |\ \ \
| * | | | Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.phpTobias Hößl2012-02-283-5/+11
| | | | |
| * | | | Merge remote branch 'upstream/master'Tobias Hößl2012-02-2814-167/+719
| |\ \ \ \
| * | | | | wasn't actually changed beforeTobias Hößl2012-02-281-2/+2
| | | | | |
| * | | | | Avoid a noticeTobias Hößl2012-02-281-0/+1
| | | | | |
| * | | | | Avoid a NoticeTobias Hößl2012-02-271-1/+3
| | | | | |
| * | | | | Avoid a NoticeTobias Hößl2012-02-271-1/+1
| | | | | |
* | | | | | initial tag display for categories and save-to-file - suitable for testing ↵friendica2012-03-131-0/+27
| |_|_|_|/ |/| | | | | | | | | | | | | | but needs cleanup, links to delete term, and theming.
* | | | | more save to file backendfriendica2012-03-111-1/+55
| | | | |
* | | | | backend for "save to file" featurefriendica2012-03-111-0/+19
| |_|_|/ |/| | |
* | | | bug #328friendica2012-03-101-3/+3
| |_|/ |/| |
* | | bug in check for private email comment to public conversation prevents ↵friendica2012-03-092-23/+9
| | | | | | | | | | | | authenticated visitor from seeing comments that should be allowed
* | | keep tony from talking to himselffriendica2012-03-081-1/+1
| | |
* | | still getting parent relays on remote systemsfriendica2012-03-072-3/+3
| | |
* | | revupfriendica2012-03-071-1/+1
| | |
* | | fix photos after permissions_sql changefriendica2012-03-061-4/+76
| | |
* | | Merge branch 'pull'friendica2012-03-061-2/+2
|\ \ \
| * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: fix html reshares when editplain in use * master:
* | | | [privacy] rework latest fixfriendica2012-03-061-1/+3
|/ / /
* | | Merge pull request #94 from beardy-unixer/masterSimon2012-03-061-1/+5
|\ \ \ | | | | | | | | Documentation changes
| * | | Fixed...merged with mainline THEN added beards.Thomas2012-03-061-5/+36
| | | |
| * | | added beard smileysThomas2012-03-061-35/+8
| | | |
* | | | Merge pull request #99 from tomtom84/masterSimon2012-03-061-0/+3
|\ \ \ \ | | | | | | | | | | fixes in theme diabook
| * | | | messages-menu translation, add scroll-to-top and theme-bug-report in themetommy tomson2012-03-071-0/+3
| |/ / /
* / / / bugs #312, #313friendica2012-03-061-1/+1
|/ / /
* | | remove "smilie" expansion for Diaspora logofriendica2012-03-061-2/+2
| | |
* | | prevent duplicate likesfriendica2012-03-061-0/+25
| | |
* | | can_write_wall documentationfriendica2012-03-051-1/+6
| | |
* | | correct owner info from misconfigured installs, duepuntozero title block ↵friendica2012-03-041-0/+24
| | | | | | | | | | | | misplaced in editplain mode
* | | unused replacement variable displays %1 in all html2bbcode 'code' blocksfriendica2012-03-041-1/+1
| | |
* | | template proc: fix variables regexpFabio Comuni2012-03-031-1/+10
| | |
* | | template proc: allow isolation of var name between [ and ]Fabio Comuni2012-03-021-2/+4
| | | | | | | | | | | | $var.name -> $[var.name]
* | | template proc: remove unused function and commented out codeFabio Comuni2012-03-021-44/+1
| | |
* | | template proc: first optimizationFabio Comuni2012-03-022-10/+29
| | |
* | | expand multiple heart smilies e.g. <3333friendica2012-03-021-0/+12
| | |
* | | Merge pull request #55 from fabrixxm/masterfabrixxm2012-03-022-95/+112
|\ \ \ | | | | | | | | Some minor and one majior mod in templates
| * \ \ Merge remote-tracking branch 'friendica/master' into randomerrorFabio Comuni2012-03-013-27/+79
| |\ \ \
| * | | | conversation: remove templating items in code and move it to template.Fabio Comuni2012-03-011-94/+103
| | | | |
| * | | | template proc: avoid a notice and allow template name to include to be ↵Fabio Comuni2012-03-011-1/+9
| | | | | | | | | | | | | | | | | | | | passed with a variable value
* | | | | Merge branch 'pull'friendica2012-03-011-1/+6
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master'Alexander Kampmann2012-03-0120-251/+914
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Enabled automated doc building. Changes:Alexander Kampmann2012-03-011-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -build.xml, phing build file -@package tags at acl_selector.php and db_update.php -added documentation and some IDE files to .gitignore -automated tool to find files that corrupt the doc build process -removed ansi characters from SSH1.php, docBlox could not handle them