aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'friendika/master'Fabio Comuni2011-10-266-4/+14
|\ \
| * | fix diaspora cacheFriendika2011-10-251-1/+1
| * | sql errorFriendika2011-10-251-1/+1
| * | some dspr fixesFriendika2011-10-254-2/+12
* | | oembed: wrap in iframe only html from remote serviceFabio Comuni2011-10-252-7/+7
|/ /
* | fix tag import for tag ownerFriendika2011-10-241-1/+2
* | D* formatting updates [code/blockquote]Friendika2011-10-241-5/+5
* | @ 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-241-0/+9
* | Merge branch 'pull'Friendika2011-10-244-36/+102
|\ \
| * \ Merge pull request #35 from fabrixxm/masterFriendika2011-10-244-36/+102
| |\ \
| | * | 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-241-16/+22
| | * | try to use oembed on vimeo tagFabio Comuni2011-10-241-0/+3
| | * | Use oembed for bookmark, audio, video, youtubeFabio Comuni2011-10-241-5/+36
| | * | cache apiFabio Comuni2011-10-243-12/+36
* | | | social tag - add UIFriendika2011-10-242-3/+10
|/ / /
* | | more taggingFriendika2011-10-241-13/+85
* | | Merge branch 'master' into tagFriendika2011-10-234-17/+31
|\ \ \
| * | | never enough commentsFriendika2011-10-231-0/+7
| * | | workaround for transmitting photos to D*Friendika2011-10-233-16/+20
| * | | fix queue_fnsFriendika2011-10-231-1/+4
* | | | taggingFriendika2011-10-231-5/+84
|/ / /
* | | queue indexesFriendika2011-10-221-1/+0
* | | Merge pull request #34 from fabrixxm/masterfabrixxm2011-10-211-9/+15
|\| |
| * | oembed. fix html2bbcode when oembed html contains span and utf8 charsFabio Comuni2011-10-211-9/+15
* | | queue api + queue limitsFriendika2011-10-215-62/+53
* | | fix hex2bin for empty inputFriendika2011-10-201-0/+3
|/ /
* | fix various html parse errorsFriendika2011-10-203-9/+32
* | bug in diaspora_reshareFriendika2011-10-202-2/+113
* | diaspora_reshare - even more loggingFriendika2011-10-201-0/+2
* | provide link to missing d* imagesFriendika2011-10-201-1/+1
* | more reshare logging to see what's going onFriendika2011-10-201-0/+3
* | diaspora_reshare - another tryFriendika2011-10-201-6/+6
|/
* fix for errant top-level posts from feedsFriendika2011-10-191-1/+4
* more debug reshareFriendika2011-10-191-1/+1
* suppress blank diaspora messages which are awaiting a photo that hasn't arrivedFriendika2011-10-191-1/+5
* diaspora_reshare no content found, d* profile message work in progress, netwo...Friendika2011-10-191-2/+2
* fix img link format diaspora share/asphotoFriendika2011-10-191-4/+4
* diaspora resharesFriendika2011-10-182-0/+142
* string updateFriendika2011-10-181-0/+1
* a few issues with diaspora_profileFriendika2011-10-181-2/+7
* "cubbi.es"Friendika2011-10-171-0/+101
* Merge branch 'pull'Friendika2011-10-172-233/+55
|\
| * works on login formFabio Comuni2011-10-171-6/+7
| * Merge remote-tracking branch 'friendika/master'Fabio Comuni2011-10-1712-48/+280
| |\
| * | Remove full profile html from php and add new template 'profile_advanced.tpl'Fabio Comuni2011-10-101-227/+48
* | | origin flag handling, and bug #137 - provide timezone conversion for events p...Friendika2011-10-173-10/+8
| |/ |/|