friendica
6348634a1b
Merge https://github.com/friendica/friendica into pull
...
Conflicts:
view/wall_thread.tpl
2012-08-11 15:42:48 -07:00
friendica
1cd23860cb
rev update
2012-08-11 15:39:45 -07:00
friendica
3039ad7aa7
Merge pull request #433 from fermionic/frost-update-for-threaded-comments
...
Some updates for threading
2012-08-11 15:34:21 -07:00
Zach Prezkuta
5890e3fa3a
update frost mobile TODO
2012-08-11 14:43:13 -06: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
friendica
ed7e626ed2
Merge https://github.com/friendica/friendica into pull
2012-08-10 16:04:16 -07:00
friendica
f8b969e252
Merge pull request #431 from fermionic/diaspora-relays-and-tags
...
Couple of Diaspora fixes
2012-08-10 16:03:37 -07:00
friendica
d2eef5f11d
Merge pull request #432 from fermionic/frost-better-screen-width
...
Frost Mobile better screen width
2012-08-10 16:03:19 -07:00
friendica
b960352b54
rev update
2012-08-10 16:02:20 -07:00
Zach Prezkuta
bcf214debb
readability in TODO
2012-08-10 08:37:31 -06:00
Zach Prezkuta
d9279da369
- Frost Mobile: redo CSS to adjust automatically to the screen width
...
- Frost Mobile: various tweaks and fixes
- Allow themes to limit number of items on the Network page
2012-08-10 08:34:00 -06:00
Zach Prezkuta
009ebc732a
move tag transformation to bb2diaspora; start taking out unnecessary signature stuff
2012-08-10 08:13:17 -06:00
fabrixxm
e31ee9ed82
Merge pull request #430 from fabrixxm/master
...
Fix Quattro with threaded comments, small tweaks to template processor and conversation.php
2012-08-10 03:50:54 -07:00
Fabrixxm
ec3d8a80cd
quattro: fix collapsed thread, fix comment box, style previev comment, add 'expand / collapse" thread
2012-08-10 06:27:01 -04:00
Fabrixxm
fc07f50fd8
conversation: add 'thread_level' to $item array
2012-08-10 05:42:36 -04:00
Fabrixxm
dbbf5b86a2
template processor: trim strings in {{ if str!=str }}, add 'debug' tag:
...
{{ debug $var [$var1 [$var2 [...]]] }}{{ enddebug }}
is replaced by
<pre>var_export($var1)\nvar_export($var2)\n....</pre>
2012-08-10 04:55:51 -04:00
Fabrixxm
0f15c117ee
quattro: move comment box for top-level item at the end of comments list
2012-08-10 04:53:39 -04:00
Fabrixxm
c4bff3d393
quattro: add comment tools icons, fix hide/show comment tools
2012-08-10 04:29:22 -04:00
Fabrixxm
64a6e8693c
quattro: remove unused parameter 'comment' from function cmtBbClose
2012-08-10 04:27:50 -04:00
Fabrixxm
2b7d08508d
head.tpl: commentOpen() and commentClose() return true/false
...
usefull to concatenate other actions: "commentClose(this, $id) && cmtBbClose($id)"
2012-08-10 04:25:08 -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
friendica
66e8e91646
Merge https://github.com/friendica/friendica into pull
2012-08-09 15:33:22 -07:00
friendica
ba9c50c0dd
rev update
2012-08-09 15:32:07 -07:00
Domovoy
39550dac9e
Merge pull request #429 from CyberDomovoy/threaded_items
...
Threaded items
2012-08-09 05:05:29 -07:00
Domovoy
9c920fd7b9
Merge pull request #5 from fabrixxm/threaded_items
...
Threaded items support for Quattro theme
2012-08-09 02:14:22 -07:00
root
dda4ab3381
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
2012-08-09 09:26:23 +02:00
friendica
101df5145e
rev update
2012-08-08 17:06:54 -07:00
Domovoy
afaa5f2038
Removed useless comment box (from old non-threaded template, to comment box where displayed)
2012-08-07 12:13:42 +02:00
Domovoy
5ca71d04b2
Wall to wall items should now be threaded too.
2012-08-07 12:08:36 +02:00
Domovoy
c0024daff7
Added view/wallwall_thread.tpl
2012-08-07 12:02:06 +02:00
Domovoy
4b514ea989
Fallback so that we alway have a thr-parent
2012-08-07 10:04:47 +02: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
f3b1391501
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
2012-08-07 09:40:21 +02:00
friendica
10b0ce5861
Merge https://github.com/friendica/friendica into pull
2012-08-06 19:52:49 -07:00
friendica
558fbcc69e
rev update + don't tag anything in [] brackets
2012-08-06 19:50:57 -07:00
friendica
3032d663f6
Merge pull request #427 from fermionic/frost-embedded-videos
...
allow themes to change the size of embedded videos
2012-08-06 15:58:17 -07:00
Simon
7c68dcd747
Merge pull request #428 from simonlnu/master
...
new 'manage' icon
2012-08-06 14:07:38 -07:00
Simon L'nu
7ceb213859
add a 'manage' icon to clarify things
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-08-06 17:05:25 -04:00
Simon L'nu
76e1e07571
Merge remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
rev update
Frost-mobile: media query in css for tablets
expire issue
rev update
2012-08-06 13:18:00 -04:00
Zach Prezkuta
d8a13d6e8d
allow themes to change the size of embedded videos
2012-08-06 09:59:57 -06:00
Fabrixxm
4062312e9c
quattro: collaps threaded items
2012-08-06 04:48:24 -04:00
friendica
f9f45fa957
Merge https://github.com/friendica/friendica into pull
2012-08-05 21:44:31 -07:00
friendica
5d7f9d3b4b
rev update
2012-08-05 21:43:20 -07:00
Fabrixxm
fd7ea5cc91
quattro: support threaded comments
2012-08-05 16:55:20 -04:00
Domovoy
5b374c4050
Diaspora doesn't support threaded comments (forgot some)
2012-08-05 19:30:21 +02:00
Domovoy
707dd216ce
Diaspora doesn't support threaded comments
2012-08-05 19:27:54 +02:00
fermionic
fbc0f0e7ca
Merge pull request #426 from cvogeley/master
...
Frost-mobile: Add media query in stylesheet for tablets
2012-08-05 09:43:24 -07:00
