Commit Graph

120 Commits

Author SHA1 Message Date
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
Zach Prezkuta 98d83f5d0b comments inherit pagedropping state of the top-level 2013-01-13 10:51:19 -07:00
Michael Vogel 158bfda0ac Changing the tag system to the "term" table. 2013-01-13 14:50:55 +01:00
Zach Prezkuta 609c45e791 fixes and tweaks to Smarty processing 2013-01-12 05:58:54 -07:00
Michael Vogel 61c78711df Preparations for a new tag structure. Tags are now stored in a dedicated table. 2013-01-11 01:20:16 +01:00
Michael Vogel 82820d8e95 Now the third most likely languages are shown.
In "vier" the tag line is now suppressed. It saves a little bit of space - and is redundant.
2013-01-09 20:54:18 +01:00
Michael Vogel e50c0efcdf Merge remote-tracking branch 'upstream/master' 2012-12-30 21:32:18 +01:00
Michael Vogel 763504f0d5 Vier: Now the language of a post is shown 2012-12-27 01:05:59 +01:00
Zach Prezkuta 263fe0f6bc revert unnecessary variable name changes 2012-12-26 10:42:01 -07:00
Zach Prezkuta 96ed0a7791 Implement Smarty3 2012-12-22 12:57:29 -07:00
friendica bc3a704e02 bug #517 - ensure wall owner can always comment on walltowall posts to their own wall, this seems to have been lost during the objectification of conversations 2012-12-09 13:44:48 -08:00
Zach Prezkuta beec28cc62 found a bug already 2012-11-22 09:34:50 -07:00
Zach Prezkuta 94204d9160 implement features 2012-11-22 09:14:22 -07:00
Michael Vogel e67062d9cf Merge remote-tracking branch 'upstream/master' 2012-11-15 21:52:35 +01:00
Michael Vogel ff5ab7e9c6 Vier: Further improvements. 2012-11-15 08:18:25 +01:00
Fabrixxm 41dfc7f29e items: new property 'shiny'.
separate 'indent' (''|'comment') from 'shiny' (''|'shiny')
2012-11-09 11:13:59 -05:00
Michael Vogel b14e557575 Vier: Fixing "vier" so that it looks again like it was intended. 2012-11-09 01:19:24 +01:00
Zach Prezkuta c9248b66db display live update; don't collapse comments on live update 2012-11-01 18:31:50 -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
Fabrixxm 2d988be195 Merge branch 'blog-like' into quattro-fontsoptions 2012-09-28 10:09:07 -04:00
Fabrixxm f058414ff1 Item: $item.total_comments_num as string 2012-09-28 10:03:03 -04: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
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
Zach Prezkuta da7c5b19b1 allow hidden comments phrase to be accessed separately as number and text 2012-09-19 21:31:26 -06: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 51bcd862d7 Port friendica/friendica#1478229abc6c5adc265559b5489cc2eb23358994 2012-09-10 10:14:30 +02:00
Domovoy 7bef3023a8 Port friendica/friendica#4cd8233f61647d805383f5786052ef034cebf4e1 2012-09-10 09:57:34 +02:00
Domovoy 1b82df60db Port friendica/friendica#79012bf8882baa6843726bcffbcafe959028c1bd 2012-09-10 09:50:30 +02: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 ce0a16df01 Some optimization 2012-08-24 04:48:49 +02:00
Domovoy c3ce4e153d Better wall to wall detection (fallback to finding @ tags) 2012-08-24 04:29:09 +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 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 17f9fcaec9 Checks done on topmost parent in local_delivery, closes #10 2012-08-18 17:17:33 +02: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 cc4361fddf Problem with comment box, debug. 2012-08-12 20:11:14 +02:00
Domovoy 82d779a33b Conversation and Item now handles (dis)like as they should 2012-08-12 17:46:02 +02:00
Domovoy d4f44b1530 Some fixes 2012-08-12 17:34:02 +02:00
Domovoy b1a801fe61 Item: new methods check_wall_to_wall, is_wall_to_wall, get_owner_url, get_owner_photo, get_owner_name 2012-08-12 17:20:38 +02:00
Domovoy c8cf87efc4 rename $item_result to $result 2012-08-12 16:32:02 +02:00
Domovoy 4e4774ff4f Improved get_comment_box 2012-08-12 16:26:37 +02:00
Domovoy 9f57afe160 Item: new method get_redirect_url 2012-08-12 16:18:53 +02:00
Domovoy 71f11a9a32 Item: new method get_comment_box 2012-08-12 16:02:47 +02:00
Domovoy d603f76678 Some fix on forgotten or useless vars 2012-08-12 15:39:21 +02:00
Domovoy 91edb06bcb prepare_threads_body is not used by Item anymore 2012-08-11 19:58:57 +02:00
Domovoy 5084cff8f4 Should fix the like problem 2012-08-11 19:23:18 +02:00
Domovoy 9b6e99a6ba mode is handled by Conversation 2012-08-11 18:12:35 +02:00
Domovoy 1c36d14673 Got of the get_* function about data, use get_data_value instead (except for get_id, which is very conveniant). 2012-08-11 17:51:25 +02:00
Domovoy 7c2ed027ff Item: new method count_descendants 2012-08-11 17:48:07 +02:00
Domovoy e6c55de070 Item: parent/children relationship. get_parent now returns an Item (or null) 2012-08-11 17:39:11 +02:00
Domovoy adbe126d10 Item: new method is_writeable 2012-08-11 17:15:19 +02:00
Domovoy 531801ff50 Item: new method is_toplevel 2012-08-11 17:09:35 +02:00
Domovoy 1ffca59a9e Item: new method get_thumb 2012-08-11 17:04:07 +02:00
Domovoy 56cae53e50 Item: new methods get|set_template 2012-08-11 16:56:10 +02:00
Domovoy f1731b3cec New methods on Item: set|get_mode, get_profile_owner, is_page_writeable 2012-08-11 15:44:47 +02:00
Domovoy 75d355a2aa Rendering is now done by Item objects 2012-08-10 19:57:39 +02:00
Domovoy 6ef86e1fff New objects: Conversation and Item 2012-08-10 17:46:39 +02:00