18777 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Domovoy	f1bc2afbfe	Merge branch 'master' of https://github.com/friendica/friendica into threaded_items	2012-08-23 10:25:22 +02:00
friendica	386b6d081b	moods	2012-08-22 21:36:55 -07:00
friendica	175849494c	rev update	2012-08-22 20:39:36 -07:00
friendica	4f72e656ca	Merge https://github.com/friendica/friendica into pull	2012-08-21 19:42:37 -07:00
friendica	ff0e0782a5	restore old comment behaviour when threading turned off	2012-08-21 19:41:50 -07:00
friendica	154be4bc5c	rev update	2012-08-21 19:40:28 -07:00
Tobias Diekershoff	07a27d217c	DE more updates to the strings	2012-08-21 08:23:47 +02:00
friendica	179292f758	rev update	2012-08-20 21:36:04 -07:00
Tobias Diekershoff	d470496ead	Quattro: added localtime timestamp title to entries	2012-08-20 11:20:49 +02:00
Tobias Diekershoff	96e6be3c19	DE strings update	2012-08-20 11:12:40 +02:00
friendica	bcec1bddc0	put the real post time into the post	2012-08-19 14:39:43 -07:00
Domovoy	1406480258	Merge branch 'master' of https://github.com/friendica/friendica into threaded_items	2012-08-19 14:14:33 +02:00
friendica	6bc48b58d8	algorithm for crypt tag	2012-08-19 00:35:39 -07:00
friendica	a26b4e8af1	Merge https://github.com/friendica/friendica into pull	2012-08-18 15:18:02 -07:00
friendica	862a12f8f5	rev update	2012-08-18 15:17:07 -07:00
friendica	64b6d26d4f	Merge pull request #441 from fermionic/frost-permission-denied-login-style-wrong ... include login style when necessary	2012-08-18 15:16:43 -07:00
friendica	d8d20f2afa	Merge pull request #440 from fermionic/blank-screen-at-install-end ... template was loaded in the wrong place	2012-08-18 15:16:07 -07:00
Zach Prezkuta	b4a4ccfb2b	include login style when necessary	2012-08-18 14:47:59 -06:00
Zach Prezkuta	d00c98b8b8	template was loaded in the wrong place	2012-08-18 13:28:49 -06:00
Domovoy	b558dbbdb2	add 'thread_level' to $item array (friendica/friendica@fc07f50fd8)	2012-08-18 17:56:38 +02:00
Domovoy	fd29ab9629	Add ability for themes to prevent threading (see friendica/friendica@5e09fc31f5)	2012-08-18 17:49:07 +02:00
Domovoy	8efe4077d3	Correct identification of wall-to-wall items (see friendica/friendica@96b9cda43d)	2012-08-18 17:36:38 +02:00
Domovoy	51802b0ae8	Merge branch 'master' of https://github.com/friendica/friendica into threaded_items	2012-08-18 17:23:46 +02:00
Domovoy	17f9fcaec9	Checks done on topmost parent in local_delivery, closes #10	2012-08-18 17:17:33 +02:00
friendica	22bf48cae9	Merge https://github.com/friendica/friendica into pull	2012-08-17 22:07:12 -07:00
friendica	d96b9cda43	wall-to-wall posts not identified correctly after thread mod	2012-08-17 22:06:13 -07:00
friendica	d233beb4ce	rev update	2012-08-17 22:05:42 -07:00
Domovoy	441c6d79e3	Use correct english	2012-08-17 16:40:41 +02:00
Domovoy	429870015f	Comments on friends are back (stupid typo)	2012-08-17 16:20:28 +02:00
Domovoy	16260e9fbb	Merge branch 'threaded_items' of github.com:CyberDomovoy/friendica into threaded_items	2012-08-17 15:49:23 +02:00
Domovoy	1581e02f8f	Merge branch 'master' of https://github.com/friendica/friendica into threaded_items	2012-08-17 09:46:43 +02:00
Michael Vogel	d40f25ae08	bbcode: Function for cleaning CSS commands (not yet in function) ... items.php: The detection if a rss/atom-title is identically to the body is improved.	2012-08-17 07:59:21 +02:00
fermionic	9ac2231a62	Merge pull request #439 from fermionic/frost-fix-archive-widget ... another javascript that needed $ --> $j	2012-08-16 20:52:50 -07:00
Zach Prezkuta	045f98cddd	another javascript	2012-08-16 21:51:36 -06:00
friendica	86d867f96f	Merge https://github.com/friendica/friendica into pull	2012-08-16 15:24:57 -07:00
friendica	f9d703b8fc	rev update	2012-08-16 15:24:02 -07:00
Thomas Willingham	008d04bdbd	Merge branch 'master' of https://github.com/friendica/friendica	2012-08-16 18:22:20 +01:00
Thomas Willingham	ee998864e6	Make Vier threaded comments not broken. ... These should be inherited from Quattro really, but aren't.	2012-08-16 18:21:33 +01:00
friendica	1e3ebccb97	Merge https://github.com/friendica/friendica into pull	2012-08-15 17:16:24 -07:00
friendica	68d7a3ae01	put a variant of the parent_uri into email notification message-ids. Current message-ids aren't completel legal. More work to do.	2012-08-15 17:14:29 -07:00
friendica	6184b5cf5a	rev update	2012-08-15 17:12:58 -07:00
Thomas Willingham	c47e6dca30	Remove Facebook from newmember text.	2012-08-15 22:26:44 +01:00
Thomas Willingham	a7bd46d38b	Friendicaland	2012-08-15 22:21:20 +01:00
Thomas Willingham	6a714004fa	Remove Facebook from the quick start, since Facebook had done a Twitter.	2012-08-15 22:17:49 +01:00
fermionic	63839c031e	Merge pull request #438 from fermionic/frost-admin-updates-for-mobile-selection ... admin page selector for mobile theme	2012-08-15 08:03:30 -07:00
Zach Prezkuta	3531704d08	admin page selector for mobile theme	2012-08-15 08:54:30 -06:00
friendica	e802c81ec1	fix single quotes	2012-08-15 05:09:44 -07:00
friendica	b8df47e97c	bbcode quote display	2012-08-15 04:52:18 -07:00
friendica	10585ec24f	Merge https://github.com/friendica/friendica into pull	2012-08-15 03:01:23 -07:00
friendica	bb188cbdf2	extra email enotify logging to help convince dreamhost that they've got breakage in one of their queues.	2012-08-15 02:59:17 -07:00