Commit graph

2486 commits

Author SHA1 Message Date
Friendika
88f94325a4 incoming diaspora share notification turned into Friendika friend request 2011-08-13 06:52:33 -07:00
Friendika
e15e18e0d1 hopefully fix statusnet bug by altering our feed format slightly 2011-08-12 21:01:51 -07:00
Friendika
e1db136966 but #118 proxy settings in admin panel 2011-08-12 04:05:20 -07:00
Friendika
cef64d4498 Merge branch 'pull' 2011-08-12 03:02:21 -07:00
Friendika
aefc6209a3 improved diaspora discovery 2011-08-12 03:01:11 -07:00
Friendika
fda593caed introduction fails if confirmation differs by http vs https 2011-08-12 02:58:29 -07:00
tobiasd
d80e90cab0 Merge pull request #153 from tobiasd/master
SN addon respect proxy setings
2011-08-11 10:00:05 -07:00
Tobias Diekershoff
4fe81736ed SN addon respects friendika proxy settings now 2011-08-11 14:52:23 +02:00
Friendika
0db145dafa redirect to home after logging in using login url 2011-08-11 04:28:06 -07:00
Friendika
04b59ac49a enhanced email privacy 2011-08-11 01:52:31 -07:00
Friendika
3f61f9f2c5 comment box premature close due to race condition with liveupdate 2011-08-10 22:20:59 -07:00
Friendika
ac4ce27e88 keep private emails out of any offsite feeds 2011-08-10 21:46:19 -07:00
Friendika
684ebd2ed8 enhance random_string, block public email replies 2011-08-10 21:06:35 -07:00
Friendika
06408664db Diaspora logo 2011-08-10 05:28:39 -07:00
Friendika
72873cd827 diaspora function dispatcher 2011-08-10 05:10:48 -07:00
Friendika
ee6806d82b never enough comments 2011-08-10 01:19:27 -07:00
Friendika
cbfb40c43f use mailto: to specify a new email contact and over-rider webfinger 2011-08-09 22:11:01 -07:00
Friendika
e3841ce15c pt-br strings.php update from messages.po change 2011-08-09 19:05:43 -07:00
Friendika
afb04142ce Merge branch 'pull' 2011-08-09 18:56:06 -07:00
Friendika
1bfe1283aa crypto stuff 2011-08-09 18:55:46 -07:00
Friendika
8407a4c09a Merge pull request #152 from abinoam/master
Small typo at pt-br localization
2011-08-09 18:54:18 -07:00
Abinoam P. Marques Jr.
4cfe75c6bc small typo - pt-br localization 2011-08-09 22:34:44 -03:00
tobiasd
8ad33f3053 Merge pull request #151 from tobiasd/master
German localization
2011-08-09 07:42:23 -07:00
Tobias Diekershoff
34eaae46d3 Merge github.com:tobiasd/friendika 2011-08-09 16:35:55 +02:00
Tobias Diekershoff
997cad8685 Merge branch 'master' of git://github.com/friendika/friendika 2011-08-09 16:35:15 +02:00
Tobias Diekershoff
65a4839925 made SN addon admin panel strings translateable 2011-08-09 16:24:58 +02:00
Tobias Diekershoff
e2873e542b fixed some typos 2011-08-09 16:19:39 +02:00
Tobias Diekershoff
97b2c56c98 update of the German localization 2011-08-09 15:57:08 +02:00
Friendika
49be394182 diaspora - remove debugging code on encrypt/decrypt 2011-08-09 06:40:28 -07:00
Friendika
70017ebb8c diaspora encrypt+decrypt working !! 2011-08-09 02:53:51 -07:00
Friendika
07c48191b6 AES_256_CBC 2011-08-08 21:51:56 -07:00
Friendika
df3062c612 basic diaspora encryption 2011-08-08 21:44:29 -07:00
Friendika
6be5da67b1 reparenting imported item was only partially reparenting. 2011-08-08 19:10:36 -07:00
Friendika
7eb7f77413 use separate hcard from profile url 2011-08-07 19:26:44 -07:00
Friendika
0745c00b16 guids on items 2011-08-07 17:33:13 -07:00
Friendika
8812b7f4ca item guids 2011-08-07 17:29:26 -07:00
Friendika
1eec10329a guid functions 2011-08-07 16:56:26 -07:00
Friendika
eea493d1f5 upsize guid storage to allow for Diaspora future growth 2011-08-07 16:24:20 -07:00
Friendika
48ffa880f0 cleanup 2011-08-07 16:15:54 -07:00
Friendika
aa3a14ec36 bug #117, use realname for screen_name in API if nickname missing 2011-08-05 21:30:12 -07:00
Friendika
8ae0a8a94c fix statusnet_html timelines on api 2011-08-05 07:26:54 -07:00
Friendika
1d659bd854 move public profile warning to top of page 2011-08-05 06:42:27 -07:00
Friendika
5a5a7bfc4c fallback sha256 openssl_verify code for php releases prior to 5.3 2011-08-05 05:37:42 -07:00
Friendika
112fc59e31 more api tweaks 2011-08-05 05:17:18 -07:00
Friendika
6eec04b09c updates to Diaspora decrypt/verify from recent testing 2011-08-05 01:34:32 -07:00
Friendika
b8592dba8a integer values don't show up in xml api results 2011-08-05 01:02:12 -07:00
Friendika
2abcf76ec1 salmon protocol changes magicsig draft-experimental, fixes to hostxrd 2011-08-04 22:37:45 -07:00
Friendika
12d5482fc1 some fields in API timeline JSON must be int 2011-08-04 19:47:45 -07:00
Friendika
f0af4de4a7 wrap text from imported link in [quote] 2011-08-04 19:19:51 -07:00
Friendika
639204c2ec diaspora structures 2011-08-03 22:05:20 -07:00