aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | multipart messages complete, message-id conversion done.Michael2012-02-254-20/+29
| | * | Sending mail as multipart/alternative (html and plain text) (very basic by now)Michael2012-02-243-27/+51
| | * | Encoding for incoming mails. Fixed invalid message id (with side effect at th...Michael2012-02-247-23/+411
| | * | GIT problems ...Michael2012-02-231-8/+1
| | * | Merge remote branch 'upstream/master'Michael2012-02-2313-46/+205
| | |\ \
| | * | | bbcode.php: A list or quote at the beginning wasn't detectedMichael2012-02-231-3/+3
| * | | | Merge pull request #49 from CatoTH/masterfriendica2012-02-266-16/+17
| |\ \ \ \
| * | | | | relative link redirectsfriendica2012-02-262-12/+24
| | |_|_|/ | |/| | |
| * | | | show experimental and unsupported theme status on theme admin pagefriendica2012-02-261-1/+8
* | | | | 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
| |/ / / |/| | |
* | | | Avoid some noticesTobias Hößl2012-02-263-11/+12
* | | | BugfixTobias Hößl2012-02-261-1/+1
* | | | 1 Bugfix (missing $ character) and avoid some noticesTobias Hößl2012-02-261-3/+3
* | | | Wrong variable nameroot2012-02-261-1/+1
|/ / /
* | | Comment notifications by e-mail now are threadedAbinoam P. Marques Jr2012-02-251-6/+50
* | | include/items.php pass 'parent' to notificationAbinoam P. Marques Jr2012-02-251-3/+7
* | | scale external imagesfriendica2012-02-253-37/+47
* | | theme info (like plugin info)friendica2012-02-251-2/+66
* | | string update for 2.38friendica2012-02-241-0/+3
* | | update author name across items if changed.friendica2012-02-241-1/+17
* | | attribution issue - don't take author name from contact if available from item.friendica2012-02-243-14/+24
| |/ |/|
* | fix img tag with size attributeTobias Diekershoff2012-02-231-1/+1
* | Merge branch 'master' into notifyfriendica2012-02-231-2/+2
|\ \
| * | Removed the export of markdown articles. That was for testing purposes only.Michael Vogel2012-02-231-2/+2
* | | more theme notify fixesfriendica2012-02-231-1/+1
* | | new notify sort of working in testbubblefriendica2012-02-222-2/+3
* | | Merge branch 'master' into notifyfriendica2012-02-228-190/+470
|\| |
| * | nested quote check fails to account for strpos returning position 0friendica2012-02-221-2/+2
| * | restore poller normal operationfriendica2012-02-221-2/+2
| * | Merge pull request #45 from annando/masterfriendica2012-02-225-182/+381
| |\|
| | * German translation more gender friendly. Some more logging in poller.phpMichael2012-02-221-5/+20
| | * Some testing stuffMichael2012-02-202-1/+2
| | * API is now working on my nginx server.Michael2012-02-202-11/+19
| | * New version of markdown. Playing with stylesheet. Testing line breaks.root2012-02-191-7/+6
| | * Handling nested bbcodes. Some small design changes in html2bbcode. Change in ...Michael2012-02-193-23/+35
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 09:19:20 +0000