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
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
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
Zach Prezkuta
d8a13d6e8d
allow themes to change the size of embedded videos
2012-08-06 09:59:57 -06:00
friendica
5d7f9d3b4b
rev update
2012-08-05 21:43:20 -07: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
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
Domovoy
5d1eb37b9b
Remote items should be threaded now
2012-08-05 13:30:51 +02:00
friendica
9732f1fccf
expire issue
2012-08-04 23:29:52 -07:00
friendica
e27395b3d7
Merge pull request #423 from fermionic/frost-updates
...
Various updates
2012-08-04 17:02:57 -07:00
Zach Prezkuta
ba66e17d1d
ImageMagick rotates CW while imagerotate() rotates CCW
2012-08-04 17:30:25 -06:00
Domovoy
786e9064f2
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
2012-08-04 23:33:06 +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
friendica
0c67649c08
put back notags
2012-08-03 18:36:45 -07:00
friendica
621e737826
fix angle char storage and transmission, rev update
2012-08-03 18:33:11 -07: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
66848b0471
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
...
Conflicts:
update.php
2012-08-03 18:57:37 +02:00
Michael Vogel
2aa67d67f5
Changed markdown to enable diaspora postings with images that contain links
2012-08-02 01:46:28 +02:00
Michael Vogel
04c31d194f
Merge remote branch 'upstream/master'
...
Conflicts:
update.php
2012-08-02 00:21:14 +02:00
Michael Vogel
bed99674d2
bbcode: two new bbcode elements (style, class) for CSS
2012-08-02 00:13:37 +02:00
friendica
372ad112c9
tinymce linebreaks, I fix it, somebody breaks it, I fix it, somebody breaks it. Repeat.
2012-08-01 01:36:39 -07: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
Rainulf Pineda
1573c10631
Fixed syntax error in usage of anonymous function.
2012-07-25 21:38:28 -04:00
Michael Vogel
fc27edb6d7
network: Caching of images
2012-07-26 00:23:25 +02:00
Michael Vogel
6456c2484e
scale_external_images: Fix: Hadn't looked for pictures in the format [img=XxY]
2012-07-25 23:40:23 +02:00
Domovoy
50d1bdd902
Removed useless function
2012-07-24 17:32:13 +02:00
Domovoy
c8f484e4a5
Rplace spaces with undercores in tags
2012-07-24 17:22:56 +02:00
friendica
aa5e60248a
Merge pull request #405 from fermionic/support-for-mobile-themes
...
changes to support a mobile theme
2012-07-23 20:18:23 -07:00
friendica
982625db9c
update contact photos and names in local delivery - not just polled feeds
2012-07-23 20:00:00 -07:00
Zach Prezkuta
5cb979f5e4
changes to support a mobile theme
2012-07-23 20:37:00 -06:00
Domovoy
35f1081bfe
Removed the debug statement
2012-07-23 20:16:06 +02:00
Domovoy
d6c600ce11
Hooks now have a 'priority' value, default to 0.
...
The hooks are retrieved from the database by descending priority.
As a result they are run in the same order.
2012-07-23 15:35:31 +02:00