aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'friendika/master' into newuifabrixxm2011-08-17101-5994/+9780
|\
| * diaspora continued...Friendika2011-08-171-30/+174
| * D* like and start of relay codeFriendika2011-08-162-58/+100
| * fill in framework for d* outgoingFriendika2011-08-162-10/+32
| * cleanupFriendika2011-08-1611-23/+38
| * fix API time - wrong format stringFriendika2011-08-161-1/+1
| * cleanup after refactorFriendika2011-08-161-18/+5
| * refactor the diaspora contact logicFriendika2011-08-152-54/+86
| * cronhooks brokenFriendika2011-08-152-1/+3
| * remove disable oembedFriendika2011-08-151-1/+1
| * typosFriendika2011-08-151-3/+3
| * filename typoFriendika2011-08-151-2/+2
| * stupid browsers not honouring meta baseFriendika2011-08-151-2/+9
| * doh! add body to the itemFriendika2011-08-151-0/+1
| * set parent-uri for top level postsFriendika2011-08-151-1/+1
| * diaspora confirm cleanupFriendika2011-08-152-4/+6
| * set proper relation for diaspora in mod_followFriendika2011-08-152-3/+11
| * privacy enforcement on pubmail_enableFriendika2011-08-151-1/+1
| * diaspora friend approvalsFriendika2011-08-152-11/+24
| * turn diaspora posts into x-www-form-urlencodedFriendika2011-08-153-16/+18
| * errant debug statementFriendika2011-08-151-1/+1
| * fixes share from diasporaFriendika2011-08-153-6/+9
| * temporarily disable oembedFriendika2011-08-151-0/+3
| * split off facebook and other cron hooks from pollerFriendika2011-08-142-3/+43
| * diaspora top level status posts, string updateFriendika2011-08-144-210/+274
| * diaspora follow from friendikaFriendika2011-08-142-6/+34
| * diaspora probe/scrape changesFriendika2011-08-144-14/+26
| * set network correctly - dfrn_confirmFriendika2011-08-141-1/+3
| * add diaspora support to dfrn_confirm (friendship confirmation)Friendika2011-08-141-10/+14
| * Merge branch 'pull'Friendika2011-08-141-1/+0
| |\
| | * removed obsolete proxy settingtobiasd2011-08-141-1/+0
| * | honour "post to xxx network by default" when using APIFriendika2011-08-144-0/+28
| |/
| * partially fill in diaspora stub functions for comments and likes - these both...Friendika2011-08-131-12/+125
| * basic post message from diaspora (untested)Friendika2011-08-131-0/+73
| * js_upload reporting 43k file too bigFriendika2011-08-132-4/+4
| * incoming diaspora share notification turned into Friendika friend requestFriendika2011-08-131-9/+47
| * hopefully fix statusnet bug by altering our feed format slightlyFriendika2011-08-124-5/+35
| * but #118 proxy settings in admin panelFriendika2011-08-121-4/+4
| * Merge branch 'pull'Friendika2011-08-121-1/+53
| |\
| | * Merge pull request #153 from tobiasd/mastertobiasd2011-08-111-1/+53
| | |\
| | | * SN addon respects friendika proxy settings nowTobias Diekershoff2011-08-111-1/+53
| * | | improved diaspora discoveryFriendika2011-08-123-6/+70
| * | | introduction fails if confirmation differs by http vs httpsFriendika2011-08-124-7/+40
| |/ /
| * | redirect to home after logging in using login urlFriendika2011-08-111-0/+2
| * | enhanced email privacyFriendika2011-08-112-6/+11
| |/
| * comment box premature close due to race condition with liveupdateFriendika2011-08-101-1/+2
| * keep private emails out of any offsite feedsFriendika2011-08-102-0/+8
| * enhance random_string, block public email repliesFriendika2011-08-105-6/+16
| * Diaspora logoFriendika2011-08-102-1/+3
| * diaspora function dispatcherFriendika2011-08-102-37/+56