21277 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Friendika	59a6a04e26	format events for diaspora	2011-09-03 07:13:12 -07:00
Friendika	c8f61ef890	no plink on imported D* posts	2011-09-03 05:23:36 -07:00
Friendika	b026dcb860	match bbcode multiline	2011-09-03 04:36:45 -07:00
Friendika	c8dbf25f51	provide option to block Facebook wall but still allow social stream	2011-09-03 00:52:26 -07:00
Friendika	7c140c5885	Merge branch 'pull'	2011-09-02 22:21:18 -07:00
Friendika	d49895a8a1	Merge pull request #169 from michal-s/master ... minor changes of czech translations	2011-09-02 22:20:47 -07:00
Michal Supler	7813f1798f	minor changes of czech translations	2011-09-03 02:01:15 -03:00
Friendika	574470bf1c	Merge branch 'pull'	2011-09-02 19:28:06 -07:00
Friendika	f186863523	revup	2011-09-02 19:27:32 -07:00
Friendika	887d06cf5e	Merge pull request #168 from Erkan-Yilmaz/master ... typo in German page: admin > log	2011-09-02 19:27:21 -07:00
Erkan Yilmaz	508a13da00	inital info for Facebook + CC by licence ... further info here: http://groups.google.com/group/friendika/browse_thread/thread/7562e0b22f815a79	2011-09-03 04:01:24 +02:00
Erkan Yilmaz	652d43955b	Merge remote branch 'upstream/master'	2011-09-03 03:58:40 +02:00
Friendika	9e9b6a3dd1	zot: dealing with foreign messages	2011-09-02 05:46:00 -07:00
Friendika	93b9d71377	completely enclose ~f hashtags so they don't get hijacked by D*	2011-09-02 05:13:38 -07:00
Friendika	7bee0bff0d	protocol update, require a recipient encrypted envelope or it cannot be ... decrypted.	2011-09-02 01:56:02 -07:00
Erkan Yilmaz	463a136c15	typo in German admin log page	2011-09-02 10:17:17 +02:00
Friendika	ada2384fbb	Merge pull request #167 from Erkan-Yilmaz/master ... typos, adapt to identi.ca situation	2011-09-01 23:30:36 -07:00
Erkan Yilmaz	0401130246	typos + adapt	2011-09-02 08:15:36 +02:00
fabrixxm	00e1759a54	Merge pull request #166 from Erkan-Yilmaz/master ... typo in widget plugin text	2011-09-01 23:10:38 -07:00
Erkan Yilmaz	ecd2fe4592	typos in README files of plugins: impressum + statusnet	2011-09-02 07:48:07 +02:00
Erkan Yilmaz	55e138a7c0	typo in widget plugin text	2011-09-02 07:37:09 +02:00
Friendika	16c24b13a0	Merge pull request #165 from Erkan-Yilmaz/master ... update twitter plugin README: typos + new menu structure	2011-09-01 22:15:48 -07:00
Erkan Yilmaz	5a7934012c	fix README for twitter plugin: typos + change to new menu structure	2011-09-02 07:07:03 +02:00
Friendika	71f71ecf46	error viewing logfiles over 2Gb	2011-09-01 21:54:04 -07:00
Friendika	a33edb0042	infrastructure for personalised @ tags (no UI/settings form yet), allow own comments through statusnet connector	2011-09-01 18:02:08 -07:00
Friendika	ef1b99aa44	Merge branch 'pull'	2011-09-01 06:30:38 -07:00
Friendika	1621630b06	login_hook	2011-09-01 06:29:29 -07:00
Fabio Comuni	058e329dfb	Fix profile vcard and style	2011-09-01 12:37:30 +02:00
fabrixxm	af62c81b8b	Merge pull request #164 from fabrixxm/master ... small fix to IT strings	2011-09-01 03:36:47 -07:00
Fabio Comuni	18f6d4e639	small fix to IT strings	2011-09-01 12:39:42 +02:00
fabrixxm	f006b8385a	Add some links to external resources	2011-09-01 12:07:17 +03:00
Friendika	0cfc8570d2	save plink for diaspora items so likes will point to right post	2011-08-31 21:46:37 -07:00
Friendika	3cd8ee7161	more clarification w/r/t sender|from	2011-08-31 21:23:40 -07:00
Friendika	344f12c8c4	sender verification	2011-08-31 21:18:23 -07:00
Friendika	d64f9ad97a	allow browser cookies to avoid multiple redirects	2011-08-31 20:23:13 -07:00
Friendika	2bcd43cb1f	xml+atom was backwards	2011-08-31 20:17:21 -07:00
Friendika	8193ff426f	change MUST to SHOULD w/r/t data formats	2011-08-31 19:49:51 -07:00
Friendika	8bb9226471	add new cut of zot/zid protocol	2011-08-31 19:43:59 -07:00
Fabio Comuni	8b615133d5	remove html from profile vcard code	2011-08-31 17:31:44 +02:00
Fabio Comuni	54f0685a03	quattro: more colors	2011-08-31 17:30:48 +02:00
Fabio Comuni	62295af1f2	quattro: cleanup and split of less files	2011-08-31 16:19:17 +02:00
Fabio Comuni	b38d6d97c3	Avoid a small error in admin	2011-08-31 16:18:37 +02:00
Fabio Comuni	5ce6f893a6	Apps popup menu in navbar	2011-08-31 16:18:03 +02:00
Fabio Comuni	71d44d78ec	Installed apps as array instead of string	2011-08-31 16:17:32 +02:00
Friendika	c60d45752d	translate D* images (markdown) before links, they overlap and conflict	2011-08-30 23:24:45 -07:00
Friendika	f0c3a75ff3	youtube redirect fixes	2011-08-30 23:09:39 -07:00
Friendika	b11a0efff1	This *might* fix Diaspora @ tags - or it might not.	2011-08-30 20:20:17 -07:00
Friendika	f0a4a6af61	relayed likes did not verify	2011-08-30 19:20:56 -07:00
Friendika	f8da48a880	unsafe chars in admin, add img to diaspora markdown processor	2011-08-30 18:46:34 -07:00
Fabio Comuni	d0926240a8	Merge remote-tracking branch 'friendika/master' into newui	2011-08-30 11:00:23 +02:00