]> git.mxchange.org Git - friendica.git/log
friendica.git
12 years agocommon_friends_visitor_widget warning
friendica [Sun, 12 Aug 2012 22:54:38 +0000 (15:54 -0700)]
common_friends_visitor_widget warning

12 years agocrypt bbcode tag
friendica [Sun, 12 Aug 2012 11:29:26 +0000 (04:29 -0700)]
crypt bbcode tag

12 years agoMerge pull request #434 from fermionic/frost-update-for-threaded-comments
fermionic [Sun, 12 Aug 2012 02:53:08 +0000 (19:53 -0700)]
Merge pull request #434 from fermionic/frost-update-for-threaded-comments

sigh I always miss something when copying over

12 years agosigh I always miss something when copying over
Zach Prezkuta [Sun, 12 Aug 2012 02:51:51 +0000 (20:51 -0600)]
sigh I always miss something when copying over

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Sat, 11 Aug 2012 22:42:48 +0000 (15:42 -0700)]
Merge https://github.com/friendica/friendica into pull

Conflicts:
view/wall_thread.tpl

12 years agorev update
friendica [Sat, 11 Aug 2012 22:39:45 +0000 (15:39 -0700)]
rev update

12 years agoMerge pull request #433 from fermionic/frost-update-for-threaded-comments
friendica [Sat, 11 Aug 2012 22:34:21 +0000 (15:34 -0700)]
Merge pull request #433 from fermionic/frost-update-for-threaded-comments

Some updates for threading

12 years agoupdate frost mobile TODO
Zach Prezkuta [Sat, 11 Aug 2012 20:43:13 +0000 (14:43 -0600)]
update frost mobile TODO

12 years agoThreading updates
Zach Prezkuta [Sat, 11 Aug 2012 20:36:58 +0000 (14:36 -0600)]
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

12 years agogetting comment counts correct in a threaded world
friendica [Sat, 11 Aug 2012 08:26:10 +0000 (01:26 -0700)]
getting comment counts correct in a threaded world

12 years agofix child count
friendica [Sat, 11 Aug 2012 06:42:45 +0000 (23:42 -0700)]
fix child count

12 years agobring likes back - comment ordering is still a bit funky
friendica [Fri, 10 Aug 2012 23:36:44 +0000 (16:36 -0700)]
bring likes back - comment ordering is still a bit funky

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Fri, 10 Aug 2012 23:04:16 +0000 (16:04 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoMerge pull request #431 from fermionic/diaspora-relays-and-tags
friendica [Fri, 10 Aug 2012 23:03:37 +0000 (16:03 -0700)]
Merge pull request #431 from fermionic/diaspora-relays-and-tags

Couple of Diaspora fixes

12 years agoMerge pull request #432 from fermionic/frost-better-screen-width
friendica [Fri, 10 Aug 2012 23:03:19 +0000 (16:03 -0700)]
Merge pull request #432 from fermionic/frost-better-screen-width

Frost Mobile better screen width

12 years agorev update
friendica [Fri, 10 Aug 2012 23:02:20 +0000 (16:02 -0700)]
rev update

12 years agoreadability in TODO
Zach Prezkuta [Fri, 10 Aug 2012 14:37:31 +0000 (08:37 -0600)]
readability in TODO

12 years ago- Frost Mobile: redo CSS to adjust automatically to the screen width
Zach Prezkuta [Fri, 10 Aug 2012 03:17:11 +0000 (21:17 -0600)]
- 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

12 years agomove tag transformation to bb2diaspora; start taking out unnecessary signature stuff
Zach Prezkuta [Fri, 10 Aug 2012 04:06:18 +0000 (22:06 -0600)]
move tag transformation to bb2diaspora; start taking out unnecessary signature stuff

12 years agoMerge pull request #430 from fabrixxm/master
fabrixxm [Fri, 10 Aug 2012 10:50:54 +0000 (03:50 -0700)]
Merge pull request #430 from fabrixxm/master

Fix Quattro with threaded comments, small tweaks to template processor and conversation.php

12 years agoquattro: fix collapsed thread, fix comment box, style previev comment, add 'expand...
Fabrixxm [Fri, 10 Aug 2012 10:27:01 +0000 (06:27 -0400)]
quattro: fix collapsed thread, fix comment box, style previev comment, add 'expand / collapse" thread

12 years agoconversation: add 'thread_level' to $item array
Fabrixxm [Fri, 10 Aug 2012 09:42:36 +0000 (05:42 -0400)]
conversation: add 'thread_level' to $item array

12 years agotemplate processor: trim strings in {{ if str!=str }}, add 'debug' tag:
Fabrixxm [Fri, 10 Aug 2012 08:55:51 +0000 (04:55 -0400)]
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>

12 years agoquattro: move comment box for top-level item at the end of comments list
Fabrixxm [Fri, 10 Aug 2012 08:53:39 +0000 (04:53 -0400)]
quattro: move comment box for top-level item at the end of comments list

12 years agoquattro: add comment tools icons, fix hide/show comment tools
Fabrixxm [Fri, 10 Aug 2012 08:29:22 +0000 (04:29 -0400)]
quattro: add comment tools icons, fix hide/show comment tools

12 years agoquattro: remove unused parameter 'comment' from function cmtBbClose
Fabrixxm [Fri, 10 Aug 2012 08:27:50 +0000 (04:27 -0400)]
quattro: remove unused parameter 'comment' from function cmtBbClose

12 years agohead.tpl: commentOpen() and commentClose() return true/false
Fabrixxm [Fri, 10 Aug 2012 08:25:08 +0000 (04:25 -0400)]
head.tpl: commentOpen() and commentClose() return true/false
usefull to concatenate other actions: "commentClose(this, $id) && cmtBbClose($id)"

12 years agobring back "delete selected items" - but need to pass pagedropping to each item
friendica [Fri, 10 Aug 2012 06:01:37 +0000 (23:01 -0700)]
bring back "delete selected items" - but need to pass pagedropping to each item

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Thu, 9 Aug 2012 22:33:22 +0000 (15:33 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update
friendica [Thu, 9 Aug 2012 22:32:07 +0000 (15:32 -0700)]
rev update

12 years agoMerge pull request #429 from CyberDomovoy/threaded_items
Domovoy [Thu, 9 Aug 2012 12:05:29 +0000 (05:05 -0700)]
Merge pull request #429 from CyberDomovoy/threaded_items

Threaded items

12 years agoMerge pull request #5 from fabrixxm/threaded_items
Domovoy [Thu, 9 Aug 2012 09:14:22 +0000 (02:14 -0700)]
Merge pull request #5 from fabrixxm/threaded_items

Threaded items support for Quattro theme

12 years agoMerge branch 'master' of https://github.com/friendica/friendica into threaded_items
root [Thu, 9 Aug 2012 07:26:23 +0000 (09:26 +0200)]
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items

12 years agorev update
friendica [Thu, 9 Aug 2012 00:06:54 +0000 (17:06 -0700)]
rev update

12 years agoRemoved useless comment box (from old non-threaded template, to comment box where...
Domovoy [Tue, 7 Aug 2012 10:13:42 +0000 (12:13 +0200)]
Removed useless comment box (from old non-threaded template, to comment box where displayed)

12 years agoWall to wall items should now be threaded too.
Domovoy [Tue, 7 Aug 2012 10:08:36 +0000 (12:08 +0200)]
Wall to wall items should now be threaded too.

12 years agoAdded view/wallwall_thread.tpl
Domovoy [Tue, 7 Aug 2012 10:02:06 +0000 (12:02 +0200)]
Added view/wallwall_thread.tpl

12 years agoFallback so that we alway have a thr-parent
Domovoy [Tue, 7 Aug 2012 08:04:47 +0000 (10:04 +0200)]
Fallback so that we alway have a thr-parent

12 years agoThe number of comments shown when collapsed is the total of all the descendant items.
Domovoy [Tue, 7 Aug 2012 07:53:53 +0000 (09:53 +0200)]
The number of comments shown when collapsed is the total of all the descendant items.

12 years agoMerge branch 'master' of https://github.com/friendica/friendica into threaded_items
Domovoy [Tue, 7 Aug 2012 07:40:21 +0000 (09:40 +0200)]
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Tue, 7 Aug 2012 02:52:49 +0000 (19:52 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update + don't tag anything in [] brackets
friendica [Tue, 7 Aug 2012 02:50:57 +0000 (19:50 -0700)]
rev update + don't tag anything in [] brackets

12 years agoMerge pull request #427 from fermionic/frost-embedded-videos
friendica [Mon, 6 Aug 2012 22:58:17 +0000 (15:58 -0700)]
Merge pull request #427 from fermionic/frost-embedded-videos

allow themes to change the size of embedded videos

12 years agoMerge pull request #428 from simonlnu/master
Simon [Mon, 6 Aug 2012 21:07:38 +0000 (14:07 -0700)]
Merge pull request #428 from simonlnu/master

new 'manage' icon

12 years agoadd a 'manage' icon to clarify things
Simon L'nu [Mon, 6 Aug 2012 21:05:25 +0000 (17:05 -0400)]
add a 'manage' icon to clarify things

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Mon, 6 Aug 2012 17:18:00 +0000 (13:18 -0400)]
Merge remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  rev update
  Frost-mobile: media query in css for tablets
  expire issue
  rev update

12 years agoallow themes to change the size of embedded videos
Zach Prezkuta [Mon, 6 Aug 2012 15:59:57 +0000 (09:59 -0600)]
allow themes to change the size of embedded videos

12 years agoquattro: collaps threaded items
Fabrixxm [Mon, 6 Aug 2012 08:47:35 +0000 (04:47 -0400)]
quattro: collaps threaded items

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Mon, 6 Aug 2012 04:44:31 +0000 (21:44 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update
friendica [Mon, 6 Aug 2012 04:43:20 +0000 (21:43 -0700)]
rev update

12 years agoquattro: support threaded comments
Fabrixxm [Sun, 5 Aug 2012 20:55:20 +0000 (16:55 -0400)]
quattro: support threaded comments

12 years agoDiaspora doesn't support threaded comments (forgot some)
Domovoy [Sun, 5 Aug 2012 17:30:21 +0000 (19:30 +0200)]
Diaspora doesn't support threaded comments (forgot some)

12 years agoDiaspora doesn't support threaded comments
Domovoy [Sun, 5 Aug 2012 17:27:54 +0000 (19:27 +0200)]
Diaspora doesn't support threaded comments

12 years agoMerge pull request #426 from cvogeley/master
fermionic [Sun, 5 Aug 2012 16:43:24 +0000 (09:43 -0700)]
Merge pull request #426 from cvogeley/master

Frost-mobile: Add media query in stylesheet for tablets

12 years agoFrost-mobile: media query in css for tablets
Christian Vogeley [Sun, 5 Aug 2012 14:08:07 +0000 (16:08 +0200)]
Frost-mobile: media query in css for tablets

Use space more efficiently on tablets in frost-mobile theme. Tested with
iPad 1.

12 years agoPreview was not working
Domovoy [Sun, 5 Aug 2012 13:35:12 +0000 (15:35 +0200)]
Preview was not working

12 years agoRemove database update, use fallback solution instead.
Domovoy [Sun, 5 Aug 2012 13:08:31 +0000 (15:08 +0200)]
Remove database update, use fallback solution instead.

12 years agoMerge branch 'master' of https://github.com/friendica/friendica into threaded_items
Domovoy [Sun, 5 Aug 2012 11:43:53 +0000 (13:43 +0200)]
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items

Conflicts:
include/conversation.php

12 years agoRemote items should be threaded now
Domovoy [Sun, 5 Aug 2012 11:30:51 +0000 (13:30 +0200)]
Remote items should be threaded now

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Sun, 5 Aug 2012 06:30:35 +0000 (23:30 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoexpire issue
friendica [Sun, 5 Aug 2012 06:29:52 +0000 (23:29 -0700)]
expire issue

12 years agoMerge remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sun, 5 Aug 2012 03:41:51 +0000 (23:41 -0400)]
Merge remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  missed an instance of $mobileapp in switch to generic app label
  ImageMagick rotates CW while imagerotate() rotates CCW
  update main frost version
  update version and todo
  -- 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
  put back notags
  fix angle char storage and transmission, rev update
  Darkzero/NS .contact-photo-menu
  rev update

12 years agoMerge pull request #425 from fermionic/frost-mobile-app-bug
fermionic [Sun, 5 Aug 2012 03:06:38 +0000 (20:06 -0700)]
Merge pull request #425 from fermionic/frost-mobile-app-bug

missed an instance of $mobileapp in switch to generic app label

12 years agomissed an instance of $mobileapp in switch to generic app label
Zach Prezkuta [Sun, 5 Aug 2012 03:05:25 +0000 (21:05 -0600)]
missed an instance of $mobileapp in switch to generic app label

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Sun, 5 Aug 2012 00:03:32 +0000 (17:03 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoMerge pull request #423 from fermionic/frost-updates
friendica [Sun, 5 Aug 2012 00:02:57 +0000 (17:02 -0700)]
Merge pull request #423 from fermionic/frost-updates

Various updates

12 years agoMerge pull request #424 from fermionic/rotate-direction-wrong
friendica [Sun, 5 Aug 2012 00:02:42 +0000 (17:02 -0700)]
Merge pull request #424 from fermionic/rotate-direction-wrong

ImageMagick rotates CW while imagerotate() rotates CCW

12 years agorev update
friendica [Sun, 5 Aug 2012 00:02:05 +0000 (17:02 -0700)]
rev update

12 years agoImageMagick rotates CW while imagerotate() rotates CCW
Zach Prezkuta [Sat, 4 Aug 2012 23:30:25 +0000 (17:30 -0600)]
ImageMagick rotates CW while imagerotate() rotates CCW

12 years agoMerge branch 'master' of https://github.com/friendica/friendica into threaded_items
Domovoy [Sat, 4 Aug 2012 21:33:06 +0000 (23:33 +0200)]
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items

12 years agoupdate main frost version
Zach Prezkuta [Sat, 4 Aug 2012 20:05:56 +0000 (14:05 -0600)]
update main frost version

12 years agoupdate version and todo
Zach Prezkuta [Sat, 4 Aug 2012 20:04:18 +0000 (14:04 -0600)]
update version and todo

12 years ago-- Allow themes to specify an "app" name for posted status updates and comments ...
Zach Prezkuta [Sat, 4 Aug 2012 20:01:16 +0000 (14:01 -0600)]
-- 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

12 years agoput back notags
friendica [Sat, 4 Aug 2012 01:36:45 +0000 (18:36 -0700)]
put back notags

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Sat, 4 Aug 2012 01:34:00 +0000 (18:34 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agofix angle char storage and transmission, rev update
friendica [Sat, 4 Aug 2012 01:33:11 +0000 (18:33 -0700)]
fix angle char storage and transmission, rev update

12 years agoFlatten children when threads are disabled
Domovoy [Fri, 3 Aug 2012 20:28:21 +0000 (22:28 +0200)]
Flatten children when threads are disabled

12 years agoThreaded items in every page concerned. Some code cleanup.
Domovoy [Fri, 3 Aug 2012 19:55:17 +0000 (21:55 +0200)]
Threaded items in every page concerned. Some code cleanup.

12 years agoThreaded notes
Domovoy [Fri, 3 Aug 2012 19:41:26 +0000 (21:41 +0200)]
Threaded notes

12 years agoThreaded item when in single post display
Domovoy [Fri, 3 Aug 2012 19:34:29 +0000 (21:34 +0200)]
Threaded item when in single post display

12 years agoComment box is inside the item
Domovoy [Fri, 3 Aug 2012 17:18:56 +0000 (19:18 +0200)]
Comment box is inside the item

12 years agoMerge branch 'master' of https://github.com/friendica/friendica into threaded_items
Domovoy [Fri, 3 Aug 2012 16:57:37 +0000 (18:57 +0200)]
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items

Conflicts:
update.php

12 years agoDarkzero/NS .contact-photo-menu
Thomas Willingham [Fri, 3 Aug 2012 02:07:29 +0000 (03:07 +0100)]
Darkzero/NS .contact-photo-menu

12 years agorev update
friendica [Thu, 2 Aug 2012 21:15:56 +0000 (14:15 -0700)]
rev update

12 years agoMerge remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Thu, 2 Aug 2012 16:46:36 +0000 (12:46 -0400)]
Merge remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  parse_url: Fixed a problem in the detection if there was an image or not. Additionally removed some test content.
  rev update
  Changed markdown to enable diaspora postings with images that contain links
  bbcode: two new bbcode elements (style, class) for CSS
  Moving the index creation commands into a readme file due to the fact that creating of these indexes is really slow.
  network: Caching of images
  scale_external_images: Fix: Hadn't looked for pictures in the format [img=XxY]
  Further performance improvements
  Speed improvements in the database

12 years agoMerge pull request #422 from annando/master
friendica [Thu, 2 Aug 2012 10:47:02 +0000 (03:47 -0700)]
Merge pull request #422 from annando/master

Speed improvements, better diaspora export

12 years agoMerge remote branch 'upstream/master'
Michael Vogel [Thu, 2 Aug 2012 08:27:11 +0000 (10:27 +0200)]
Merge remote branch 'upstream/master'

12 years agoparse_url: Fixed a problem in the detection if there was an image or not. Additionall...
Michael Vogel [Thu, 2 Aug 2012 08:25:08 +0000 (10:25 +0200)]
parse_url: Fixed a problem in the detection if there was an image or not. Additionally removed some test content.

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Thu, 2 Aug 2012 08:24:04 +0000 (01:24 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update
friendica [Thu, 2 Aug 2012 08:23:16 +0000 (01:23 -0700)]
rev update

12 years agoMerge remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Thu, 2 Aug 2012 02:59:54 +0000 (22:59 -0400)]
Merge remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  ugly fix to make editplain work
  quattro: readd sparkle cursor
  quattro: style for "show more" addon
  tinymce linebreaks, I fix it, somebody breaks it, I fix it, somebody breaks it. Repeat.
  logic was reversed - should work now
  fix almost all errant divs in view/ and frost folders
  Provide backend ability to poke as a comment rather than top-level post
  rev update

12 years agoMerge pull request #421 from fermionic/frost-tinymce-editplain-broken
fermionic [Thu, 2 Aug 2012 01:10:25 +0000 (18:10 -0700)]
Merge pull request #421 from fermionic/frost-tinymce-editplain-broken

ugly fix to make editplain work

12 years agougly fix to make editplain work
Zach Prezkuta [Thu, 2 Aug 2012 01:09:28 +0000 (19:09 -0600)]
ugly fix to make editplain work

12 years agoChanged markdown to enable diaspora postings with images that contain links
Michael Vogel [Wed, 1 Aug 2012 23:46:28 +0000 (01:46 +0200)]
Changed markdown to enable diaspora postings with images that contain links

12 years agoMerge remote branch 'upstream/master'
Michael Vogel [Wed, 1 Aug 2012 22:21:14 +0000 (00:21 +0200)]
Merge remote branch 'upstream/master'

Conflicts:
update.php

12 years agobbcode: two new bbcode elements (style, class) for CSS
Michael Vogel [Wed, 1 Aug 2012 22:13:37 +0000 (00:13 +0200)]
bbcode: two new bbcode elements (style, class) for CSS

12 years agoMerge pull request #420 from fabrixxm/master
fabrixxm [Wed, 1 Aug 2012 08:56:56 +0000 (01:56 -0700)]
Merge pull request #420 from fabrixxm/master

Quattro: Style "show more" plugin

12 years agoquattro: readd sparkle cursor
Fabrixxm [Wed, 1 Aug 2012 08:45:27 +0000 (04:45 -0400)]
quattro: readd sparkle cursor

12 years agoquattro: style for "show more" addon
Fabrixxm [Wed, 1 Aug 2012 08:41:21 +0000 (04:41 -0400)]
quattro: style for "show more" addon

12 years agotinymce linebreaks, I fix it, somebody breaks it, I fix it, somebody breaks it. Repeat.
friendica [Wed, 1 Aug 2012 08:36:39 +0000 (01:36 -0700)]
tinymce linebreaks, I fix it, somebody breaks it, I fix it, somebody breaks it. Repeat.