668 commits

Author	SHA1	Message	Date
Hypolite Petovan	3772cf7544	Move Object\Conversation to Object\Thread ... - Move Object\Item to Object\Post	2017-12-07 23:57:37 -05:00
Hypolite Petovan	4b0f83a12b	Finish renaming Object\Item to Object\Post	2017-12-07 23:50:38 -05:00
Michael Vogel	5747cfc79c	Revert "Move Objects to Model"	2017-12-08 05:21:51 +01:00
Hypolite Petovan	70d047ba8e	Move Object\Conversation to Object\Thread ... - Move Object\Item to Object\Post	2017-12-07 09:05:23 -05:00
Hypolite Petovan	18d93cddf6	Move Object\Contact to Model\Contact	2017-12-07 09:04:24 -05:00
Michael	0608efc38a	We've got no mood anymore	2017-12-07 07:01:55 +00:00
Adam Magness	b1d16fbdf7	Update use statements ... update use statements for rename to singular.	2017-12-04 09:04:36 -05:00
Adam Magness	6e5471def3	Rename to singular ... Rename and update references. Standards and a require_once.	2017-12-04 09:01:27 -05:00
Adam Magness	2f0da29c75	Features to src ... Move Features to class in Friendica\Content namespace. Update function calls and references.	2017-12-04 08:33:49 -05:00
Michael	8bffee43b3	Threads are now always enabled.	2017-11-28 18:54:39 +00:00
Michael	9612496e9e	The function "template_escape" doesn't exist anymore.	2017-11-27 06:44:49 +00:00
Michael	3046455b1c	Some posts weren't shown	2017-11-24 21:39:12 +00:00
Hypolite Petovan	5ee728972e	Remove include/Contact.php ... - Remove all mentions to include/Contact.php	2017-11-19 17:05:21 -05:00
Hypolite Petovan	ec02af593d	Change called method names ... - Add GlobalContact::getRandomUrl - Rename Contact::getIdForURL - Rename Diaspora::sendUnshare - Remove unused parameter $self in Contact::terminateFriendship	2017-11-19 17:03:39 -05:00
Hypolite Petovan	b92fc24ff0	Add Contact Object ... - Add Profile Object - Add User Model - Add use statements	2017-11-19 16:55:28 -05:00
Hypolite Petovan	f43aaf5227	Move Item and Conversation from Core to Object ... - Move BaseObject from Core\ to Friendica\	2017-11-19 16:50:49 -05:00
Adam Magness	d9e9cbe753	Coding Standards ... A few updates for coding standards	2017-11-19 15:32:54 -05:00
Hypolite Petovan	cfd5e5d475	Add orphan items as children to their top-level post ... - Make get_item_children deplete the item list	2017-11-19 10:42:00 -05:00
Hypolite Petovan	4aa003f43f	Use constant instead of hardcoded string for ACTIVITY_POST	2017-11-19 08:41:33 -05:00
Hypolite Petovan	0fe4233569	Improve documentation with brief key	2017-11-19 08:41:16 -05:00
Hypolite Petovan	81c3ddd1fb	Add smart_flatten_conversation function ... - Fix doc - Fix formatting - Update conv_sort with smart threading	2017-11-19 00:57:06 -05:00
Adam Magness	d127d06388	Item to src ... object/Item moved to Friendica\Core namespace.	2017-11-16 16:39:42 -05:00
Adam Magness	7c00401c66	Conversation to src ... object/Conversation moved to Friendica\Core namespace.	2017-11-16 16:39:42 -05:00
Adam Magness	4ca68c7af0	Class file relocations ... Issue #3878	2017-11-08 08:37:03 -05:00
Adam Magness	0dfa57948f	Issue-#3873 ... Replace deprecated functions with new syntax.	2017-11-07 06:24:39 -05:00
rabuzarus	f2d51737eb	fix some HTML violations in frio	2017-10-20 15:21:42 +02:00
Michael	eeec1ea163	We should take the event-id as well	2017-10-11 20:45:03 +00:00
Michael	42a76bced9	export event data for display purposes	2017-10-11 19:51:18 +00:00
Michael	5adfeb0bd5	App::get_baseurl is now replaced with System::baseUrl	2017-08-26 07:32:10 +00:00
Michael	3c24bed412	New class "System"	2017-08-26 06:04:21 +00:00
Michael	17b05c9ad9	Hash tag links now do a redir	2017-08-19 09:22:50 +00:00
Michael	0ac725dc47	Some more updated queries	2017-08-12 22:15:16 +00:00
Michael	d810b21f87	New dba functions	2017-08-11 08:04:01 +00:00
Michael	fce72cbbc8	Modifed "update" and "insert" function / many changed queries	2017-08-09 21:12:41 +00:00
Michael	c98ae304c0	Endless scroll now avoids showing the same items	2017-07-31 06:04:37 +00:00
Hypolite Petovan	9c0d2c31e8	Replace AND and OR in PHP conditions by && and ||	2017-06-07 22:00:59 -04:00
Hypolite Petovan	20043914e6	Move App to src ... - Add `use Friendica\App;` wherever needed	2017-05-02 22:59:36 -04:00
Hypolite Petovan	56ee734b00	Cleanup /format pre-move	2017-05-02 22:59:24 -04:00
Roland Haeder	f2f20c85d5	added spaces ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-14 16:27:06 +02:00
Roland Haeder	be59fe86e5	added space + type-hinted $a (App) ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-14 15:29:50 +02:00
Roland Haeder	e325c6ec85	opps, missed this one. ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-09 00:28:48 +02:00
Roland Haeder	d07236deb6	huh? missed again ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 20:08:22 +02:00
Roland Haeder	cd697e0d7c	more spaces! ;-) ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 20:07:40 +02:00
Roland Haeder	0319517f94	more curly braces ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 20:06:56 +02:00
Roland Haeder	6ff0b15873	more spaces + curly braces ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 20:05:56 +02:00
Roland Haeder	577e93e9fc	added spaces ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 20:04:33 +02:00
Roland Haeder	bc5d1015b3	added curly braces ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 20:03:21 +02:00
Roland Haeder	a66f6fe668	more spaces and curly braces ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 20:01:04 +02:00
Roland Haeder	3220234693	more spaces ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:10:50 +02:00
Roland Haeder	a0e5f7a59a	added spaces + curly braces and TODOs for upcoming type-hint rewrite. Please ... note that PHP5 allows 'array' as type-hint already (+ interface/class name). Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-08 19:05:50 +02:00
Roland Haeder	03571f6e74	added spaces + some curly braces + some usage of dbm::is_result() ... Signed-off-by: Roland Haeder <roland@mxchange.org>	2017-04-04 19:46:56 +02:00
Hypolite Petovan	7b352f3f74	Revert "Coding convention applied - part 1"	2017-03-21 12:02:59 -04:00
Roland Häder	fbd559a823	more spaces + some curly spaces added ... Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:52:24 +01:00
Roland Häder	ed0d858f98	added spaces + some curly braces ... Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:52:24 +01:00
Roland Häder	951006dd10	more spaces + some curly spaces added ... Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:51:54 +01:00
Roland Häder	41a36606c6	added spaces + some curly braces ... Signed-off-by: Roland Häder <roland@mxchange.org>	2017-03-19 00:50:19 +01:00
Hypolite Petovan	67ae0fed7f	Fix response "self" assigment ... - Switch from unreliable `uid` matching to `author-id` using public_contact()	2017-03-06 05:07:17 -05:00
Hypolite Petovan	9d5384f107	- Remove tinyMCE mentions or convert to addeditortext() ... - Remove $editselect template value	2017-01-26 22:50:27 -05:00
Hypolite Petovan	87eb3d5ef2	Normalize App parameter declaration (doc-include folders, boot)	2017-01-09 23:09:01 +11:00
Roland Haeder	6c0c9d542a	Continued with coding convention: ... - added curly braces around conditional code blocks - added space between if/foreach/... and brace - rewrote a code block so if dbm::is_result() fails it will abort, else the id is fetched from INSERT statement - made some SQL keywords upper-cased and added back-ticks to columns/table names Signed-off-by: Roland Haeder <roland@mxchange.org>	2016-12-20 21:16:49 +01:00
Roland Häder	fc9dbc0899	added spaces + curly braces ... Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-20 11:38:28 +01:00
Roland Häder	884f44ce94	*much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied) ... Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-19 14:27:16 +01:00
Roland Häder	a905522eb5	Cleanup for #3010 - added spaces, thanks to @annando . ... Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-14 09:42:36 +01:00
Roland Häder	6a8a36f12d	More usage of dbm::is_result($r) instead of count($r): ... - count() returns very different results and never a boolean (not even false on error condition). - therefore you should NOT use it in boolean expressions. This still *can* be done in PHP because of its lazyness. But it is discouraged if it comes to more clean code. Signed-off-by: Roland Häder <roland@mxchange.org>	2016-12-13 10:44:13 +01:00
Tobias Diekershoff	1fc35d5f44	Merge pull request #2979 from annando/issue-2772 ... Issue 2772: Pending contacts should now be displayed	2016-12-01 08:51:04 +01:00
Michael	63389ba23d	Pending or blocked - that's the question ...	2016-11-30 04:30:48 +00:00
Michael	624fabf884	Somehow the changes of pull request 2748 got vanished	2016-11-29 20:25:27 +00:00
Michael	3a76a6766f	Issue 2772: Pending contacts should now be displayed	2016-11-28 22:11:13 +00:00
Hypolite Petovan	4937a3b7d8	Add the self property to conversation responses ... - Add a condition to check if the current user is amongst the responses - Populate the responses array with the self attribute	2016-11-22 18:35:19 +01:00
Michael	3de862712d	Issue 2772: Posts from pending contacts should be displayed as well.	2016-11-20 16:52:57 +00:00
Hypolite Petovan	4b0e76f3b7	Fix Issue #2803 - Hovercard view profile link and public directory link ... - Change "Edit Contact" link to "View Contact" in `include/Contact.php` and `include/conversation.php` - Add zrl parameter to public directory on single user instances - Improved formatting of modified functions	2016-10-22 22:49:12 -04:00
Tobias Diekershoff	252f1827c1	correction of typos	2016-09-24 08:08:04 +02:00
Michael Vogel	1cb6043aea	Attachments are now displayed again.	2016-09-04 18:06:07 +02:00
Michael Vogel	c02b1c3f36	The "tagged with" message now works again.	2016-09-03 12:48:51 +02:00
rabuzarus	c1555b623a	best_link_url: don't use redirect for pending contacts	2016-08-26 15:47:45 +02:00
Michael Vogel	0a46a3d10e	Bugfix: Avatar pictures of mail contacts weren't displayed correctly	2016-07-11 20:42:18 +02:00
rabuzarus	073f520cee	add missing strings for frio	2016-06-25 12:21:13 +02:00
Michael Vogel	0adff6f6b8	Fix for author-thumb/owner-thumb - DFRN: Relocate stuff	2016-06-19 20:01:25 +02:00
Michael Vogel	91db7a549c	Optimised the amount of function for the item query	2016-06-19 08:32:38 +02:00
Michael Vogel	e512a83ecc	Massively updated avatar handling	2016-06-19 01:07:20 +02:00
Michael Vogel	7f5a2d5c23	Categories were missing	2016-06-14 09:50:17 +02:00
Michael Vogel	2815173a52	Bugfix: Items weren't sorted correctly	2016-06-13 22:20:09 +02:00
Michael Vogel	125d80292b	Some cleanup	2016-06-12 23:06:48 +02:00
Michael Vogel	c05898c57d	The queries for items are unified (a little bit)	2016-06-12 21:04:55 +02:00
Michael Vogel	3e7e866e13	Baseurl removed	2016-06-05 21:22:14 +02:00
Michael Vogel	ea3a6ec6eb	Some more cleanup and code removal.	2016-06-05 20:01:38 +02:00
Michael Vogel	71d3274841	Unified contact data handling	2016-06-05 13:57:11 +02:00
Michael Vogel	4a388e84af	Frio: Adopt changes to search_item.tpl as well.	2016-05-28 13:08:43 +02:00
Michael Vogel	7d4c99ebbc	"get_baseurl" and "z_root" are disappearing ...	2016-02-17 23:47:32 +01:00
Michael Vogel	c5b724828a	Just some more removed baseurls ...	2016-02-17 08:08:28 +01:00
Michael Vogel	092c2e5433	Removed some test code	2016-01-15 23:32:13 +01:00
Michael Vogel	90a8d6f0f5	Several performance improvements	2016-01-15 23:27:25 +01:00
Michael Vogel	c4ba035ee3	Add some analysing stuff, rendered value is written now more often	2016-01-14 21:56:37 +01:00
fabrixxm	5758302f21	small doxigen comment fix	2016-01-02 12:53:42 +01:00
Michael Vogel	143e1a4a83	Bugfix: Warning because of undefined constant	2015-12-13 09:43:47 +01:00
Michael Vogel	42d903dd68	Redesign of the contact pages, new tab for contact statuses	2015-11-29 23:22:05 +01:00
Michael Vogel	37f466d16e	Prevention of endless loops in the conversation	2015-11-18 23:57:53 +01:00
rabuzarus	642f3fca1a	fix translation bug for likers	2015-10-14 19:48:57 +02:00
rabuzarus	5c2923869a	this got lost by merge	2015-10-11 20:00:54 +02:00
rabuzarus	649578ae33	Merge develop-new into event-attendance-new ... Conflicts: include/conversation.php	2015-10-11 19:39:55 +02:00
Michael Vogel	48309a25ec	Merge remote-tracking branch 'upstream/develop' into 1510-contact-menu ... Conflicts: include/conversation.php	2015-10-11 05:11:46 +02:00
Tobias Diekershoff	27fa20ab22	Merge pull request #1947 from annando/1510-diaspora-follower ... Reworked contact relations between Diaspora and Friendica	2015-10-10 18:50:20 +02:00
Michael Vogel	bb0dff2c75	Improved contact menu	2015-10-10 16:23:20 +02:00
Michael Vogel	efbdb57f92	Reworked contact relations between Friendica and Diaspora	2015-10-10 11:06:18 +02:00
rabuzarus	0eae67ea48	update attendance state on profile wall	2015-10-09 14:20:01 +02:00
Michael Vogel	16da708e07	Contact names with ">" and "<" are a problem ...	2015-10-09 07:39:38 +02:00
rabuzarus	ba1207e6e1	translate attendance with localize_item()	2015-10-08 22:23:09 +02:00
Michael Vogel	61c3ce7a21	Bugfix: The contact names had to be escaped	2015-10-08 00:25:55 +02:00
Michael Vogel	1f0b759e2f	Added resize possibility to proxy function	2015-10-07 08:25:10 +02:00
Michael Vogel	a663e4693f	Further improvement of the contact menu	2015-10-04 23:41:13 +02:00
Michael Vogel	b037f977fa	The contact menu is now improved (for example a "Follow" link)	2015-10-04 21:17:28 +02:00
rabuzarus	7cb4ea52fd	port of the event attendance feature of red matrix with example implementation for vier theme.	2015-09-30 16:58:02 +02:00
rabuzarus	2ff67ef5ed	fixes like/dislike for photos	2015-09-30 14:39:00 +02:00
rabuzarus	f5c7006f30	rest of the consensus porting work and integration into friendica ... Credits to Mike Macgirvin for the code	2015-09-30 14:38:13 +02:00
rabuzarus	0077494396	make event confirmation work	2015-09-30 14:35:17 +02:00
rabuzarus	37fccee503	first work for consensus	2015-09-30 14:34:10 +02:00
Michael Vogel	ccaeb00973	Better link descriptions.	2015-08-08 22:30:43 +02:00
Michael Vogel	b4d09777b9	Added many accesskeys ...	2015-08-08 17:33:43 +02:00
Michael Vogel	836432bb9a	Removed Google Maps	2015-06-30 07:42:59 +02:00
rabuzarus	729b7f0e72	restore jotplugins	2015-06-27 15:11:18 +02:00
rabuzarus	5ce125d6e0	cleanup of some unused code	2015-06-26 15:13:52 +02:00
rabuzarus	37501a883e	make notes work	2015-06-25 22:57:26 +02:00
Michael Vogel	0e895e24f7	Code reworks: replaced hardcoded network text with the corresponding constants.	2015-04-11 22:14:56 +02:00
Fabrixxm	5d19b21298	fix translation of poke activity body	2015-02-09 11:54:50 +01:00
Michael Vogel	58d814b793	issue 1283 - Share-it button support for friendica	2015-01-25 00:10:58 +01:00
Michael Vogel	d4b2d3bf8a	Moved "privacy_image_cache" into the core. Enabled by default, can be disabled in the page settings.	2014-08-13 00:13:13 +02:00
Michael Vogel	f68bbffb64	Adding preview value to "prepare_body" hook. (Will be used in addons for network related previews)	2014-07-09 20:44:12 +02:00
Michael Vogel	acf1c3956c	Only show connectors when not "hide wall" is enabled.	2014-05-10 00:24:15 +02:00
Michael Vogel	01971428aa	target="_blank" instead of target="external-link"	2014-02-11 23:42:06 +01:00
Michael Vogel	aed28a24f1	Merge remote-tracking branch 'upstream/master' ... Conflicts: mod/crepair.php	2014-01-05 16:22:42 +01:00
Michael Vogel	d5ae5ecedd	- Improved speed due to forced indexes when showing items. ... - Possibility to setup a hostname	2013-09-15 10:40:58 +02:00
friendica	1d358fe6de	system support for complete blocking	2013-04-28 21:02:53 -07:00
Michael Vogel	93143702ed	Merge remote-tracking branch 'upstream/master' ... Conflicts: boot.php database.sql library/fancybox/jquery.fancybox-1.3.4.css mod/search.php update.php	2013-02-17 12:35:40 +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
Michael Vogel	2cb576d305	Bugfixing after adding timestamps	2013-01-27 13:57:44 +01:00
Zach Prezkuta	488a38cd85	Decaf mobile: an (almost) Javascript-free theme	2013-01-26 13:01:57 -07:00
Tobias Diekershoff	1f36ebdb2b	add display_item hook back around l. 686 to the conversation	2013-01-22 08:11:13 +01:00
Michael Vogel	4e3d0018c6	Merge remote-tracking branch 'upstream/master' ... Conflicts: boot.php include/items.php update.php	2013-01-20 14:07:57 +01:00
Michael Vogel	82c00660e0	Preloading of items in the cache when receiving them.	2013-01-17 23:20:40 +01:00
Michael Vogel	5501dd0759	Searching for tags has been enabled in all places. The tag detection has been improved for imports with missing line feeds.	2013-01-13 17:13:01 +01:00
Zach Prezkuta	74caf1a4a7	* Add MIME types for file attachments ... * Restore translatability to mood phrases * Prevent casting of "false" in html2plain * Allow attachments with a comma in the filename * Fix/optimize ACL img data-src jQuery search * Fix bug when uploading files with a comma in the name using Chrome/Chromium * Babel nicer output formatting * Remove obsolete "plaintext" check in mod/parse_url * Restore TinyMCE live insertion of images * Smarty conversion script: add --no-header option to suppress warning headers in Smarty template files	2013-01-12 06:31:32 -07:00
Zach Prezkuta	e684324032	use explicit include paths	2012-12-28 14:51:50 -07:00
Zach Prezkuta	263fe0f6bc	revert unnecessary variable name changes	2012-12-26 10:42:01 -07:00
Zach Prezkuta	53a4cf5339	only use Smarty if the view/smarty3/ directory is writable; location bug fix	2012-12-23 06:16:35 -07:00
Zach Prezkuta	96ed0a7791	Implement Smarty3	2012-12-22 12:57:29 -07:00
Zach Prezkuta	94204d9160	implement features	2012-11-22 09:14:22 -07:00
Zach Prezkuta	999c3439e6	fix mobile photo uploads; better theme control; frost improvements	2012-11-06 08:43:19 -07:00
Zach Prezkuta	c9248b66db	display live update; don't collapse comments on live update	2012-11-01 18:31:50 -06:00
Zach Prezkuta	6effdd570c	add a confirm dialog and a busy rotator for delete selected	2012-11-01 17:42:40 -06:00
Zach Prezkuta	e9b26ffbb3	prevent double posting of status updates and comments	2012-11-01 17:14:42 -06:00
Zach Prezkuta	d98974572b	fix theme control of allowing threading	2012-11-01 10:33:01 -06:00
Zach Prezkuta	4fd339b216	add live div to wall page	2012-10-29 12:43:52 -06:00
Zach Prezkuta	0ea89852d2	allow themes to decide where live updates appear	2012-10-09 09:41:33 -06:00
friendica	cef5169567	subscribe-to/follow threads	2012-09-27 19:53:55 -07:00
friendica	e433f20cd8	sort out the 'delete selected' mess	2012-09-25 19:10:46 -07:00
friendica	245d9f0aca	one template to rule them all	2012-09-25 01:31:48 -07:00
friendica	054f8edb59	zeros - theming for new categories/folder display	2012-09-23 19:22:48 -07:00
friendica	c3b4f9f0d3	support for bringing back cats/folders	2012-09-23 17:16:37 -07:00
Fabrixxm	dd25c7db7e	more $item data ... - add $item.categories and $item.folders to object/Item.php - add $item.hastags and $item.mentions to object/Item.php - add $item.total_comments_num and $item.total_comments_text to object/Item.php (those are set for top_level item also with no comments) - move get_cats_and_terms() to include/text.php	2012-09-20 09:46:49 +02:00
Fabrixxm	40f2ec189e	Merge remote branch 'friendica/master' into blog-like	2012-09-20 02:48:54 -04:00
Zach Prezkuta	da7c5b19b1	allow hidden comments phrase to be accessed separately as number and text	2012-09-19 21:31:26 -06:00
Fabrixxm	b400ddd22d	conversation: new 'categories' and 'folder' elements to $item ... remove static "Filed under" e "Category" text from message body both are lists of array whith 'name' : category/folder name 'remove': url to remove 'first': bool first in array 'last' : bool last in array	2012-09-19 11:38:32 -04:00
friendica	66081201bc	allow "subscribe to thread" activities to exist without displaying them.	2012-09-18 20:12:55 -07:00
friendica	669d2b890e	rev update - add cancel markup to editor	2012-09-15 15:23:15 -07:00
friendica	d19a3b8324	provide separate hashtag and mentions for themes in addition to composite tags	2012-09-13 16:59:25 -07:00
Domovoy	16eec24a21	Tabs trouble? What happened? I sure aven't changed anything to my editor...	2012-09-10 10:36:30 +02:00
Domovoy	1b82df60db	Port friendica/friendica#79012bf8882baa6843726bcffbcafe959028c1bd	2012-09-10 09:50:30 +02:00
Domovoy	bb68461c6d	Merge branch 'master' of https://github.com/friendica/friendica into threaded_items ... Conflicts: include/conversation.php	2012-09-10 09:19:08 +02:00
friendica	1478229abc	allow comments on other folks wall-to-wall postings	2012-09-05 18:24:06 -07:00
friendica	411b6a71b4	Merge https://github.com/friendica/friendica into pull	2012-09-04 22:53:32 -07:00
friendica	4cd8233f61	remote_user can now support multiple contacts being logged in at once	2012-09-04 22:50:28 -07:00
Zach Prezkuta	79012bf888	conversation needs preview parameter	2012-09-04 18:47:49 -06:00
Domovoy	ef52ff6b01	Merge branch 'master' of https://github.com/friendica/friendica into threaded_items	2012-08-30 07:47:21 +02:00
Zach Prezkuta	72712175b5	regular expressions were grabbing too much	2012-08-26 14:56:34 -06: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	c9cfc52293	method, not property	2012-08-24 04:57:32 +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
friendica	386b6d081b	moods	2012-08-22 21:36:55 -07:00
friendica	ff0e0782a5	restore old comment behaviour when threading turned off	2012-08-21 19:41:50 -07:00
friendica	bcec1bddc0	put the real post time into the post	2012-08-19 14:39:43 -07:00
friendica	d96b9cda43	wall-to-wall posts not identified correctly after thread mod	2012-08-17 22:06:13 -07:00
Zach Prezkuta	5e09fc31f5	Threading updates ... - Add rudimentary thread handling to Frost - Fix possible CSS bug in several themes from threading update - Add ability for themes to prevent threading	2012-08-11 14:36:58 -06:00
friendica	d4b6188356	getting comment counts correct in a threaded world	2012-08-11 01:26:10 -07:00
friendica	95bf9324b4	fix child count	2012-08-10 23:42:45 -07:00
friendica	20be1778db	bring likes back - comment ordering is still a bit funky	2012-08-10 16:36:44 -07:00
Fabrixxm	fc07f50fd8	conversation: add 'thread_level' to $item array	2012-08-10 05:42:36 -04:00
friendica	4894619d7b	bring back "delete selected items" - but need to pass pagedropping to each item	2012-08-09 23:01:37 -07:00
Domovoy	4cc6bf660c	The number of comments shown when collapsed is the total of all the descendant items.	2012-08-07 09:53:53 +02:00
Domovoy	dac88fce56	Remove database update, use fallback solution instead.	2012-08-05 15:08:31 +02:00
Domovoy	e247915f48	Merge branch 'master' of https://github.com/friendica/friendica into threaded_items ... Conflicts: include/conversation.php	2012-08-05 13:43:53 +02:00
Zach Prezkuta	63628910b2	-- Allow themes to specify an "app" name for posted status updates and comments (via a generic and translateable $sourceapp parameter) ... -- More HTML cleanup in TPL files -- Various Frost bug fixes and tweaks	2012-08-04 14:02:39 -06:00
Domovoy	8742beb772	Flatten children when threads are disabled	2012-08-03 22:28:21 +02:00
Domovoy	ea7db7b7a8	Threaded items in every page concerned. Some code cleanup.	2012-08-03 21:55:17 +02:00
Domovoy	07f87848b4	Merge branch 'master' of https://github.com/friendica/friendica into threaded_items	2012-07-30 13:36:33 +02:00
Zach Prezkuta	067865db9e	fix filer bug; some interface tweaks	2012-07-29 14:49:12 -06:00
Domovoy	7b2ca538c8	Fallback to the old behavior for unhandled conversations mode.	2012-07-29 21:11:19 +02:00
Domovoy	56f0ee4915	Threaded items on profile page	2012-07-29 20:41:11 +02:00
Domovoy	3b330510ea	Fixed misbehaviour in collapsing	2012-07-29 20:09:51 +02:00
Domovoy	2fc0fcdc18	Unlimited level threading is now a site option.	2012-07-29 19:53:04 +02:00
Domovoy	25015d3ab9	Update now handles threaded items.	2012-07-29 18:39:38 +02:00
Domovoy	8ea3087342	Collapsing is back for threaded comments. ... Comment box is displayed at the end of the thread. Comments on comments are all collapsed	2012-07-29 17:13:21 +02:00
Domovoy	10eb873f7c	Merge branch 'master' of https://github.com/friendica/friendica into threaded_items	2012-07-29 10:03:17 +02:00
Zach Prezkuta	1f09e7ad23	Modify Javascript to improve page loading times ... 1. Add template category 'end' that places content right before final </body> tag 2. Move most Javascript from tpl files into one cacheable file, theme.js 3. Load scripts at end of the HTML document instead of in the header 4. Minify several Javascript files Note that the second and third things were only done for Frost and Frost Mobile. Doing it for every theme means going through every .tpl for every theme and rearranging the Javascript, which is tedious.	2012-07-28 09:57:16 -06:00
Domovoy	d558d25540	CommentBox is now hidden by default, this can be toggled with a fake link	2012-07-27 22:47:18 +02:00
Domovoy	8ecf8167db	Threaded comments are starting to work. ... For now, only on normal view, and not during update	2012-07-27 22:08:57 +02:00
Domovoy	2a1657e361	Revert "Progress on #1. Comments are now threaded, at least in the database, for normal view." ... This reverts commit da1b47a029. Useless, comments are already threaded in the database using parent-uri	2012-07-23 13:58:47 +02:00
Domovoy	da1b47a029	Progress on #1. Comments are now threaded, at least in the database, for normal view.	2012-07-23 12:56:47 +02:00
friendica	9c72b45f36	and the main photo menu	2012-07-19 21:27:22 -07:00
friendica	d442bbc482	have fun...	2012-07-19 18:17:16 -07:00
friendica	02d88e7cbe	name mixup in wall-to-wall hovertips	2012-07-15 20:56:09 -07:00
friendica	7f7e2c5de0	add plink to profile notifications	2012-07-12 16:12:37 -07:00
friendica	085b589468	add some sparkle to plinks	2012-07-11 21:04:08 -07:00
Zach Prezkuta	da2ccebed8	fix bugs	2012-07-07 18:50:33 -06:00
Zach Prezkuta	173b3a1b9a	allow more than one embedded private photo	2012-07-07 16:24:20 -06:00
friendica	6cc844b2f9	restore 'shareable' to feeds after recent feed privacy re-factoring	2012-06-30 05:16:30 -07:00
friendica	a3edbf7e5d	create third privacy state - public post but not searchable or publicly visible	2012-06-28 17:43:29 -07:00
friendica	1574396d04	sort out some "like" issues	2012-06-23 21:11:18 -07:00
friendica	7a346bc756	this is going to take some more debug before it can be roller out	2012-06-23 07:43:56 -07:00
friendica	22ca358a8c	like comments	2012-06-23 05:46:15 -07:00
friendica	7614d35cad	liking comments backend	2012-06-23 04:44:48 -07:00
Zvi ben Yaakov (a.k.a rdc)	ff2f7dfeef	Added App::get_cached_avatar_image usage on conversation wall of Normal View	2012-06-19 16:05:39 -07:00
Zvi ben Yaakov (a.k.a rdc)	ac50c9e84d	Beginning to use App::get_cached_avatar_image for loading profile images in conversations	2012-06-19 16:05:38 -07:00
friendica	267681844d	poll even if contact hasn't responded recently, so we can update the termination status	2012-06-14 17:27:07 -07:00
friendica	3b9c3d886d	sheesh	2012-06-11 16:21:27 -07:00
friendica	daa4f5213f	zrl's when visiting public photos at the source site	2012-06-03 01:53:11 -07:00
friendica	29bdf432f0	fewer "bob smith to bob smith via wall-to-wall".	2012-06-02 00:40:38 -07:00
friendica	a163825291	redir links for permission controlled attachments	2012-05-21 22:54:39 -07:00
friendica	4e0b0d4e43	fix search/new against possible email leakage	2012-05-11 05:19:29 -07:00
friendica	20229ce187	better test of email reply visibility	2012-05-11 05:11:53 -07:00
friendica	53157bb954	send browser back to correct page (with query args) after posting	2012-05-09 04:18:01 -07:00
friendica	3c6cf1f19c	make comment edit icons look more like base theme	2012-04-26 19:55:20 -07:00
Tobias Hößl	720c8324c7	Some Bugfixes, and variable checks	2012-04-17 11:33:50 +00:00
friendica	fd2f7dd6ae	turn on comment edit	2012-04-16 03:51:48 -07:00
Michael Vogel	ee714daf4d	Merge commit 'upstream/master'	2012-04-11 19:35:51 +02:00
Michael Vogel	c88c2515e4	API: Improved the timeline. Several (disabled) tests with caching of photos.	2012-04-11 19:31:01 +02:00
friendica	640f258f18	cleanup photo menus	2012-04-10 19:33:32 -07:00
Alexander Kampmann	355c42cb30	Merge branch 'master' of https://github.com/friendica/friendica ... Conflicts: include/config.php update.php	2012-04-05 13:39:15 +02:00
Michael Johnston	581b54c974	allow users to set categories on their posts	2012-04-01 21:28:31 -04:00
friendica	e6fd6bfd89	more error handling	2012-03-31 17:44:34 -07:00
friendica	bcc5801608	rename "file as" to "save to folder"	2012-03-30 02:42:36 -07:00
friendica	87539dbec4	bug #352 - qcomment plugin disabled, qcomments still allowed	2012-03-30 02:22:57 -07:00
friendica	9332312ce9	silly mistake	2012-03-29 21:18:47 -07:00
friendica	168cf3b9d4	zrl on mentions	2012-03-29 21:08:10 -07:00
friendica	bb8beb26b4	use zrl to get home again	2012-03-29 20:58:32 -07:00
friendica	6c7b619b34	remove stray template variable from old code	2012-03-20 23:57:33 -07:00
Tobias Hößl	72894b0e91	replace split() by explode(); split is deprecated	2012-03-18 10:36:49 +00:00
friendica	949c6d47b5	add "send pm" link to photo dropdown for Diaspora contacts	2012-03-16 15:19:38 -07:00
friendica	110e8f2919	basic ssl_policy for important modules	2012-03-14 21:20:20 -07:00
friendica	4972d7ef6e	more work on filer, comment level and file tag removal	2012-03-13 20:46:37 -07:00
friendica	be48fff157	file as widget and basic filing implementation for duepuntozero,slackr ... much more work needed - this is just for test/evaluation currently	2012-03-13 18:13:03 -07:00
Tobias Hößl	635958e11d	Merge branch 'master' of git://github.com/friendica/friendica	2012-03-09 10:00:12 +00:00
friendica	312c175045	bug in check for private email comment to public conversation prevents authenticated visitor from seeing comments that should be allowed	2012-03-09 00:31:17 -08:00
friendica	2050f886cc	keep tony from talking to himself	2012-03-08 21:14:41 -08:00
friendica	8fb0ea4048	bugs #312, #313	2012-03-06 14:27:53 -08:00
Fabio Comuni	ed42fa7d59	conversation: remove templating items in code and move it to template.	2012-03-01 11:46:08 +01:00
Tobias Hößl	5bb8ed4b8b	Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.php	2012-02-28 21:56:42 +00:00
Tobias Hößl	3d249f0edd	Merge remote branch 'upstream/master'	2012-02-28 21:19:02 +00:00
Tobias Hößl	1204210c69	wasn't actually changed before	2012-02-28 13:01:58 +00:00
friendica	a1861d1128	tagging missing from wallwall and a couple of themes, star missing from dispy	2012-02-26 16:29:06 -08:00
Tobias Hößl	cbc6ca642a	1 Bugfix (missing $ character) and avoid some notices	2012-02-26 20:41:41 +00:00
friendica	b1d31aca51	quick comments	2012-02-15 18:13:41 -08:00
friendica	03171fd7de	preliminary qcomment support, [nosmile] tag to disable smiley processing	2012-02-14 23:13:18 -08:00
friendica	f865939653	localise links to private photos inside messages	2012-02-14 18:07:13 -08:00
friendica	803a7425ea	make hr bbtag shareable, stray quote in duepuntozero wall_item	2012-02-13 18:40:28 -08:00
Fabio Comuni	850560519a	Merge remote-tracking branch 'friendica/master' into mobile	2012-02-13 09:46:42 +01:00
Fabio Comuni	ed38808aae	hidden jot in "display" to allow reshare	2012-02-10 17:30:22 +01:00
friendica	5859f9dcf6	add render_location hook to both sets of conversations	2012-02-09 18:09:28 -08:00
friendica	ec26f88be9	render_location hook	2012-02-09 15:02:59 -08:00
friendica	2b77002471	basic support for plaintext editor configuration (disable tinymce), currently only zero themes - and not all the post tools currently work (as some of them emit html).	2012-02-06 20:28:50 -08:00
friendica	3a1a4d62d9	bug #254	2012-01-24 16:23:30 -08:00
friendica	8aa2552372	add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)	2012-01-18 16:21:30 -08:00
friendica	6573c94d6c	modified item_photo_menu hook	2012-01-11 17:34:02 -08:00
friendica	cf7008e575	post preview to loozah	2012-01-10 17:47:11 -08:00
friendica	7011f71e8f	post preview	2012-01-09 20:03:00 -08:00
Fabio Comuni	f9b0af6f2f	Merge remote-tracking branch 'friendica/master'	2012-01-06 09:11:48 +01:00
Fabio Comuni	efe308b5ac	Use html5 placeholder for title text input	2012-01-06 09:11:25 +01:00
Fabio Comuni	a9670cbb7d	Merge remote-tracking branch 'friendica/master'	2012-01-06 09:10:21 +01:00
friendica	b99cb511ca	comment preview	2012-01-05 16:38:24 -08:00
friendica	47edaf9ad7	dynamic title input box - via fabrixxm	2012-01-04 18:03:09 -08:00
friendica	969cd145ce	suggestion notifications	2012-01-03 17:29:07 -08:00
friendica	c583d16209	fix reference variable effects on sorting	2012-01-03 14:27:00 -08:00
Fabio Comuni	93563370c9	Merge remote-tracking branch 'friendica/master'	2012-01-03 21:14:48 +01:00
friendica	184230e068	check count before foreach	2012-01-02 22:58:09 -08:00
friendica	4c35a6b0d7	conversation sql optimisations	2012-01-02 16:54:37 -08:00
Fabio Comuni	0b4535e6da	quattro: more on editor	2011-12-22 11:24:34 +01:00
Fabio Comuni	ba732c97c1	Merge remote-tracking branch 'friendica/master'	2011-12-20 17:18:19 +01:00
Fabio Comuni	f3b499f119	quattro: more on editor	2011-12-20 17:17:17 +01:00
friendica	7c6bc5a93d	invalid thread-id in "nouveau" mode of conversation, bug 245	2011-12-19 13:51:55 -08:00
friendica	fb01d8bec5	fix incorrect default author	2011-12-04 03:54:40 -08:00
friendica	fb437a874e	typo	2011-12-04 03:50:26 -08:00
friendica	f6dd834284	fix author-name when missing on comments	2011-12-04 03:45:09 -08:00
friendica	4b95e8ebe8	rework the liveupdate fixes - what a mess	2011-11-24 18:26:06 -08:00
friendica	9e8053e3bd	fixing conversation updates	2011-11-24 16:42:12 -08:00
friendica	53590d2166	rework show/hide comments	2011-11-22 16:00:05 -08:00
Fabio Comuni	ef8b5bc682	fix localize item tag	2011-11-16 11:27:20 +01:00
Fabio Comuni	962467ee68	item tags as array to templates	2011-11-15 17:41:38 +01:00
Friendika	199da623ff	testbubble showing post jot-tools on edit page - these are not changed so should not be visible	2011-11-10 18:20:25 -08:00
Friendika	3b6b0eaa8b	social tag - add UI	2011-10-24 15:47:17 -07:00
Friendika	557a7d0cec	stuff ... - background the external network notifications (Facebook, Twitter, Statusnet) - add vimeo support - consolidate editor video options (insert video, regardless of source) - add "Connector Settings" page purely for configuring connectors - moved mailbox settings to Connectors - Move the "Connect/Follow" dialogue out of "find people" and move to top. - Add "Find People" dialogue - minor theme edits on duepuntozero and testbubble to make all this stuff work - A bit of theming on duepunto notifications to eliminate the gigantic Diaspora profile photos.	2011-10-11 18:24:37 -07:00
Friendika	7d6a67f903	mostly cosmetic changes to make DB tables accurately reflect the conversation members	2011-10-05 19:16:05 -07:00
Fabio Comuni	4d5580ab77	fix typo	2011-10-03 09:38:58 +02:00
Fabio Comuni	60e0f79b9f	Merge remote-tracking branch 'friendika/master'	2011-09-30 14:31:20 +02:00
Fabio Comuni	dfb3ee6e29	fix star icon viewing profile page as unlogged user	2011-09-30 14:31:01 +02:00
Friendika	c1221cc052	add display_item hook to 'search|new' message display	2011-09-29 15:52:31 -07:00
Fabio Comuni	41617ee987	fix search_item.tpl, fix 'new' view in network page, fix walltowall template in 'quattro' theme	2011-09-28 10:30:32 +02:00
Fabio Comuni	c120cc8ea9	added missing "delete selected items" link	2011-09-28 09:32:53 +02:00
Fabio Comuni	e986fc3e30	quattro: actions in wall_item ... less html in conversation.php removed unused tpls fixed old themes	2011-09-27 16:54:33 +02:00
Fabio Comuni	968e7bb3b1	Fixes for testbubble	2011-09-26 11:48:02 +02:00
Fabio Comuni	5792b3d358	Merge branch 'master' into newui	2011-09-26 11:42:48 +02:00
Friendika	3a2bf8ab7c	w3c compliance fixes, owner attribution on likes defaulting to local owner, not item creator	2011-09-23 03:12:31 -07:00
Friendika	c2ccb78869	template escapes	2011-09-19 19:51:14 -07:00
Friendika	63277b57fc	template escapes	2011-09-19 19:46:18 -07:00
Friendika	fd18b42a5a	Check all keys before use	2011-09-19 03:30:59 -07:00
Friendika	ce77c7287e	show real profile link location on hover	2011-09-16 15:40:34 -07:00
Fabio Comuni	6b6f45f9f1	quattro: initial style of conversations	2011-09-16 12:51:14 +02:00
Friendika	0e441fe196	bug #147 comments not working on private notes page	2011-09-11 15:09:57 -07:00
Friendika	1e8b3278b0	share not available in display module, as no editor window to paste into	2011-09-08 22:07:16 -07:00
Friendika	f0c3a75ff3	youtube redirect fixes	2011-08-30 23:09:39 -07:00
Friendika	144f241c5d	fix bad embeds	2011-08-26 15:21:21 -07:00
Friendika	04b59ac49a	enhanced email privacy	2011-08-11 01:52:31 -07:00
Friendika	0c9f033505	some api enhancements	2011-07-31 16:35:53 -07:00
Friendika	c0749f18d6	event ownership issues	2011-07-25 18:41:48 -07:00
Friendika	eccaa525cc	'dislike' is not part of activitystreams core schema - use symblic constants instead	2011-07-07 16:56:44 -07:00
Fabio Comuni	9dfd798368	Add post type "event" to like/unlike localizated text	2011-07-07 14:02:58 +02:00
Friendika	40aa6f33b5	incorrect links for "view in context" on community page	2011-07-05 21:03:37 -07:00
Friendika	5e1335ac89	don't show delete buttons on community page	2011-07-04 21:52:21 -07:00
Friendika	5ceeb6752d	starred items	2011-07-03 19:41:04 -07:00
Friendika	7f387d93ae	only show app on top-level or standalone posts	2011-06-21 00:56:24 -07:00
Friendika	55112cfdd0	item source	2011-06-20 19:08:40 -07:00
Friendika	9e2db5d5a6	tooltip for selecting items	2011-06-17 23:06:42 -07:00
Friendika	e5b54e74ba	delete selected items	2011-06-15 20:43:39 -07:00
Friendika	2a679b1164	file attachments	2011-05-25 02:08:15 -07:00
Friendika	bc8eba4884	turn on attach display	2011-05-24 20:45:02 -07:00
Friendika	87de839974	attachment display	2011-05-24 20:41:29 -07:00
Friendika	ea0a28ebfb	removed buggy debug code ;)	2011-05-22 14:20:31 -07:00
Friendika	681885a120	"notes" app	2011-05-20 01:15:02 -07:00
Friendika	990d5e82a0	doc updates - connecting to services	2011-05-18 17:29:12 -07:00
Friendika	85c6457e6e	bug #65 'show all nn comments', 'show more posts like this' are misleading after they've been clicked once. Solution, hide them once clicked.	2011-05-16 17:57:29 -07:00
Friendika	b2e92e0af3	deprecate load_view_file	2011-05-11 04:37:13 -07:00
Friendika	a00813497f	bring back load_view_file for dispy templates	2011-05-10 23:35:31 -07:00
Friendika	c052d68828	don't use load_view_file() except in email templates and install of htconfig - to avoid getting wrong file when package is updated by copying over an older version.	2011-05-10 16:12:50 -07:00
Friendika	be84d51767	use local contact photo if available	2011-05-09 01:35:24 -07:00
Friendika	2c63b65e3c	refactor "which link to show" logic	2011-05-06 06:30:33 -07:00
Friendika	64a7d0b578	lost comment boxes on status.net conversations	2011-05-03 18:05:11 -07:00
Friendika	6c47f262cc	warn if msg is visible to all	2011-05-01 19:50:00 -07:00
Friendika	7d455a0395	missing location after editor was consolidated	2011-04-28 20:04:02 -07:00
Friendika	a5d478233c	misspell	2011-04-26 18:39:19 -07:00
Friendika	cde17704dd	over-ride comment box	2011-04-26 18:36:51 -07:00