aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge remote-tracking branch 'friendica/master'Fabio Comuni2011-11-151-1/+1
| |\ | |/ |/|
* | revupfriendica2011-11-141-1/+1
| * duepuntozero: fix input width in asideFabio Comuni2011-11-151-0/+4
|/
* Merge pull request #4 from fabrixxm/masterfabrixxm2011-11-141-6/+6
|\
| * ping: fix total count and comment/postFabio Comuni2011-11-141-6/+6
* | D* doesn't like html entities in post. Convert our hijack-proof hashtag repla...friendica2011-11-131-1/+1
* | translate vimeo and youtube bbcode to naked links so D* will oembed them againfriendica2011-11-131-11/+9
* | d* - remove dupe bbcode code tagsfriendica2011-11-132-1/+3
* | add revision date to main profile photo to overcome cache when updated, other...friendica2011-11-123-8/+10
* | longer lifetime for system message popups so you have time to read themfriendica2011-11-121-1/+1
* | html5 - don't set empty attribute eitherfriendica2011-11-121-1/+1
* | warn about photo caching when updating profile picfriendica2011-11-121-0/+1
* | moved tiptip a few more pixels away to reduce flashingfriendica2011-11-121-1/+1
* | several little nits in the hcard template output which could affect parsersfriendica2011-11-124-4/+7
* | renameFriendika2011-11-121-1/+1
* | Merge branch 'pull'Friendika2011-11-124-19/+53
|\ \
| * | Merge pull request #3 from fabrixxm/masterfriendica2011-11-124-19/+53
| |\|
| | * duepuntozero: add notice and info popups css styleFabio Comuni2011-11-111-0/+12
| | * oembed: replace base64 url for iframe with url site/oembed/url_encodedFabio Comuni2011-11-112-2/+17
| | * js: start liveupdate after ping returns to stop continuos welcome messageFabio Comuni2011-11-111-17/+24
* | | bug #198 - create activitystream 'friends with' message for Diaspora confirma...Friendika2011-11-122-1/+57
|/ /
* | incorrect total use for get_feedtagsFriendika2011-11-121-2/+2
* | some works on autocomplete (return with no selection = cancel, tab = select n...Friendika2011-11-111-5/+16
* | html5 parser - numeric attribute names chucking a wobbly.Friendika2011-11-112-3/+3
|/
* "follow" link was missingFriendika2011-11-111-0/+2
* theme birthday/event notifications under testbubbleFriendika2011-11-111-0/+8
* some testbubble fixesFriendika2011-11-104-3/+36
* testbubble showing post jot-tools on edit page - these are not changed so sho...Friendika2011-11-102-12/+15
* shared tags for testbubble, prevent tag hijacking of shared tag activitiesFriendika2011-11-109-24/+74
* bbcode list stylesFriendika2011-11-091-6/+10
* contact edit updatesFriendika2011-11-095-47/+104
* add allfriends pageFriendika2011-11-091-0/+59
* Merge branch 'master' into contactsFriendika2011-11-097-34/+52
|\
| * fix to overlapping tabs on testbubble when width too smallFriendika2011-11-091-3/+4
| * revupFriendika2011-11-091-1/+1
| * reset theme_info when a profile is loaded (without a theme cookie the default...Friendika2011-11-091-0/+8
| * various testbubble fixesFriendika2011-11-095-30/+39
* | vcard position - dpzeroFriendika2011-11-091-1/+3
* | more work on new contact edit page - plus first port to testbubbleFriendika2011-11-095-178/+69
* | more contact edit page stuffFriendika2011-11-083-71/+50
* | first checkin - updated contact_edit, more work remainsFriendika2011-11-084-58/+82
|/
* cleanup and loose endsFriendika2011-11-083-6/+8
* strip duplicate code blocks bb2d*Friendika2011-11-082-68/+109
* some doc updatesFriendika2011-11-0833-128/+337
* Merge pull request #2 from fabrixxm/masterfabrixxm2011-11-0828-10/+3197
|\
| * fix db updatefabrixxm2011-11-071-1/+1
| * oauth: fix add new appFabio Comuni2011-11-071-1/+1
| * oauth: db updateFabio Comuni2011-11-073-3/+15
| * Merge branch 'oauthapi'Fabio Comuni2011-11-0726-8/+3183
| |\
| | * statusnet-friendika post permalink compatibilityFabio Comuni2011-11-071-0/+20