clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,939 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

249 Commits

Author SHA1 Message Date
friendica 411b6a71b4 Merge https://github.com/friendica/friendica into pull 2012-09-04 22:53:32 -07:00
friendica 4cd8233f61 remote_user can now support multiple contacts being logged in at once 2012-09-04 22:50:28 -07:00
Zach Prezkuta 79012bf888 conversation needs preview parameter 2012-09-04 18:47:49 -06:00
Domovoy ef52ff6b01 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-30 07:47:21 +02:00
Zach Prezkuta 72712175b5 regular expressions were grabbing too much 2012-08-26 14:56:34 -06: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 c9cfc52293 method, not property 2012-08-24 04:57:32 +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
friendica 386b6d081b moods 2012-08-22 21:36:55 -07:00
friendica ff0e0782a5 restore old comment behaviour when threading turned off 2012-08-21 19:41:50 -07:00
friendica bcec1bddc0 put the real post time into the post 2012-08-19 14:39:43 -07:00
friendica d96b9cda43 wall-to-wall posts not identified correctly after thread mod 2012-08-17 22:06:13 -07: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
Fabrixxm fc07f50fd8 conversation: add 'thread_level' to $item array 2012-08-10 05:42:36 -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 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
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
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 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
Domovoy 2a1657e361 Revert "Progress on #1. Comments are now threaded, at least in the database, for normal view." 
This reverts commit da1b47a029.

Useless, comments are already threaded in the database using parent-uri
 2012-07-23 13:58:47 +02:00
Domovoy da1b47a029 Progress on #1. Comments are now threaded, at least in the database, for normal view. 2012-07-23 12:56:47 +02:00
friendica 9c72b45f36 and the main photo menu 2012-07-19 21:27:22 -07:00
friendica d442bbc482 have fun... 2012-07-19 18:17:16 -07:00
friendica 02d88e7cbe name mixup in wall-to-wall hovertips 2012-07-15 20:56:09 -07:00
friendica 7f7e2c5de0 add plink to profile notifications 2012-07-12 16:12:37 -07:00
friendica 085b589468 add some sparkle to plinks 2012-07-11 21:04:08 -07:00
Zach Prezkuta da2ccebed8 fix bugs 2012-07-07 18:50:33 -06:00
Zach Prezkuta 173b3a1b9a allow more than one embedded private photo 2012-07-07 16:24:20 -06:00
friendica 6cc844b2f9 restore 'shareable' to feeds after recent feed privacy re-factoring 2012-06-30 05:16:30 -07:00
friendica a3edbf7e5d create third privacy state - public post but not searchable or publicly visible 2012-06-28 17:43:29 -07:00
friendica 1574396d04 sort out some "like" issues 2012-06-23 21:11:18 -07:00
friendica 7a346bc756 this is going to take some more debug before it can be roller out 2012-06-23 07:43:56 -07:00
friendica 22ca358a8c like comments 2012-06-23 05:46:15 -07:00
friendica 7614d35cad liking comments backend 2012-06-23 04:44:48 -07:00
Zvi ben Yaakov (a.k.a rdc) ff2f7dfeef Added App::get_cached_avatar_image usage on conversation wall of Normal View 2012-06-19 16:05:39 -07:00
Zvi ben Yaakov (a.k.a rdc) ac50c9e84d Beginning to use App::get_cached_avatar_image for loading profile images in conversations 2012-06-19 16:05:38 -07:00
friendica 267681844d poll even if contact hasn't responded recently, so we can update the termination status 2012-06-14 17:27:07 -07:00
friendica 3b9c3d886d sheesh 2012-06-11 16:21:27 -07:00
friendica daa4f5213f zrl's when visiting public photos at the source site 2012-06-03 01:53:11 -07:00
friendica 29bdf432f0 fewer "bob smith to bob smith via wall-to-wall". 2012-06-02 00:40:38 -07:00
friendica a163825291 redir links for permission controlled attachments 2012-05-21 22:54:39 -07:00
friendica 4e0b0d4e43 fix search/new against possible email leakage 2012-05-11 05:19:29 -07:00
friendica 20229ce187 better test of email reply visibility 2012-05-11 05:11:53 -07:00
friendica 53157bb954 send browser back to correct page (with query args) after posting 2012-05-09 04:18:01 -07:00
friendica 3c6cf1f19c make comment edit icons look more like base theme 2012-04-26 19:55:20 -07:00
Tobias Hößl 720c8324c7 Some Bugfixes, and variable checks 2012-04-17 11:33:50 +00:00
friendica fd2f7dd6ae turn on comment edit 2012-04-16 03:51:48 -07:00
Michael Vogel ee714daf4d Merge commit 'upstream/master' 2012-04-11 19:35:51 +02:00
Michael Vogel c88c2515e4 API: Improved the timeline. Several (disabled) tests with caching of photos. 2012-04-11 19:31:01 +02:00
friendica 640f258f18 cleanup photo menus 2012-04-10 19:33:32 -07:00
Alexander Kampmann 355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica 
Conflicts:
	include/config.php
	update.php
 2012-04-05 13:39:15 +02:00
Michael Johnston 581b54c974 allow users to set categories on their posts 2012-04-01 21:28:31 -04:00
friendica e6fd6bfd89 more error handling 2012-03-31 17:44:34 -07:00
friendica bcc5801608 rename "file as" to "save to folder" 2012-03-30 02:42:36 -07:00
friendica 87539dbec4 bug #352 - qcomment plugin disabled, qcomments still allowed 2012-03-30 02:22:57 -07:00
friendica 9332312ce9 silly mistake 2012-03-29 21:18:47 -07:00
friendica 168cf3b9d4 zrl on mentions 2012-03-29 21:08:10 -07:00
friendica bb8beb26b4 use zrl to get home again 2012-03-29 20:58:32 -07:00
friendica 6c7b619b34 remove stray template variable from old code 2012-03-20 23:57:33 -07:00
Tobias Hößl 72894b0e91 replace split() by explode(); split is deprecated 2012-03-18 10:36:49 +00:00
friendica 949c6d47b5 add "send pm" link to photo dropdown for Diaspora contacts 2012-03-16 15:19:38 -07:00
friendica 110e8f2919 basic ssl_policy for important modules 2012-03-14 21:20:20 -07:00
friendica 4972d7ef6e more work on filer, comment level and file tag removal 2012-03-13 20:46:37 -07:00
friendica be48fff157 file as widget and basic filing implementation for duepuntozero,slackr 
much more work needed - this is just for test/evaluation currently
 2012-03-13 18:13:03 -07:00
Tobias Hößl 635958e11d Merge branch 'master' of git://github.com/friendica/friendica 2012-03-09 10:00:12 +00:00
friendica 312c175045 bug in check for private email comment to public conversation prevents authenticated visitor from seeing comments that should be allowed 2012-03-09 00:31:17 -08:00
friendica 2050f886cc keep tony from talking to himself 2012-03-08 21:14:41 -08:00
friendica 8fb0ea4048 bugs #312, #313 2012-03-06 14:27:53 -08:00
Fabio Comuni ed42fa7d59 conversation: remove templating items in code and move it to template. 2012-03-01 11:46:08 +01:00
Tobias Hößl 5bb8ed4b8b Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.php 2012-02-28 21:56:42 +00:00
Tobias Hößl 3d249f0edd Merge remote branch 'upstream/master' 2012-02-28 21:19:02 +00:00
Tobias Hößl 1204210c69 wasn't actually changed before 2012-02-28 13:01:58 +00:00
friendica a1861d1128 tagging missing from wallwall and a couple of themes, star missing from dispy 2012-02-26 16:29:06 -08:00
Tobias Hößl cbc6ca642a 1 Bugfix (missing $ character) and avoid some notices 2012-02-26 20:41:41 +00:00
friendica b1d31aca51 quick comments 2012-02-15 18:13:41 -08:00
friendica 03171fd7de preliminary qcomment support, [nosmile] tag to disable smiley processing 2012-02-14 23:13:18 -08:00
friendica f865939653 localise links to private photos inside messages 2012-02-14 18:07:13 -08:00
friendica 803a7425ea make hr bbtag shareable, stray quote in duepuntozero wall_item 2012-02-13 18:40:28 -08:00
Fabio Comuni 850560519a Merge remote-tracking branch 'friendica/master' into mobile 2012-02-13 09:46:42 +01:00
Fabio Comuni ed38808aae hidden jot in "display" to allow reshare 2012-02-10 17:30:22 +01:00
friendica 5859f9dcf6 add render_location hook to both sets of conversations 2012-02-09 18:09:28 -08:00