aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'master' of git://github.com/friendica/friendicaVasudev Kamath2012-07-0632-351/+3899
|\|
| * remove obsolete zot encapsulation functionsfriendica2012-07-051-33/+0
| * my php thinks this is a typoZach Prezkuta2012-07-051-1/+1
| * clear title and body of items on local deleteZach Prezkuta2012-07-051-2/+4
| * Merge pull request #376 from fermionic/diaspora-prevent-fcontact-race-conditionsfriendica2012-07-051-1/+3
| |\
| | * slightly better way of handling last loopZach Prezkuta2012-07-051-1/+3
| * | Merge pull request #375 from fermionic/diaspora-prevent-fcontact-race-conditionsfriendica2012-07-052-9/+18
| |\|
| | * add some timeouts to prevent deadlockZach Prezkuta2012-07-052-9/+18
| * | Merge pull request #373 from fermionic/more-list-fixesfriendica2012-07-052-21/+54
| |\ \ | | |/ | |/|
| | * fix small bug in lists and revert Diaspora list processing to non-Markdownify...Zach Prezkuta2012-07-052-21/+54
| * | cleanup some syntax errors in lock.phpZach Prezkuta2012-07-051-4/+4
| * | "lock" is a reserved MySQL keywordZach Prezkuta2012-07-051-6/+6
| * | minor cleanup in lock.phpZach Prezkuta2012-07-051-0/+2
| * | cleanup obsolete commentsZach Prezkuta2012-07-051-2/+0
| * | add rudimentary locking capability to Friendica functionsZach Prezkuta2012-07-053-21/+154
| |/
| * recycle symbol woes with multiple html entity encode/decode cycles going onfriendica2012-07-041-0/+3
| * render the recycle symbol correctly on Diaspora resharesfriendica2012-07-041-1/+1
| * some initial code and benchmarking for "red" content rendering enginefriendica2012-07-041-0/+6
| * restore translation of bbcode videos, events, bookmarks, etc. to diasporafriendica2012-07-041-10/+27
| * fix !@#$ tinymce linebreaks for the thousandth timefriendica2012-07-042-2/+1
| * punycode hostnamefriendica2012-07-031-0/+14
| * fix double linesfriendica2012-07-021-1/+5
| * try and get unadulterated bb2md2html2bb for simple stuff, then we'll work up ...friendica2012-07-023-4/+8
| * config to disable email validationfriendica2012-07-013-2/+9
| * restore 'shareable' to feeds after recent feed privacy re-factoringfriendica2012-06-301-1/+1
| * nav: pass $baseurl to templateFabrixxm2012-06-291-0/+1
| * wrong column name (- vs _)friendica2012-06-281-1/+1
| * remote_self feeds are not privatefriendica2012-06-281-1/+5
| * create third privacy state - public post but not searchable or publicly visiblefriendica2012-06-285-16/+17
| * css smiley classfriendica2012-06-281-35/+35
| * Merge https://github.com/friendica/friendica into pullfriendica2012-06-282-6/+6
| |\
| | * fix logic for nested lists--should be OR, not ANDZach Prezkuta2012-06-272-6/+6
| * | remove titles in ostatus even when edited date differs from created datefriendica2012-06-281-18/+22
| |/
| * moved api direct message formating to own function.Sebastian Egbers2012-06-261-54/+54
| * Merge branch 'master' of https://github.com/friendica/friendicaSebastian Egbers2012-06-2610-78/+190
| |\
| | * stray sfriendica2012-06-251-1/+1
| | * typosfriendica2012-06-252-2/+2
| | * add event titles to discovered birthday eventsfriendica2012-06-252-6/+11
| | * change required docofriendica2012-06-251-2/+5
| | * change event behaviour so that title is required but description is notfriendica2012-06-251-2/+2
| | * event summary/titlefriendica2012-06-252-2/+15
| | * Merge https://github.com/friendica/friendica into pullfriendica2012-06-253-37/+55
| | |\
| | | * add some debug loggingZach Prezkuta2012-06-251-0/+1
| | | * revert extra Diaspora disabling changes to try to eliminate Mustard double-po...Zach Prezkuta2012-06-253-43/+23
| | | * Clean up the Diaspora connectivity:Zach Prezkuta2012-06-253-55/+92
| | * | propagate remote deletesfriendica2012-06-251-5/+8
| | * | improve remote delete forwardingfriendica2012-06-252-2/+64
| | |/
| | * Merge https://github.com/friendica/friendica into pullfriendica2012-06-251-0/+1
| | |\
| | | * fix typo and syntax errorSimon L'nu2012-06-251-1/+1
| | * | typos in bbcode, add service class restrictions to jot uploadsfriendica2012-06-253-11/+14
| | |/