aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/friendica/friendicaTobias Hößl2012-03-0911-206/+405
|\
| * bug in check for private email comment to public conversation prevents authen...friendica2012-03-092-23/+9
| * 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
| * | [privacy] rework latest fixfriendica2012-03-061-1/+3
| |/
| * Merge pull request #94 from beardy-unixer/masterSimon2012-03-061-1/+5
| |\
| | * 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
| |\ \
| | * | 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 misp...friendica2012-03-041-0/+24
| * 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
| * 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
| |\
| | * 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 passed...Fabio Comuni2012-03-011-1/+9
| * | | 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
| * | | | probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic conten...friendica2012-03-011-0/+5
| | |/ / | |/| |
| * | | yet more work on notificationsfriendica2012-02-293-29/+54
| * | | notification enhancementsfriendica2012-02-291-3/+30
| | |/ | |/|
| * | call time pass by reference deprecatedfriendica2012-02-281-1/+1
| * | From Tobias H - catch some irregularities caused by cut/paste codefriendica2012-02-281-1/+1
* | | 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
|\| |
| * | Merge branch 'pull'friendica2012-02-271-3/+5
| |\ \
| | * | revert 01a2791e3a to avoid random preg internal errors. fix contact_templateFabio Comuni2012-02-271-3/+5
| * | | cleanup notify subject linesfriendica2012-02-271-8/+17
| |/ /
| * | add plugin hooks to enotifyfriendica2012-02-261-42/+80
| * | tagging missing from wallwall and a couple of themes, star missing from dispyfriendica2012-02-261-2/+12
| * | Merge pull request #50 from annando/masterfriendica2012-02-269-99/+573
| |\ \
| | * | Mail: New options for actions after importing mails.Michael2012-02-261-10/+36
| | * | Merge remote branch 'upstream/master'Michael2012-02-268-64/+222
| | |\ \
| | * | | poller.php: Test for moving to archive, vier-style: notifications fixedMichael2012-02-251-1/+11
| | * | | "vier": The contacts are now working again. Line break before closing bbcodes...Michael2012-02-251-2/+2
| | * | | Bug fixed where mails where nearly empty. HTML mails can now be received.Michael2012-02-251-62/+78
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 10:09:58 +0000