Commit Graph

2101 Commits

Author SHA1 Message Date
root fe3f1af92f Merge remote-tracking branch 'upstream/master' 2012-11-04 23:31:05 +01:00
Michael 6afa5d1c48 In the API you now can update not only the body but also the title. In html2plain the function for valid urls was improved. 2012-11-04 23:18:52 +01:00
zottel dd1e735efb Worked in fermionic's comments (not count($r)). 2012-11-04 11:07:11 +01:00
Michael 2b6498b2a2 Merge remote-tracking branch 'upstream/master' 2012-11-03 22:27:34 +01:00
zottel 2871fd4793 Depublish public posts when archiving a contact 2012-11-02 23:54:03 +01:00
zottel 7de5c7ebe1 Changes to make contacts delete all content from the user when a user is deleted.
NOTE: I didn't add "AND account_removed = 0" to facebook.php because I don't
have a clone of the addons repository. Please someone do that for me. Thanks.

Please check carefully. I tested locally on my server, but not with other
servers.
2012-11-02 21:43:47 +01:00
Zach Prezkuta c9248b66db display live update; don't collapse comments on live update 2012-11-01 18:31:50 -06:00
Zach Prezkuta 6effdd570c add a confirm dialog and a busy rotator for delete selected 2012-11-01 17:42:40 -06:00
Zach Prezkuta e9b26ffbb3 prevent double posting of status updates and comments 2012-11-01 17:14:42 -06:00
Zach Prezkuta d98974572b fix theme control of allowing threading 2012-11-01 10:33:01 -06:00
Zach Prezkuta 43de9cf904 don't try to auto redir if I'm a blocked or pending contact 2012-11-01 10:32:33 -06:00
friendica a41e78a06d Merge pull request #516 from fermionic/20121029-auto-redir-fix
make sure that the contact is local for auto redir
2012-10-29 21:00:28 -07:00
friendica d3682f5d6a Merge pull request #517 from fermionic/20121029-wall-live-commenting
add live div to wall page
2012-10-29 20:58:32 -07:00
Zach Prezkuta 200d2030d5 don't combine msg and meta arrays unless they're the same size 2012-10-29 12:47:51 -06:00
Zach Prezkuta 4fd339b216 add live div to wall page 2012-10-29 12:43:52 -06:00
Zach Prezkuta 4990f64927 make sure that the contact is local for auto redir 2012-10-29 12:03:48 -06:00
friendica 02251f23df undefined fn: init_groups_visitor in mod_profile, rev update 2012-10-21 14:41:10 -07:00
Michael Vogel 28b085569a Merge remote branch 'upstream/master' 2012-10-19 07:12:15 +02:00
friendica 2347a4326c get rid of 'Friendika' 2012-10-18 21:51:45 -07:00
friendica f6f3042d00 imagick exception 2012-10-17 15:22:29 -07:00
friendica 80513e4332 Trying this fix for endless redirection 2012-10-15 18:51:22 -07:00
friendica fd6a21f522 oops - missingfile from last checking, the important one 2012-10-15 16:33:00 -07:00
fermionic ca21f1bbc8 Merge pull request #512 from fermionic/auto-redir-for-local-hub-contacts
for profile and photos, detect contacts from local hub and auto-redir
2012-10-11 17:24:11 -07:00
fermionic 2f3d118e77 Merge pull request #508 from fermionic/no-theme-control-of-live-update-location
allow themes to decide where live updates appear
2012-10-10 17:34:28 -07:00
Zach Prezkuta b9818185db for profile and photos, detect contacts from local hub and auto-redir 2012-10-09 09:50:24 -06:00
Zach Prezkuta 0ea89852d2 allow themes to decide where live updates appear 2012-10-09 09:41:33 -06:00
Zach Prezkuta c3cf459b27 use getWidth and getHeight, which are agnostic to Imagick being enabled 2012-10-09 09:35:32 -06:00
friendica 112fafcc81 consistent handling of scaled images when using imagick 2012-09-30 03:25:20 -07:00
friendica e0dbd2e8e4 Merge pull request #494 from fermionic/diaspora-contact-lookup-fails
look for DFRN contacts as well
2012-09-30 01:58:37 -07:00
friendica e60c729b51 Merge pull request #495 from fermionic/email-optimization
send less messages to server; remove delete option
2012-09-30 01:58:07 -07:00
friendica 35905ebf1c Merge pull request #496 from fermionic/deleted-group-stays-in-default-permissions
remove groups from default permissions when removed; bug in group_add_member
2012-09-30 01:57:52 -07:00
Zach Prezkuta 34081010ff allow contact if in allowed group, even if not in non-empty allowed contacts 2012-09-29 17:54:37 -06:00
Zach Prezkuta 4af4e9aa9f remove groups from default permissions when removed; bug in group_add_member 2012-09-29 17:53:06 -06:00
Zach Prezkuta f4f3c8375f send less messages to server; remove delete option 2012-09-29 17:50:34 -06:00
Zach Prezkuta 59ace4f4d7 look for DFRN contacts as well 2012-09-29 17:48:56 -06:00
friendica 8416cff2a5 slight adjustment to Photo scaling - also discovered imagick resize may need some additional work 2012-09-29 05:46:01 -07:00
friendica 0693afd6b7 only constrain horizontal image dimension for scaling very tall photos 2012-09-29 05:20:29 -07:00
Michael Vogel ea6ced8359 Merge remote branch 'upstream/master' 2012-09-29 08:35:17 +02:00
friendica cef5169567 subscribe-to/follow threads 2012-09-27 19:53:55 -07:00
friendica 25773b41cb add "tagged" hook (bots and such) 2012-09-26 18:24:19 -07:00
friendica e433f20cd8 sort out the 'delete selected' mess 2012-09-25 19:10:46 -07:00
friendica 245d9f0aca one template to rule them all 2012-09-25 01:31:48 -07:00
friendica 8184de9c78 remove THISPLUGIN definition - not used and doesn't work 2012-09-24 01:30:18 -07:00
friendica 054f8edb59 zeros - theming for new categories/folder display 2012-09-23 19:22:48 -07:00
friendica c3b4f9f0d3 support for bringing back cats/folders 2012-09-23 17:16:37 -07:00
Fabrixxm dd25c7db7e more $item data
- add $item.categories and $item.folders to object/Item.php
- add $item.hastags and $item.mentions to object/Item.php
- add $item.total_comments_num and $item.total_comments_text to object/Item.php (those are set for top_level item also with no comments)
- move get_cats_and_terms() to include/text.php
2012-09-20 09:46:49 +02:00
Fabrixxm 40f2ec189e Merge remote branch 'friendica/master' into blog-like 2012-09-20 02:48:54 -04:00
Michael Vogel 4c389eb73b Merge remote branch 'upstream/master' 2012-09-20 08:32:33 +02:00
Zach Prezkuta da7c5b19b1 allow hidden comments phrase to be accessed separately as number and text 2012-09-19 21:31:26 -06:00
Zach Prezkuta 1aa111387a -- Fix Diaspora profile update avatar bugs
-- Protect BBCode tags inside of [pre] from space re-formatting
-- More information in email poll logging
-- Frost/Frost Mobile bug fixes
2012-09-19 20:35:39 -06:00