8266 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Zach Prezkuta	09a2786882	fix bug that wouldn't show posts to a user who was in an allowed group when individual contacts were also specified in the permissions	2013-02-04 20:27:30 -07:00
Zach Prezkuta	b6bc7daadf	move mb_strlen call out of for loop definition	2013-02-04 20:17:56 -07:00
Zach Prezkuta	d5af6ebfc1	don't show Message button to user on own profile page	2013-02-04 20:14:50 -07:00
Zach Prezkuta	2b94590bbf	elastic transitions	2013-02-04 18:20:47 -07:00
Zach Prezkuta	0e67ba2bd4	update minified javascripts	2013-02-04 18:16:13 -07:00
Zach Prezkuta	bde68bd8ca	add colorbox	2013-02-04 18:09:57 -07:00
Zach Prezkuta	1033e8896f	finish updating themes for colorbox	2013-02-04 18:09:56 -07:00
Zach Prezkuta	0f25455d1b	starting switching to colorbox	2013-02-04 18:09:56 -07:00
Michael Vogel	c9307eb96a	OStatus conversation are now checked every 30 minutes for new answers.	2013-02-04 00:57:23 +01:00
Tobias Diekershoff	9dbe7efce5	ZH-CN: update to the strings	2013-02-03 15:14:57 +01:00
zzottel	7d173a24f4	Merge pull request #598 from zzottel/master ... Reset network when showing a contact's posts	2013-02-01 11:40:14 -08:00
zottel	7db626b1b5	also reset network in mobile themes, smarty3 updates	2013-02-01 20:37:16 +01:00
zottel	e2949ab913	Merge remote branch 'upstream/master'	2013-02-01 20:31:55 +01:00
Tobias Diekershoff	bfe7b5e1c3	ZH-CN: update to the strings	2013-02-01 10:49:32 +01:00
zottel	c0af9b2938	Reset network when showing a contact's posts ... There is similar stuff in the mobile themes, but I didn't touch them because I wasn't sure if I should and how the smarty3 stuff works.	2013-02-01 09:12:37 +01:00
fermionic	0eeda1de5d	Merge pull request #597 from fermionic/20130131-update-minified-js ... script for minifying javascript files	2013-01-31 18:08:09 -08:00
Zach Prezkuta	7d3a923294	script for minifying javascript files	2013-01-31 19:05:27 -07:00
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