8852 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Zach Prezkuta	1ffd67f291	hey: you missed a spot	2012-08-25 15:07:39 -06:00
Zach Prezkuta	f062ccbb66	add documentation; add to admin panel; some tweaks and interface stuff	2012-08-25 15:03:16 -06:00
fermionic	5cb618bcf1	Merge pull request #444 from fermionic/frost-notifications-sometimes-dont-show ... restore nav element to login pages, since system messages are sent in it	2012-08-25 09:10:01 -07:00
Zach Prezkuta	3413cc1006	restore nav element to login pages, since system messages are sent in it	2012-08-25 10:08:25 -06:00
Zach Prezkuta	bd59f3d152	probably shouldn't require exact match for non-string	2012-08-24 21:46:42 -06:00
fermionic	5fbad0d925	Merge pull request #442 from fermionic/frost-image-upload-and-post-local-time ... fix image and file upload on frost moble; add support to frost for local...	2012-08-24 20:30:27 -07:00
Zach Prezkuta	7c5f5f3113	automatically make posts private for new users	2012-08-24 21:28:28 -06:00
Zach Prezkuta	54d4fc73c4	fix image and file upload on frost moble; add support to frost for local post time	2012-08-24 21:25:39 -06:00
Domovoy	79e748b705	Remove wall to wall checking base on @ tags, too heavy for the database. ... This should be done when we store the item (https://social.errlock.org/display/domovoy/26698)	2012-08-24 05:53:45 +02:00
Domovoy	f746e06a37	wall to wall detection: fallback using @ tags, and check if one is a forum.	2012-08-24 05:21:08 +02:00
Domovoy	9390eda5e6	Revert wall to wall detection based on @ tags (@ can also target a user, not only a forum)	2012-08-24 05:11:39 +02:00
Domovoy	5cd1dde59b	Logic error	2012-08-24 05:04:35 +02:00
Domovoy	32bf36bf97	method, not property	2012-08-24 04:58:51 +02:00
Domovoy	72f3d628e8	Merge branch 'wall_to_wall' of github.com:CyberDomovoy/friendica into threaded_items	2012-08-24 04:58:11 +02:00
Domovoy	c9cfc52293	method, not property	2012-08-24 04:57:32 +02:00
Domovoy	ce0a16df01	Some optimization	2012-08-24 04:48:49 +02:00
Domovoy	71d9c95faf	Merge branch 'wall_to_wall' of github.com:CyberDomovoy/friendica into threaded_items	2012-08-24 04:47:29 +02:00
Domovoy	e3ee997cd3	Fix copy/paste stupidity	2012-08-24 04:45:10 +02:00
Domovoy	8a25c7876c	Better wall to wall detection (fallback on checking if we have a @ tag)	2012-08-24 04:36:03 +02:00
Domovoy	c3ce4e153d	Better wall to wall detection (fallback to finding @ tags)	2012-08-24 04:29:09 +02:00
friendica	1b0dd6f2ec	handle Windows proc_run	2012-08-23 16:36:13 -07:00
friendica	9a50454290	rev update	2012-08-23 16:35:40 -07:00
Domovoy	5dd3e8a990	One click comments on threaded items. ... comment-wwedit-wrapper and wall-item-outside-wrapper get the additional class "threaded" when applicable.	2012-08-23 13:09:35 +02:00
Domovoy	c8ba00d798	Toplevel items a treaded as non-threaded ones (comment-box is at the bottom)	2012-08-23 10:56:22 +02:00
Domovoy	3e5c711a72	Sync objects with upstream	2012-08-23 10:54:21 +02:00
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