15399 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
fabrixxm	ba0a710208	Merge pull request #150 from fabrixxm/master ... some fix	2011-07-29 08:25:44 -07:00
Fabio Comuni	ac6945eed1	Merge remote-tracking branch 'friendika/master'	2011-07-29 17:23:09 +02:00
Fabio Comuni	b1e766dadb	allow GET or POST data in statuses/update	2011-07-29 17:21:02 +02:00
Fabio Comuni	0111a1231c	re-add pending registrations in ping.php, for admin side menu	2011-07-29 17:14:35 +02:00
Fabio Comuni	6c423feed2	add missing link to navbar	2011-07-29 16:32:01 +02:00
Fabio Comuni	97eea6ecd6	style update	2011-07-29 16:24:18 +02:00
Fabio Comuni	d88ed393f8	notify pending registrations	2011-07-29 16:24:09 +02:00
Fabio Comuni	d12e2cbfe9	Fix nav template and add missing strings	2011-07-29 16:23:47 +02:00
Friendika	f47d582736	api/statusnet/config.xml	2011-07-28 21:56:56 -07:00
Friendika	8e30f6a2f4	one more try - do not link numeric hash tags	2011-07-28 21:05:56 -07:00
Friendika	41c7d71e3b	make profile-jot-desc track lock state changes	2011-07-28 20:44:35 -07:00
Friendika	9b2ddb2cc2	auto-friend profiles showing up in directory as community pages	2011-07-28 19:18:07 -07:00
Friendika	a45b94033e	issue with remote mentions	2011-07-28 19:08:38 -07:00
Friendika	8042f874f3	more progress on key conversion functions	2011-07-28 18:16:57 -07:00
Friendika	0a3c9017d0	Merge branch 'pull'	2011-07-28 16:50:44 -07:00
Friendika	04675e3ec3	revup	2011-07-28 16:49:43 -07:00
tobiasd	b9cd244dd9	Merge pull request #149 from tobiasd/master ... wording for StatusNet and Twitter config cleared	2011-07-28 08:40:23 -07:00
Tobias Diekershoff	cfc7f8308f	Merge branch 'master' of git://github.com/friendika/friendika	2011-07-28 17:36:49 +02:00
Tobias Diekershoff	ea0d5d34ac	config page formatation issues fixed	2011-07-28 17:34:34 +02:00
Tobias Diekershoff	ce36f0bf3d	clearing the wordenting for the addon config	2011-07-28 13:25:41 +02:00
Friendika	c74f0f0cab	show full size photos for album view even when photo has been used as a profile photo	2011-07-28 01:01:19 -07:00
Friendika	822fea9d9d	installer text changes	2011-07-27 21:48:02 -07:00
Friendika	b721fabc3c	show lock icon on private events	2011-07-27 02:21:55 -07:00
Friendika	e6c5afdf4f	privacy issue introduced yesterday	2011-07-26 22:57:48 -07:00