2762 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Friendika	d45a66e700	allow custom avatar sizes - needed for Diaspora hcard/vcard	2011-08-03 21:05:39 -07:00
Friendika	ad1e827169	several fixes for attachments	2011-08-03 19:18:58 -07:00
Friendika	d0b7723bbc	re-parent api post item with parent_id and no parent_uri	2011-08-03 16:29:25 -07:00
Friendika	e22e823e93	allow group selection from contact edit page	2011-08-02 22:39:35 -07:00
Friendika	6bf800c6c8	Provide a way to lie about textlimit as far as API is concerned.	2011-08-02 20:08:40 -07:00
Friendika	1aaded10b4	api compatibility fixes	2011-08-02 20:02:07 -07:00
Friendika	b774127616	bug #114, warn about linked Facebook item privacy	2011-08-02 17:04:03 -07:00
Friendika	2637831d90	some more zot changes migrating back to f9a mainline	2011-08-01 21:02:25 -07:00
Friendika	8b31ff15f5	breaking up boot file (part of zot refactor)	2011-08-01 16:51:01 -07:00
Friendika	e76990ae7b	bug #111 - don't parse an @ address as a feed	2011-08-01 16:15:37 -07:00
Friendika	326a873082	merge diaspora/friendika vcard formats - not yet complete	2011-08-01 05:13:59 -07:00
Friendika	823d7ba42a	api/friends/ids, api/followers/ids	2011-07-31 22:22:34 -07:00
Friendika	996425206f	api profiles	2011-07-31 20:01:00 -07:00
Friendika	b0a9ec0a73	better handling of api comments/replies	2011-07-31 17:52:36 -07:00
Friendika	0c9f033505	some api enhancements	2011-07-31 16:35:53 -07:00
Friendika	b96b7d4608	get attribution correct in api items	2011-07-31 00:53:46 -07:00
Friendika	149d52da8b	show correct self profile in api	2011-07-30 20:48:55 -07:00
Friendika	60caffcd77	convert our native pkcs#8 to pkcs#1 for diaspora-public-key xrd field	2011-07-30 01:03:24 -07:00
Friendika	01703f3be6	get_diaspora_key()	2011-07-30 00:51:59 -07:00
Friendika	a61ec584d6	basic diaspora decryption	2011-07-30 00:31:00 -07:00
Friendika	dbc3283681	api/statusnet/version	2011-07-29 18:21:54 -07:00
Friendika	829dc24464	api/statusnet/config does not require login	2011-07-29 17:01:57 -07:00
Friendika	c9d17c78a6	Merge branch 'pull'	2011-07-29 16:05:41 -07:00
Friendika	ef47a1cf97	revup	2011-07-29 16:05:16 -07:00