aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/friendica/friendicaVasudev Kamath2012-06-119-43/+185
|\
| * bug #447 - make followed feeds privatefriendica2012-06-111-3/+16
| * ostatus hub subscription issuesfriendica2012-06-073-4/+13
| * png support for embedded private photosfriendica2012-06-071-2/+2
| * png support: update database.sql, fix some typos, fix tinymce image browserFabio Comuni2012-06-071-11/+13
| * Add support for PNG images with alphaFabio Comuni2012-06-074-24/+130
| * fix a random profile error messagefabrixxm2012-06-071-1/+3
| * more logging on subscribe_to_hubfriendica2012-06-061-1/+6
| * add email probe logging, limit typo check to main addon files and skip additi...friendica2012-06-051-0/+3
| * Merge remote branch 'upstream/master'Michael Vogel2012-06-0415-99/+875
| |\
| * | API: Only repeat items if there is a contentMichael Vogel2012-06-041-8/+10
* | | Merge branch 'master' of git://github.com/friendica/friendicaVasudev Kamath2012-06-0429-600/+1810
|\ \ \ | | |/ | |/|
| * | Debugged implementation of Diaspora relayable_retractionsZach Prezkuta2012-06-032-1/+3
| * | cleanup and loggingZach Prezkuta2012-06-031-22/+20
| * | first shot at getting like/unlike functions to work consistentlyZach Prezkuta2012-06-034-20/+31
| * | Fix bugs in the retraction codeZach Prezkuta2012-06-034-61/+37
| * | Implement relaying of relayable_retractionsZach Prezkuta2012-06-034-36/+165
| * | Support relayable_retractions that are relayed to us by the top-level post ownerZach Prezkuta2012-06-033-9/+39
| * | zrl's when visiting public photos at the source sitefriendica2012-06-031-0/+6
| * | docofriendica2012-06-021-0/+12
| * | turn "follow" into a functionfriendica2012-06-021-0/+231
| * | add hometown to profilesfriendica2012-06-021-0/+2
| * | bug #439 - remove web port number from notification email "from" addressfriendica2012-06-021-0/+3
| * | webfinger profile linkerfriendica2012-06-022-0/+8
| * | "howlong" added to marital status.friendica2012-06-022-2/+7
| * | fewer "bob smith to bob smith via wall-to-wall".friendica2012-06-021-16/+31
| * | Merge pull request #321 from beardy-unixer/masterfriendica2012-06-011-1/+1
| |\ \
| | * | [quote=somebody] was appearing as an extended spoiler tag.Thomas Willingham2012-06-011-1/+1
| * | | registration issue after re-factorfriendica2012-06-011-1/+3
| |/ /
| * | turn registration code into a standalone function for re-usefriendica2012-05-312-4/+329
| * | query using both `id` and `parent`Zach Prezkuta2012-05-311-2/+10
| * | prevent email from leaking in feedsfriendica2012-05-301-0/+4
| * | y didn't i think of this b4?friendica2012-05-301-0/+4
| * | fix private photos that also have a size specificationfriendica2012-05-301-2/+2
| * | private group tests, cont.friendica2012-05-291-4/+4
| * | prvgroup should see introsfriendica2012-05-291-1/+1
| * | possible sql injection in searchfriendica2012-05-291-2/+2
| * | Merge https://github.com/friendica/friendica into pullfriendica2012-05-294-68/+110
| |\ \
| | * | Merge pull request #316 from annando/masterSimon2012-05-293-62/+99
| | |\|
| | | * Disabled logging of SQL statementsMichael Vogel2012-05-291-4/+4
| | | * Merge remote branch 'upstream/master'Michael Vogel2012-05-298-16/+109
| | | |\
| | | * | Doing negative caching for config values, special logfile for database optmis...Michael Vogel2012-05-262-4/+26
| | | * | Deactivating the test output in db engineMichael Vogel2012-05-261-2/+2
| | | * | Speed optimisation by enabling the posibility of the MySQL fulltext engineMichael Vogel2012-05-262-8/+16
| | | * | Merge remote branch 'upstream/master'Michael Vogel2012-05-2511-44/+126
| | | |\ \
| | | * | | Performance testsMichael Vogel2012-05-202-9/+13
| | | * | | Merge remote branch 'upstream/master'Michael Vogel2012-05-196-388/+610
| | | |\ \ \
| | | * \ \ \ Merge remote branch 'upstream/master'Michael Vogel2012-05-166-8/+22
| | | |\ \ \ \
| | | * \ \ \ \ Merge remote branch 'upstream/master'Michael Vogel2012-05-0925-562/+1053
| | | |\ \ \ \ \
| | | * | | | | | API: RSS-Feeds are now shortened to 1000 characters. (With added link)Michael Vogel2012-04-221-45/+48