Commit graph

6788 commits

Author SHA1 Message Date
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
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
d470496ead Quattro: added localtime timestamp title to entries 2012-08-20 11:20:49 +02:00
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
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