aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'friendika/master'Fabio Comuni2011-10-269-17/+56
|\
| * fix diaspora cacheFriendika2011-10-251-1/+1
| * sql errorFriendika2011-10-251-1/+1
| * some dspr fixesFriendika2011-10-254-2/+12
| * soften the content-typesFriendika2011-10-251-0/+0
| * event notification stuffFriendika2011-10-252-9/+38
| * change event display orderFriendika2011-10-251-2/+2
| * need a lower bound for eventsFriendika2011-10-251-2/+3
| * only notify for events that are starting soon - ignore long-running events th...Friendika2011-10-251-3/+2
* | search delay and hide empty popupFabio Comuni2011-10-251-9/+14
* | filter by contact typeFabio Comuni2011-10-251-50/+65
* | autocomplete contacts nickname while writting in a comment box.Fabio Comuni2011-10-255-5/+187
* | oembed: wrap in iframe only html from remote serviceFabio Comuni2011-10-254-8/+150
|/
* fix tag import for tag ownerFriendika2011-10-241-1/+2
* bug #166Friendika2011-10-243-2/+57
* D* formatting updates [code/blockquote]Friendika2011-10-241-5/+5
* tag privacy settingsFriendika2011-10-242-7/+23
* @ tags becoming # tags during atom transitFriendika2011-10-241-1/+1
* use iframe for oembed - untrusted contentFriendika2011-10-242-3/+23
* tag display with itemFriendika2011-10-242-1/+12
* allow tag input to contain leading '#'Friendika2011-10-241-1/+1
* Merge branch 'pull'Friendika2011-10-2413-38/+109
|\
| * Merge pull request #35 from fabrixxm/masterFriendika2011-10-2413-38/+109
| |\
| | * fix oembed video thumb display ratioFabio Comuni2011-10-241-3/+5
| | * fix vimeo oembed bbcode regexpFabio Comuni2011-10-241-2/+2
| | * move html for oembeded videos in template. fix oembed discoveryFabio Comuni2011-10-242-16/+26
| | * new icon "play"Fabio Comuni2011-10-246-1/+2
| | * try to use oembed on vimeo tagFabio Comuni2011-10-241-0/+3
| | * Use oembed for bookmark, audio, video, youtubeFabio Comuni2011-10-242-6/+36
| | * cache apiFabio Comuni2011-10-244-12/+37
* | | social tag - add UIFriendika2011-10-249-8/+37
|/ /
* | more taggingFriendika2011-10-243-21/+122
* | shared tag searchFriendika2011-10-231-8/+9
* | Merge branch 'master' into tagFriendika2011-10-235-18/+32
|\ \
| * | never enough commentsFriendika2011-10-231-0/+7
| * | workaround for transmitting photos to D*Friendika2011-10-234-17/+21
| * | fix queue_fnsFriendika2011-10-231-1/+4
| * | revupFriendika2011-10-231-1/+1
* | | taggingFriendika2011-10-232-5/+254
|/ /
* | queue indexesFriendika2011-10-224-4/+16
* | Merge branch 'pull'Friendika2011-10-214-15/+32
|\ \
| * | Merge pull request #34 from fabrixxm/masterfabrixxm2011-10-214-15/+32
| |\|
| | * add custom style to object tag in tinymceFabio Comuni2011-10-212-0/+6
| | * oembed. fix html2bbcode when oembed html contains span and utf8 charsFabio Comuni2011-10-212-15/+26
* | | revupFriendika2011-10-211-1/+1
|/ /
* | queue api + queue limitsFriendika2011-10-215-62/+53
* | fix hex2bin for empty inputFriendika2011-10-201-0/+3
|/
* fix various html parse errorsFriendika2011-10-206-15/+42
* bug #183 - strlen borking on sysmsg, which is now an arrayFriendika2011-10-202-7/+7
* bug in diaspora_reshareFriendika2011-10-205-5/+122