aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* merge upstream, slider work, refactor ping module, language selection workfriendica2012-07-135-35/+204
* add plink to profile change notificationsfriendica2012-07-121-3/+2
* language detection and sparkle links added to plinks where appropriatefriendica2012-07-122-0/+13
* get rid of special "short salmon key" for statusnetfriendica2012-07-115-31/+12
* gracefully recover from datetime constructor issuesfriendica2012-07-111-2/+23
* catchupfriendica2012-07-112-30/+66
* catchupfriendica2012-07-101-1/+1
* create fetch_tags function, make search work again, change logofriendica2012-07-104-20/+37
* upstream fixes and a lot of taxonomy stufffriendica2012-07-106-12/+16
* sliderfriendica2012-07-09418-0/+69027
* theme cleanupfriendica2012-07-091-1/+1
* making tags workfriendica2012-07-094-61/+111
* remove bookmark content flagfriendica2012-07-081-8/+0
* cleanupZach Prezkuta2012-07-071-5/+0
* fix bugsZach Prezkuta2012-07-073-13/+20
* allow more than one embedded private photoZach Prezkuta2012-07-073-119/+253
* add function to exclude embedded images when checking message lengthZach Prezkuta2012-07-071-4/+112
* Merge pull request #379 from fermionic/events-display-wrong-in-diasporafriendica2012-07-071-1/+1
|\
| * remove check for event description, since it's not required to create an eventZach Prezkuta2012-07-061-1/+1
* | 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
| |\