9249 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Tobias Diekershoff	303e5e1b10	ZH-CN: update to the strings	2013-01-31 06:42:10 +01:00
Thomas Willingham	d0d9ae3096	Dispy - remove head.tpl. It isn't actually required, and is the main cause of breakage in the theme.	2013-01-30 02:51:47 +00:00
friendica	be29ae0bce	poco xml returning 500 - but with contents?	2013-01-29 18:36:10 -08:00
friendica	de0098a6b4	rev update	2013-01-29 18:35:25 -08:00
fermionic	1c1902d37c	Merge pull request #596 from fermionic/20130129-call-by-reference-error ... remove deprecated call by reference	2013-01-29 17:46:09 -08:00
Zach Prezkuta	22c962f1fa	remove deprecated call by reference	2013-01-29 18:44:42 -07:00
Michael Vogel	2350aa54eb	OStatus-Conversation auto completion works now. ... Some performance issues added as well.	2013-01-30 01:31:27 +01:00
Fabrixxm	5f80467a8f	Merge remote branch 'friendica/master'	2013-01-29 05:57:53 -05:00
friendica	a804f2b5b5	Merge pull request #595 from fermionic/20130127-profile-permissions ... don't block private posts to logged in users on the local hub	2013-01-28 13:55:55 -08:00
Tobias Diekershoff	50a64a47fc	ZH-CN: update to the strings	2013-01-28 15:23:09 +01:00
Tobias Diekershoff	612af04b1c	DE: update to the strings	2013-01-28 15:21:57 +01:00
Tobias Diekershoff	5c3bce30d6	Merge branch 'master' of git://github.com/friendica/friendica	2013-01-28 07:00:07 +01:00
Tobias Diekershoff	28e4b8512a	ZH-CN: update to the strings	2013-01-28 06:57:44 +01:00
Zach Prezkuta	2635c59c83	don't block private posts to logged in users on the local hub	2013-01-27 22:42:36 -07:00
friendica	ccb465eccd	Merge pull request #594 from fermionic/20130127-add-event-id-index ... add event-id index to prevent large CPU loads when visiting the events page	2013-01-27 19:11:58 -08:00
friendica	a5ac69c65e	Merge pull request #591 from fermionic/20130126-javascript-free-theme ... Decaf mobile: an (almost) Javascript-free theme	2013-01-27 19:11:36 -08:00
friendica	b58189bb98	Merge pull request #592 from fermionic/20130126-richtext-feature-fixes ... make the richtext feature work for events, wall messages, and contact notes	2013-01-27 19:11:06 -08:00
friendica	d4984bff8d	Merge pull request #593 from fermionic/20130127-tinymce-update-and-fixes ... TinyMCE 3.5.8 update; some fixes	2013-01-27 19:10:32 -08:00
friendica	38238972b5	really nitty permission tweaking	2013-01-27 18:10:26 -08:00
Zach Prezkuta	3f77eb80fe	add event-id index to prevent large CPU loads when visiting the events page	2013-01-27 17:52:44 -07:00
Zach Prezkuta	e0dd8944ce	some deleted files for tinymce update	2013-01-27 17:34:10 -07:00
Michael Vogel	9967c9892d	only change parents when parents are changed.	2013-01-28 01:22:00 +01:00
Michael Vogel	e668fece10	ostatus auto completion now seems to work.	2013-01-28 01:16:51 +01:00
Michael Vogel	bc972e16ce	New function to complete threads from ostatus postings	2013-01-27 23:25:04 +01:00
Zach Prezkuta	6668d22d37	try to improve TinyMCE block handling	2013-01-27 14:41:48 -07:00
Zach Prezkuta	d39a2e8a9d	TinyMCE 3.5.8 update; some fixes	2013-01-27 14:26:43 -07:00
friendica	c9cce9873d	search privacy enhancements for those with blocked walls	2013-01-27 13:14:13 -08:00
friendica	ce8f31504e	rev update	2013-01-27 13:13:08 -08:00
Michael Vogel	2cb576d305	Bugfixing after adding timestamps	2013-01-27 13:57:44 +01:00
Zach Prezkuta	a15fff2fc6	mark experimental	2013-01-26 13:10:10 -07:00
Zach Prezkuta	acc4d66cd3	update smart templates	2013-01-26 13:07:54 -07:00
Zach Prezkuta	187b6441c1	make the richtext feature work for events, wall messages, and contact notes	2013-01-26 13:03:01 -07:00
Zach Prezkuta	488a38cd85	Decaf mobile: an (almost) Javascript-free theme	2013-01-26 13:01:57 -07:00
Michael Vogel	fdee002f73	Several improvements for performance measuring	2013-01-26 18:35:39 +01:00
Michael - piratica.eu	2c93067682	Performance: Adding several variables for performance measuring.	2013-01-26 16:46:43 +01:00
friendica	8e62c8b27c	Merge pull request #590 from balderino/master ... Added new files	2013-01-25 16:55:01 -08:00
friendica	37a5ff848d	Merge https://github.com/friendica/friendica into pull	2013-01-25 13:50:27 -08:00
friendica	04b48688b6	add form security to invite page and set maximum per user invites	2013-01-25 13:48:57 -08:00
balderino	8b33873c97	added_new_files	2013-01-25 22:45:48 +01:00
Tobias Diekershoff	ec58e106c2	ZH-CN: update to the strings	2013-01-24 07:38:13 +01:00
Tobias Diekershoff	cb4edf3928	IT: update to the strings	2013-01-24 07:37:16 +01:00
friendica	f542653230	suppress duplicate comment notifications	2013-01-23 17:46:46 -08:00
friendica	d074656f26	Merge https://github.com/friendica/friendica into pull	2013-01-23 17:08:21 -08:00
friendica	b3b0a9de24	die forcefully but gracefully on missing api templates	2013-01-23 17:07:55 -08:00
Fabrixxm	8eb781994b	profile_vcard: add correct menu for profile editing when multiple profiles are disabled	2013-01-23 09:58:30 -05:00
fabrixxm	9b394dbe1e	Merge pull request #589 from fabrixxm/master ... Update fancybox, remove tiptip	2013-01-23 01:19:05 -08:00
Fabrixxm	a875bec75c	update fancybox, remove tiptip from head.tpl	2013-01-22 08:17:23 -05:00
Tobias Diekershoff	1f36ebdb2b	add display_item hook back around l. 686 to the conversation	2013-01-22 08:11:13 +01:00
Tobias Diekershoff	03ec6cabda	PL: update to the strings	2013-01-22 08:01:25 +01:00
Tobias Diekershoff	da12177aea	PL: update to the strings	2013-01-21 08:05:57 +01:00