aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* 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
* never enough commentsFriendika2011-08-102-1/+15
* use mailto: to specify a new email contact and over-rider webfingerFriendika2011-08-091-1/+7
* pt-br strings.php update from messages.po changeFriendika2011-08-091-1/+1
* Merge branch 'pull'Friendika2011-08-094-1034/+2104
|\
| * Merge pull request #152 from abinoam/masterFriendika2011-08-091-1/+1
| |\
| | * small typo - pt-br localizationAbinoam P. Marques Jr.2011-08-091-1/+1
| |/
| * Merge pull request #151 from tobiasd/mastertobiasd2011-08-093-1033/+2103
| |\
| | * Merge github.com:tobiasd/friendikaTobias Diekershoff2011-08-093-8/+8
| | |\
| | | * made SN addon admin panel strings translateableTobias Diekershoff2011-08-091-4/+4
| | | * fixed some typosTobias Diekershoff2011-08-092-4/+4
| | * | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-08-092-204/+227
| | |\ \ | | |/ / | |/| / | | |/
| | * update of the German localizationTobias Diekershoff2011-08-092-1027/+2097
* | | crypto stuffFriendika2011-08-0910-90/+102
* | | diaspora - remove debugging code on encrypt/decryptFriendika2011-08-091-38/+4
|/ /
* / diaspora encrypt+decrypt working !!Friendika2011-08-092-204/+227
|/
* AES_256_CBCFriendika2011-08-081-4/+4
* basic diaspora encryptionFriendika2011-08-081-0/+90
* reparenting imported item was only partially reparenting.Friendika2011-08-082-1/+8
* use separate hcard from profile urlFriendika2011-08-074-2/+53
* guids on itemsFriendika2011-08-071-1/+1
* item guidsFriendika2011-08-076-5/+16
* guid functionsFriendika2011-08-073-9/+9
* upsize guid storage to allow for Diaspora future growthFriendika2011-08-072-1/+5
* cleanupFriendika2011-08-0722-2355/+2794
* bug #117, use realname for screen_name in API if nickname missingFriendika2011-08-052-3/+3
* fix statusnet_html timelines on apiFriendika2011-08-053-2/+3
* move public profile warning to top of pageFriendika2011-08-053-5/+5
* fallback sha256 openssl_verify code for php releases prior to 5.3Friendika2011-08-051-3/+6
* more api tweaksFriendika2011-08-052-11/+25