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

2732 Commits

Author SHA1 Message Date
Michael Vogel c9307eb96a OStatus conversation are now checked every 30 minutes for new answers. 2013-02-04 00:57:23 +01:00
zottel c0af9b2938 Reset network when showing a contact's posts 
There is similar stuff in the mobile themes, but I didn't touch
them because I wasn't sure if I should and how the smarty3 stuff
works.
 2013-02-01 09:12:37 +01:00
Zach Prezkuta 22c962f1fa remove deprecated call by reference 2013-01-29 18:44:42 -07:00
Michael Vogel 2350aa54eb OStatus-Conversation auto completion works now. 
Some performance issues added as well.
 2013-01-30 01:31:27 +01:00
Zach Prezkuta 2635c59c83 don't block private posts to logged in users on the local hub 2013-01-27 22:42:36 -07:00
friendica a5ac69c65e Merge pull request #591 from fermionic/20130126-javascript-free-theme 
Decaf mobile: an (almost) Javascript-free theme
 2013-01-27 19:11:36 -08:00
friendica 38238972b5 really nitty permission tweaking 2013-01-27 18:10:26 -08:00
Michael Vogel 9967c9892d only change parents when parents are changed. 2013-01-28 01:22:00 +01:00
Michael Vogel e668fece10 ostatus auto completion now seems to work. 2013-01-28 01:16:51 +01:00
Michael Vogel bc972e16ce New function to complete threads from ostatus postings 2013-01-27 23:25:04 +01:00
Michael Vogel 2cb576d305 Bugfixing after adding timestamps 2013-01-27 13:57:44 +01:00
Zach Prezkuta 488a38cd85 Decaf mobile: an (almost) Javascript-free theme 2013-01-26 13:01:57 -07:00
Michael Vogel fdee002f73 Several improvements for performance measuring 2013-01-26 18:35:39 +01:00
Michael - piratica.eu 2c93067682 Performance: Adding several variables for performance measuring. 2013-01-26 16:46:43 +01:00
friendica f542653230 suppress duplicate comment notifications 2013-01-23 17:46:46 -08:00
friendica d074656f26 Merge https://github.com/friendica/friendica into pull 2013-01-23 17:08:21 -08:00
friendica b3b0a9de24 die forcefully but gracefully on missing api templates 2013-01-23 17:07:55 -08:00
Tobias Diekershoff 1f36ebdb2b add display_item hook back around l. 686 to the conversation 2013-01-22 08:11:13 +01:00
Michael - piratica.eu cc9ce39e3f Merge branch 'master' of https://github.com/annando/friendica 
Conflicts:
	include/poller.php
 2013-01-20 14:17:09 +01:00
Michael - piratica.eu 7ab335c9d6 Diaspora: Auto-adding users as friend who already sharing with us 2013-01-20 14:08:28 +01:00
Michael Vogel 4e3d0018c6 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	boot.php
	include/items.php
	update.php
 2013-01-20 14:07:57 +01:00
Zach Prezkuta bf26af5ac6 insidious set_config bug 2013-01-18 23:38:49 -07:00
Michael Vogel 82c00660e0 Preloading of items in the cache when receiving them. 2013-01-17 23:20:40 +01:00
friendica 30f1fb2c4d provide a date indication in reshared content 2013-01-15 14:58:50 -08:00
Zach Prezkuta 2a8e5032e0 run check_config() in a separate process 2013-01-14 16:58:32 -07:00
Michael Vogel 452ff19d73 Redirects sometimes only seems to send the hostname and no path. "fetch_url" respects this. 2013-01-13 18:51:48 +01:00
Michael Vogel 5501dd0759 Searching for tags has been enabled in all places. The tag detection has been improved for imports with missing line feeds. 2013-01-13 17:13:01 +01:00
Michael Vogel 158bfda0ac Changing the tag system to the "term" table. 2013-01-13 14:50:55 +01:00
Michael Vogel 8cef0fa80d Mentions are now displayed much faster. Attention: The related database update can last more than one minute. 
bbcode: The generated HTML is now cleaned up every time (using the DOM) since it happened that bad html broke the network page.
 2013-01-13 09:37:15 +01:00
friendica 8b643d4c88 Merge pull request #581 from fermionic/20130112-backport-red-smarty-improvements 
fixes and tweaks to Smarty processing
 2013-01-12 12:28:14 -08:00
friendica ceaedb41e4 Merge pull request #582 from fermionic/20130112-various-fixes 
Various fixes
 2013-01-12 12:24:51 -08:00
Zach Prezkuta 7f19018cd4 fix leak 2013-01-12 06:56:45 -07:00
Zach Prezkuta 1507ec37a4 give post a chance to arrive before rejecting photos from Diaspora 2013-01-12 06:52:15 -07:00
Zach Prezkuta 74caf1a4a7 * Add MIME types for file attachments 
* Restore translatability to mood phrases
* Prevent casting of "false" in html2plain
* Allow attachments with a comma in the filename
* Fix/optimize ACL img data-src jQuery search
* Fix bug when uploading files with a comma in the name using Chrome/Chromium
* Babel nicer output formatting
* Remove obsolete "plaintext" check in mod/parse_url
* Restore TinyMCE live insertion of images
* Smarty conversion script: add --no-header option to suppress warning headers in Smarty template files
 2013-01-12 06:31:32 -07:00
Zach Prezkuta 609c45e791 fixes and tweaks to Smarty processing 2013-01-12 05:58:54 -07:00
Zach Prezkuta 5f1ef732e0 remove now-unnecessary line in text.php 2013-01-10 21:48:33 -07:00
Zach Prezkuta bce29054b9 allow Smarty use on international templates 2013-01-10 21:46:48 -07:00
Michael Vogel 61c78711df Preparations for a new tag structure. Tags are now stored in a dedicated table. 2013-01-11 01:20:16 +01:00
Michael Vogel 82820d8e95 Now the third most likely languages are shown. 
In "vier" the tag line is now suppressed. It saves a little bit of space - and is redundant.
 2013-01-09 20:54:18 +01:00
friendica 4ab363ed71 bypass smarty wherever using intltext_templates (install, register, friend confirmation emails, etc.) 2013-01-07 20:14:00 -08:00
friendica 07ba4da634 email header encoding everywhere 2013-01-04 15:47:29 -08:00
friendica a5755b59a8 preserve multiple newlines - see discussion at https://github.com/friendica/friendica/pull/570 2013-01-04 15:21:05 -08:00
friendica 88cc414355 Merge pull request #570 from annando/master 
Vier, caches and "share" via API
 2013-01-04 15:13:09 -08:00
Thomas Willingham a8ea3d6e48 We haven't Got Zot 2013-01-03 20:18:43 +00:00
friendica e394ccd0a8 If we're going to encode the email headers, we probably should use the encoded version rather than the original 2013-01-03 03:47:08 -08:00
Michael Vogel e50c0efcdf Merge remote-tracking branch 'upstream/master' 2012-12-30 21:32:18 +01:00
Michael Vogel ad287914c7 Support of "share" through the API. 2012-12-30 21:30:39 +01:00
friendica 215a7f139c make smarty error reporting a bit less chatty 2012-12-30 00:29:07 -08:00
friendica 4b2de6fdf2 if snautofollow - make all SN contacts writable 2012-12-29 02:51:15 -08:00
friendica f962ecdd64 Merge https://github.com/friendica/friendica into pull 2012-12-29 02:36:19 -08:00
friendica 05996457f9 receiving post from archived Diaspora contacts 2012-12-29 02:35:41 -08:00
Zach Prezkuta e684324032 use explicit include paths 2012-12-28 14:51:50 -07:00
Michael Vogel 6f6b1f95c8 vier: With IE there are no borders around images anymore 
bbcode: Multiple new lines are now reduced
 2012-12-28 11:31:30 +01:00
Fabrixxm b620b6e608 api: add 'allow_api' to user authenticated via oauth 2012-12-27 10:20:51 -05:00
fermionic d3c54438df Merge pull request #563 from fermionic/20121225-smarty-includes-like-friendicas 
revert unnecessary variable name changes
 2012-12-26 09:44:27 -08:00
Zach Prezkuta 263fe0f6bc revert unnecessary variable name changes 2012-12-26 10:42:01 -07:00
fermionic 7e9730089f Merge pull request #561 from fermionic/20121225-smarty-includes-like-friendicas 
20121225 smarty includes like friendicas
 2012-12-25 11:08:06 -08:00
Zach Prezkuta e736abd372 small fixes; update smarty3 templates 2012-12-25 12:05:46 -07:00
Zach Prezkuta 11c06e21b7 simplify by making Smarty include directives behave like Friendica native ones 2012-12-25 11:55:57 -07:00
Michael Vogel 5bc6896671 The caches are now cleared only once an hour. 2012-12-25 12:52:30 +01:00
Zach Prezkuta f0f8d0f687 delete cookie on browser close after logout 2012-12-24 12:52:49 -07:00
fermionic a0d7f7a6d3 Merge pull request #550 from fermionic/20121222-use-smarty-template-engine 
only use Smarty if the view/smarty3/ directory is writable
 2012-12-23 05:19:02 -08:00
Zach Prezkuta 53a4cf5339 only use Smarty if the view/smarty3/ directory is writable; location bug fix 2012-12-23 06:16:35 -07:00
friendica a29842e301 Merge https://github.com/annando/friendica into annando 
Conflicts:
	view/admin_site.tpl
 2012-12-22 23:02:21 -08:00
Zach Prezkuta 96ed0a7791 Implement Smarty3 2012-12-22 12:57:29 -07:00
Michael Vogel b0759e9a9f Some more system settings are now reachable via front-end 
Bugfixing in the mail import when a reply header isn't set correctly
 2012-12-22 16:16:01 +01:00
Michael Vogel 99ca867869 The performance settings and other systems settings (lock file path, temp path) can now be set via the front end. 2012-12-21 18:23:55 +01:00
Michael Vogel 7c7d3fe5de "share" - now the attribut value for the "author" is escaped 2012-12-21 02:10:26 +01:00
Michael Vogel f4bc5c57f3 New option to enable and disable the "share" element 
Changes to "vier" to use more "font awesome" icons
 2012-12-21 00:08:58 +01:00
Michael Vogel a8aa992102 Vier: Design issues with preview fixed 2012-12-20 04:19:02 +01:00
Michael Vogel 0a29927e6d Mail: real threading now works with outgoing mails. 2012-12-19 16:31:06 +01:00
Michael Vogel a86baa372a Mailimport is now realized like a wall-to-wall-post 2012-12-19 15:58:38 +01:00
Michael Vogel c22f65bafa repeated items from ostatus and diaspora are now using the share-element. 
Some design changes to repeated items in "vier".
 2012-12-19 12:18:52 +01:00
Michael Vogel 9ab34f8857 mail: "reply-to" now triggers the "sender"-header instead of the "reply-to"-header. 2012-12-18 00:47:55 +01:00
Michael Vogel fc816feb6d mailimport: Bug that prevented mails to be imported 2012-12-17 21:39:52 +01:00
Michael Vogel 4164257cb2 vier: The alt-pager and the birthday- and eventreminder is optically improved 2012-12-17 21:12:11 +01:00
Michael Vogel a6b1275f16 Merge remote-tracking branch 'upstream/master' 2012-12-17 10:32:53 +01:00
Michael Vogel 9c0de28622 bbcode: New element "share" for shared content 
mail: Now mails connected via subject line if there isn't an appropriate header.
vier: Improvents to the theme so that shared messages are looking fine
 2012-12-17 03:01:40 +01:00
friendica 0f1592547e Merge https://github.com/friendica/friendica into pull 2012-12-16 17:59:15 -08:00
friendica 3f63a69d7a divide by zero on incorrectly specified oembed thumbnail size 2012-12-16 17:58:12 -08:00
Michael Vogel d253d59668 vier: Added Delegations and optical changes. 2012-12-15 14:39:37 +01:00
Michael Vogel 46c5a97a20 New caching system for photos 2012-12-14 22:47:30 +01:00
Fabrixxm 71751ecb8c template_processor: add filter support to variables 2012-12-14 10:10:33 -05:00
friendica 6b36863dd8 prune all dead/blocked contacts from allowed permissions, ok to keep them in "deny" lists - 
Contacts will be pruned when creating the editor. They can't be added with the ACL selector,
but we won't prevent them from being added through other means.
Allowed groups will be pruned on item submit.
 2012-12-13 21:02:14 -08:00
friendica 376bf517a4 bug #516 - set writable on first poll 2012-12-06 13:59:20 -08:00
friendica 8b5288d0f7 Merge pull request #540 from Leberwurscht/master 
Cross site request forgery hole
 2012-12-03 13:40:29 -08:00
tobiasd 23c873fc51 Merge pull request #542 from annando/master 
Some minor changes to "vier"
 2012-12-02 23:49:06 -08:00
Michael Vogel 5635fe250c Merge remote-tracking branch 'upstream/master' 2012-12-03 08:30:49 +01:00
Leberwurscht 945afec656 fix CSRF hole in API 2012-12-01 01:26:54 +01:00
friendica b130c892b2 features categories were un-translatable 2012-11-28 19:25:09 -08:00
friendica 32868dab79 catch stragglers in "chunked" delivery mode 2012-11-27 15:17:41 -08:00
friendica 5d904a9fa8 improve performance of photo upload page 2012-11-25 19:34:54 -08:00
friendica 226d1ba7c1 Merge pull request #537 from fermionic/20121121-features 
Port Features from Red
 2012-11-22 20:54:16 -08:00
Zach Prezkuta a536a4e657 local stuff leaked 2012-11-22 09:21:21 -07:00
Zach Prezkuta 04f5506318 forgot some slightly important files 2012-11-22 09:20:03 -07:00
Zach Prezkuta 94204d9160 implement features 2012-11-22 09:14:22 -07:00
Michael Vogel e36c30d285 Vier: Margin problems with code fixed. 2012-11-22 15:06:15 +01:00
friendica 9835efc9e4 fix jenkins tests 2012-11-22 05:06:15 -08:00
friendica 868bdc9b6a php warning 2012-11-22 03:19:05 -08:00
friendica 0840c8365a always check for valid dfrn_id before auto_redir 2012-11-21 15:56:00 -08:00
friendica 4d289574ca ensure that auto_redir does not loop 2012-11-21 15:41:14 -08:00
friendica f1c579e74a Merge https://github.com/friendica/friendica into pull 2012-11-18 23:50:37 -08:00
friendica 70d0ed9402 log directory updates 2012-11-18 22:53:01 -08:00
Michael Vogel 5dbf89be88 Making the new reshare method optional 2012-11-17 16:27:49 +01:00
Michael Vogel f17377e6de New cache system with subdirectories 2012-11-17 00:50:39 +01:00
Michael Vogel e67062d9cf Merge remote-tracking branch 'upstream/master' 2012-11-15 21:52:35 +01:00
friendica ab0dc3131a fix wallmessage 2012-11-14 13:59:31 -08:00
friendica 3dc4c52022 Merge pull request #533 from fabrixxm/moveme 
Fix issue 508
 2012-11-13 14:06:20 -08:00
Fabrixxm 374683503a uimport: check check to ensure the username isn't already taken before import (issue 508) 2012-11-13 04:52:32 -05:00
friendica 009744af50 allow posted ACLs to be comma-delimited string besides the default array 2012-11-11 13:56:21 -08:00
friendica 6e0dd29c1b include some notes on grabbing the tumblr avatar 2012-11-11 00:44:30 -08:00
friendica de5a21bec4 improve recognition of tumblr feeds. I hope we don't need special feed logic to find the feeds for every site on the web. We were so far beyond this ten years ago. 2012-11-11 00:28:21 -08:00
Michael Vogel b875191237 Diaspora: Avatars of repeated items weren't found 
Vier: Complete redesign of the navigation header
 2012-11-10 23:19:32 +01:00
Michael Vogel 71e43e68d4 Merge remote-tracking branch 'upstream/master' 2012-11-09 23:40:17 +01:00
Zach Prezkuta ac164cfca8 refresh login time every 12 hours for 'Remember me' 2012-11-08 17:00:37 -07:00
Michael Vogel 5d2d306d9f Make reshared Diaspora postings look lile wall-to-wall postings (preparation for real forwards in friendica) 2012-11-08 21:45:53 +01:00
Michael Vogel 4196b6a96c Merge remote-tracking branch 'upstream/master' 2012-11-08 21:44:17 +01:00
Zach Prezkuta e116712bf5 add ability to remember logged in user after browser closes 2012-11-07 18:59:30 -07:00
Zach Prezkuta 999c3439e6 fix mobile photo uploads; better theme control; frost improvements 2012-11-06 08:43:19 -07:00
friendica 776552226b Merge https://github.com/friendica/friendica into pull 2012-11-06 01:10:36 -08:00
friendica fd4d35b16c set writable for ostatus followers 2012-11-06 01:10:12 -08:00
zzottel eb3408b574 Merge pull request #526 from zzottel/master 
Forgot to commit the changes(regarding fermionic's comments) in notifier.php
 2012-11-05 23:18:48 -08:00
zottel b7e121ccf7 Forgot to commit the changes (regarding fermionic's comments) in notifier.php 2012-11-06 08:16:08 +01:00
Fabrixxm cef5afc53d moveme: remove debug comment 2012-11-05 04:15:09 -05:00
Fabrixxm 5b4944fe8e Merge remote-tracking branch 'remotes/friendica/master' into moveme 2012-11-05 09:37:58 +01:00
Fabrixxm 385ee5a862 pass $argv & $argc as reference to *_run() functions. 2012-11-05 09:28:54 +01:00
Fabrixxm aa20042bec moveme: fix contact photos 2012-11-05 09:18:55 +01:00
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
Fabrixxm 1a3a5ee8d9 moveme: first successful relocated user 2012-10-31 17:13:45 +01: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
Fabrixxm dbc6cbe024 moveme: send and receive DFRN "relocate" message (WIP) 2012-10-29 17:50:55 +01:00
Fabrixxm c51e057fe6 Merge remote branch 'friendica/master' into moveme 2012-10-29 05:57:58 -04: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
Fabrixxm 65d235017c move account. first step. 
export basic account data as json
import basic account data in db (dbs must be at same schema version)
 2012-10-17 11:13:01 -04: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
Fabrixxm b400ddd22d conversation: new 'categories' and 'folder' elements to $item 
remove static "Filed under" e "Category" text from message body
both are lists of array whith
'name' : category/folder name
'remove': url to remove
'first': bool first in array
'last' : bool last in array
 2012-09-19 11:38:32 -04:00
friendica 66081201bc allow "subscribe to thread" activities to exist without displaying them. 2012-09-18 20:12:55 -07:00
friendica 2abbd1dc19 permissions selector showing up for guests, testbubble and smoothly 2012-09-15 20:21:17 -07:00
friendica 669d2b890e rev update - add cancel markup to editor 2012-09-15 15:23:15 -07:00
friendica 32d4a359f1 reverse the default newuser privacy setting to public. Sites can over-ride. 2012-09-13 19:11:07 -07:00
friendica d19a3b8324 provide separate hashtag and mentions for themes in addition to composite tags 2012-09-13 16:59:25 -07:00
friendica f4e3f335ef don't allow followers to get a post through unless it's a tag deliver 2012-09-12 18:53:20 -07:00
friendica 3d6c49d5b3 Merge https://github.com/friendica/friendica into pull 2012-09-12 17:20:52 -07:00
friendica db09724aec use local photo for tag notifications if available 2012-09-12 17:19:26 -07:00
Domovoy 67563d5c82 Fallback to gd if Imagick can't load the data 2012-09-12 11:55:09 +02:00
Michael Vogel 5cfb068c25 Merge remote branch 'upstream/master' 2012-09-10 23:28:07 +02:00
Domovoy 16eec24a21 Tabs trouble? What happened? I sure aven't changed anything to my editor... 2012-09-10 10:36:30 +02:00
Domovoy 1b82df60db Port friendica/friendica#79012bf8882baa6843726bcffbcafe959028c1bd 2012-09-10 09:50:30 +02:00
Domovoy bb68461c6d Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 
Conflicts:
	include/conversation.php
 2012-09-10 09:19:08 +02:00
friendica 5c0f0df59a provide local_block - block_public as far as content but can connect with the grid. 2012-09-06 20:17:50 -07:00
Thomas Willingham d0994fc882 Merge branch 'master' of https://github.com/friendica/friendica 2012-09-07 00:44:01 +01:00
Thomas Willingham 5f970aea72 Typo in notifier. 2012-09-07 00:43:05 +01:00
fermionic 9bf8efc45f Merge pull request #459 from fermionic/individual-choice-of-mobile-theme 
Individual choice of mobile theme
 2012-09-06 16:35:04 -07:00
Zach Prezkuta a089a89478 small twitter improvements 2012-09-06 17:31:05 -06:00
Zach Prezkuta 77529ccdf1 allow individual choice of mobile themes 2012-09-06 17:24:34 -06:00
friendica 1478229abc allow comments on other folks wall-to-wall postings 2012-09-05 18:24:06 -07:00
friendica 3968dc932f update writable for dfrn contacts when using local delivery 2012-09-05 16:26:11 -07:00
friendica 9e5fa5b9a9 ignore exif orientation if we can't parse the particular flavour of exif 2012-09-05 04:02:30 -07:00
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
Michael Vogel 59d378913d Merge remote branch 'upstream/master' 2012-09-04 07:22:59 +02:00
friendica cdf648c0b4 attachments from non-friendica contacts shouldn't go through redir - it won't work 2012-09-03 21:31:35 -07:00
Michael Vogel f6818ab243 Merge remote branch 'upstream/master' 2012-09-02 17:50:25 +02:00
Michael Vogel 3c24a7ed3e items: added some logging infos 2012-09-02 17:49:06 +02:00
friendica 39c7b34276 rev update 2012-09-02 01:47:04 -07:00
friendica 2ace7d6646 Merge pull request #451 from fabrixxm/master 
fixes and tweaks
 2012-08-31 01:26:03 -07:00
Domovoy ef52ff6b01 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-30 07:47:21 +02:00
Fabrixxm f433158bed config: fix get_config and get_pconfig search for serialized array 
works also if the serialized string contains newlines
 2012-08-29 04:19:15 -04:00
Zach Prezkuta f7a1999c15 manually fix escaped underscores in links 2012-08-28 20:12:41 -06:00
fermionic 597e96e156 Merge pull request #447 from fermionic/zrls-and-redir-photos-broken-with-tags 
regular expressions were grabbing too much
 2012-08-28 19:03:04 -07:00
fermionic 8c064069d9 Merge pull request #443 from fermionic/new-users-privacy-settings 
automatically make posts private for new users
 2012-08-28 19:02:51 -07:00
Fabrixxm 9ecb984285 Merge remote branch 'friendica/master' into bid-prov 2012-08-28 10:38:40 -04:00
Zach Prezkuta 72712175b5 regular expressions were grabbing too much 2012-08-26 14:56:34 -06:00
Zach Prezkuta 193cc2c537 try to get rid of scrollbars in Frost 2012-08-25 22:42:12 -06:00
Zach Prezkuta f062ccbb66 add documentation; add to admin panel; some tweaks and interface stuff 2012-08-25 15:03:16 -06:00
Zach Prezkuta bd59f3d152 probably shouldn't require exact match for non-string 2012-08-24 21:46:42 -06:00
Zach Prezkuta 7c5f5f3113 automatically make posts private for new users 2012-08-24 21:28:28 -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 72f3d628e8 Merge branch 'wall_to_wall' of github.com:CyberDomovoy/friendica into threaded_items 2012-08-24 04:58:11 +02:00
Domovoy c9cfc52293 method, not property 2012-08-24 04:57:32 +02:00
Domovoy 71d9c95faf Merge branch 'wall_to_wall' of github.com:CyberDomovoy/friendica into threaded_items 2012-08-24 04:47:29 +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
Domovoy f1bc2afbfe Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-23 10:25:22 +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
Domovoy 1406480258 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-19 14:14:33 +02:00
friendica 6bc48b58d8 algorithm for crypt tag 2012-08-19 00:35:39 -07:00
Domovoy 51802b0ae8 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-18 17:23:46 +02:00
Domovoy 17f9fcaec9 Checks done on topmost parent in local_delivery, closes #10 2012-08-18 17:17:33 +02:00
friendica d96b9cda43 wall-to-wall posts not identified correctly after thread mod 2012-08-17 22:06:13 -07:00
Domovoy 429870015f Comments on friends are back (stupid typo) 2012-08-17 16:20:28 +02:00
Domovoy 16260e9fbb Merge branch 'threaded_items' of github.com:CyberDomovoy/friendica into threaded_items 2012-08-17 15:49:23 +02:00
Domovoy 1581e02f8f Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-17 09:46:43 +02:00
Michael Vogel d40f25ae08 bbcode: Function for cleaning CSS commands (not yet in function) 
items.php: The detection if a rss/atom-title is identically to the body is improved.
 2012-08-17 07:59:21 +02:00
friendica 68d7a3ae01 put a variant of the parent_uri into email notification message-ids. Current message-ids aren't completel legal. More work to do. 2012-08-15 17:14:29 -07:00
friendica e802c81ec1 fix single quotes 2012-08-15 05:09:44 -07:00
friendica b8df47e97c bbcode quote display 2012-08-15 04:52:18 -07:00
friendica bb188cbdf2 extra email enotify logging to help convince dreamhost that they've got breakage in one of their queues. 2012-08-15 02:59:17 -07:00
friendica 4654ebd43b correct the invocation for htmlspecialchars to handle quote display issues with editplain and reshare 2012-08-15 00:02:15 -07:00
friendica aaadabf7d2 partial fix for D* public key format change 2012-08-14 02:20:48 -07:00
Zach Prezkuta 7d8aee05ef update items seen in DB when using API 2012-08-12 20:29:37 -06:00
friendica bfec28f1fe threading messed up a bit of cross-site federation code 2012-08-12 18:42:43 -07:00
Domovoy 82d779a33b Conversation and Item now handles (dis)like as they should 2012-08-12 17:46:02 +02:00
Domovoy 04f14d96c6 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-12 17:34:23 +02:00
Domovoy 71f11a9a32 Item: new method get_comment_box 2012-08-12 16:02:47 +02:00
friendica e81f15b28d crypt bbcode tag 2012-08-12 04:29:26 -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
Domovoy d817117f6e Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 
Conflicts:
	include/conversation.php
 2012-08-11 16:42:47 +02: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
Domovoy 75d355a2aa Rendering is now done by Item objects 2012-08-10 19:57:39 +02:00
Domovoy 6ef86e1fff New objects: Conversation and Item 2012-08-10 17:46:39 +02:00
Zach Prezkuta 009ebc732a move tag transformation to bb2diaspora; start taking out unnecessary signature stuff 2012-08-10 08:13:17 -06: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
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
Fabrixxm 672f9fd87f include/plugin: define THISPLUGIN as "addon/$pluginname/$pluginname.php" 
to make life a litte bit easy to lazy plugin devs like me
 2012-07-27 09:02:28 -04: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
Domovoy ba76af3488 Forgot a ; 2012-07-22 17:50:58 +02:00
Domovoy 36f600aaf2 Moved compression setup in constructor for Imagick 2012-07-22 17:27:09 +02:00
Domovoy a3df0d9817 get_FormatsMap doesn't need to be static 2012-07-22 17:09:18 +02:00
Domovoy 62cd4dcb77 Set the type to what it will be saved to in the constructor 2012-07-22 17:07:13 +02:00
Domovoy 7a1f15c8da Always coalesce, if it is not a multi-frame image it won't hurt anyway 2012-07-22 16:27:22 +02:00
Domovoy c0d3d50fb5 Don't forget to clean frames before saving 2012-07-22 16:22:06 +02:00
Domovoy ab484ebc76 getExt should not use Imagick format, mapping ext and mime type is more accurate. 2012-07-22 16:19:35 +02:00
Domovoy 83075c2f27 Set the Imagick image format in the constructor, so we can uset [get|set](image)XXX methods as intended 2012-07-22 16:12:47 +02:00
Domovoy 689e3028bf Use getImageFormat to know the image format in the constructor. 
Since we don't load the image with Imagick constructor, we need to use the [get|set]imageXXX methods.
We should be able to handle the image as if it was loaded from Imagick constructor, so that we don't get lost between the image and its frames.

Also added a debug log so that we get some info on unhandled mime types.
 2012-07-22 15:24:41 +02:00
Domovoy 0acb983be4 guess_image_type now uses Imagick::getImageMimeType() 2012-07-22 15:17:40 +02:00
Domovoy 5d0bd98d2a Photo::getType() now uses the accurate Imagick::getImageMimeType() 2012-07-22 14:50:19 +02:00
Domovoy f723f756fd Photo::scaleImageSquare was giving an inexistent variable to scaleImage. 2012-07-22 14:22:47 +02:00
Domovoy 6c2cd91184 gd is back in the game as a fallback: not everybody can have Imagick. 2012-07-22 13:43:46 +02:00
Domovoy fb2f4b6b35 Photo now uses Imagick instead of gd. 2012-07-21 17:17:19 +02:00
friendica 43d986cab2 one for the ladies who get poked by undesirables. 2012-07-20 00:47:30 -07:00
friendica 700569c7d6 this is the one I'll probably use the most 2012-07-19 22:40:45 -07:00
friendica 9c72b45f36 and the main photo menu 2012-07-19 21:27:22 -07:00
friendica 64bd634582 add poke to contact photo menu 2012-07-19 21:03:31 -07:00
friendica a54278649f poke notifications 2012-07-19 20:13:40 -07:00
friendica d442bbc482 have fun... 2012-07-19 18:17:16 -07:00
Michael Vogel c8f99a8a66 Merge remote branch 'upstream/master' 2012-07-18 21:03:57 +02:00
friendica 749ae9b297 filter the protocol specifier in bbcode links. 2012-07-17 18:33:04 -07:00
friendica f440d76200 recover from datetime parse issues, inspired by https://github.com/friendica/friendica/pull/396 2012-07-15 21:00:11 -07:00
friendica 02d88e7cbe name mixup in wall-to-wall hovertips 2012-07-15 20:56:09 -07:00
friendica 210fe188b2 missing param 2012-07-15 17:07:53 -07:00
Michael Vogel 7aa10d1935 Merge remote branch 'upstream/master' 2012-07-15 17:26:00 +02:00
Michael Vogel 335c15ede5 Hopefully the final fix for image links in bb2diaspora 2012-07-15 13:40:01 +02:00
Michael Vogel 8aeb3ec2fb Corrected the fix for images with links 2012-07-15 13:12:24 +02:00
Michael Vogel 4e9086f9b0 Changes in the bbcode to markdown converter to make it more compatible with Diaspora 2012-07-15 12:47:24 +02:00
Michael Johnston 717fd8539b add alt_pager function, add ability to use new pager logic on network, profile, community, and search. 2012-07-14 14:21:58 -04:00
Michael Vogel 8d7d46ae7a Bugfix: multiple linefeeds were generated when items where written in the editor. The existing fix didn't really work 2012-07-14 19:54:27 +02:00
Michael Vogel 72f430ae58 parse_url: Problem when resizing images 2012-07-14 13:59:42 +02:00
friendica 8b6942c572 don't use language detection if < php 5.3 2012-07-13 15:38:02 -07:00
Michael Vogel bfca7f47ef Merge remote branch 'upstream/master' 
Conflicts:
	include/bb2diaspora.php
 2012-07-13 23:39:51 +02:00
Michael Vogel 5f400c4a97 API: Now returns a real 404 when a function isn't implemented 
parse_url: Image handling improved
 2012-07-13 23:23:31 +02:00
friendica f30b694ae4 Merge pull request #389 from fermionic/diaspora-likes-on-comments 
make likes on comments work with Diaspora, fix some small bugs
 2012-07-12 22:52:00 -07:00
friendica 7b4accec81 Merge pull request #390 from fermionic/diaspora-fixed-mangled-text 
focus preg_replace to prevent it from catching too much
 2012-07-12 22:51:20 -07:00
Zach Prezkuta f92338d79b make likes on comments work with Diaspora, some small bugs 2012-07-12 23:14:39 -06:00
Zach Prezkuta 92db5e5ec2 focus preg_replace to prevent it from catching too much 2012-07-12 23:14:29 -06:00
friendica 7f7e2c5de0 add plink to profile notifications 2012-07-12 16:12:37 -07:00
Michael Vogel 02a1fc9cd0 parse_url: Further improvements of the new method to fetch page data 2012-07-12 23:41:04 +02:00
friendica 9a299920eb language detection - result is stored in item['postopts'] 2012-07-11 22:45:14 -07:00
friendica 085b589468 add some sparkle to plinks 2012-07-11 21:04:08 -07:00
friendica 86cb638637 notification issue on wall-to-wall posts 2012-07-11 02:58:57 -07:00
Zach Prezkuta fc6f7daf38 small cleanup 2012-07-10 19:28:38 -06:00
Zach Prezkuta d89b4cea64 missed a couple of variable names when I redid comment and like code 2012-07-09 20:36:25 -06:00
Zach Prezkuta 00eb000e36 don't check for was_recently_delayed in diaspora_transmit during a queue run 2012-07-09 09:39:09 -06:00
friendica ab710bce3b Merge https://github.com/friendica/friendica into pull 2012-07-08 22:34:21 -07:00
friendica caabb43326 diaspora message receive security issue - check message crypto signer against purported message author and bail if they don't match. 2012-07-08 22:32:04 -07:00
friendica fcf971fea9 Merge pull request #383 from fermionic/auto-orient-all-uploaded-images 
auto-orient uploaded wall photos and profile photos also
 2012-07-08 15:32:20 -07:00
Michael Vogel 47c48aa438 DBA: Possibility to log the database speed 2012-07-08 21:27:20 +02:00
Zach Prezkuta fb4295f07f better check for image EXIF support 2012-07-08 11:17:50 -06:00
Michael Vogel db2f0f7919 Bugfix: API: No extra encoding for the status text - makes it more compatible to statusnet 
Bugfix: BBCode: Fixed charset problems.
 2012-07-08 18:27:11 +02:00
Zach Prezkuta 9fbe921051 auto-orient uploaded wall photos and profile photos also 2012-07-08 09:18:05 -06:00
Zach Prezkuta c8378260bc check for posted dates based on month only 2012-07-08 08:46:46 -06:00
Zach Prezkuta 6d10374c17 cleanup 2012-07-07 18:50:46 -06: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
Zach Prezkuta 57635e7684 add function to exclude embedded images when checking message length 2012-07-07 16:24:20 -06:00
Michael Vogel e9d7f85297 network: Small changes 2012-07-07 20:40:15 +02:00
friendica 0c5af9f303 Merge pull request #379 from fermionic/events-display-wrong-in-diaspora 
remove check for event description in bb2diaspora
 2012-07-07 04:19:15 -07:00
Zach Prezkuta 4fb996d9f7 remove check for event description, since it's not required to create an event 2012-07-06 17:11:25 -06:00
Vasudev Kamath ba4db236ec Merge branch 'master' of git://github.com/friendica/friendica 2012-07-06 22:47:27 +05:30
friendica a6514e81bb remove obsolete zot encapsulation functions 2012-07-05 20:58:45 -07:00
Zach Prezkuta 47c7fd89ba my php thinks this is a typo 2012-07-05 20:39:22 -06:00
Zach Prezkuta 5395cf5bd9 clear title and body of items on local delete 2012-07-05 20:07:01 -06:00
friendica 854abcf612 Merge pull request #376 from fermionic/diaspora-prevent-fcontact-race-conditions 
slightly better way of handling last loop
 2012-07-05 18:10:32 -07:00
Zach Prezkuta 528d250ded slightly better way of handling last loop 2012-07-05 19:08:30 -06:00
friendica 09959b1b1c Merge pull request #375 from fermionic/diaspora-prevent-fcontact-race-conditions 
add some timeouts to prevent deadlock
 2012-07-05 18:05:32 -07:00
Zach Prezkuta 5dcce1ed93 add some timeouts to prevent deadlock 2012-07-05 19:01:13 -06:00
friendica fe984963ed Merge pull request #373 from fermionic/more-list-fixes 
fix small bug in lists and revert Diaspora list processing to non-Markdo...
 2012-07-05 16:03:29 -07:00
Michael Vogel dafc84390d Improvments of the HTML to make a better bb2markdown conversion (nested lists, youtube, vimeo, ...) 2012-07-05 23:36:00 +02:00
Zach Prezkuta e0607e0238 cleanup some syntax errors in lock.php 2012-07-05 14:27:29 -06:00
Zach Prezkuta 75ed37fb3d "lock" is a reserved MySQL keyword 2012-07-05 14:27:29 -06:00
Zach Prezkuta 46068935d0 minor cleanup in lock.php 2012-07-05 14:26:42 -06:00
Zach Prezkuta 20c4ecbcd9 cleanup obsolete comments 2012-07-05 14:26:42 -06:00
Zach Prezkuta 168ae40dd2 add rudimentary locking capability to Friendica functions 2012-07-05 14:26:42 -06:00
Zach Prezkuta 041aeaf4a1 fix small bug in lists and revert Diaspora list processing to non-Markdownify version 2012-07-05 12:54:52 -06:00
friendica 360c35e438 recycle symbol woes with multiple html entity encode/decode cycles going on 2012-07-04 23:24:59 -07:00
friendica e29dd081ca render the recycle symbol correctly on Diaspora reshares 2012-07-04 22:44:04 -07:00
friendica f40b056e3b some initial code and benchmarking for "red" content rendering engine 2012-07-04 20:37:15 -07:00
friendica 0990269555 restore translation of bbcode videos, events, bookmarks, etc. to diaspora 2012-07-04 19:12:09 -07:00
friendica 5589bca1e0 fix !@#$ tinymce linebreaks for the thousandth time 2012-07-04 17:15:43 -07:00
friendica c726a92a3f punycode hostname 2012-07-03 21:40:13 -07:00
friendica ced0a208d8 fix double lines 2012-07-02 16:34:01 -07:00
friendica 315784444a try and get unadulterated bb2md2html2bb for simple stuff, then we'll work up to harder stuff 2012-07-02 01:11:19 -07:00
friendica dd71f9446b config to disable email validation 2012-07-01 18:56:00 -07:00
friendica 6cc844b2f9 restore 'shareable' to feeds after recent feed privacy re-factoring 2012-06-30 05:16:30 -07:00
Michael Vogel bcca817b9a Removing of the title if it is the same (or part) from the body. Helps against auto generated titles from tumblr. 2012-06-30 09:25:22 +02:00
Michael Vogel 65268d25e6 Merge remote branch 'upstream/master' 
Conflicts:
	include/items.php
 2012-06-29 21:43:49 +02:00
Michael Vogel 52569e536e Tests considering removing of the title 2012-06-29 21:40:54 +02:00
Fabrixxm 0fb08e3642 nav: pass $baseurl to template 2012-06-29 05:29:29 -04:00
friendica 43036bee98 wrong column name (- vs _) 2012-06-28 21:32:49 -07:00
friendica 1830ecc9ba remote_self feeds are not private 2012-06-28 18:52:49 -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 43d3721fa9 css smiley class 2012-06-28 16:42:40 -07:00
friendica d7f35c81db Merge https://github.com/friendica/friendica into pull 2012-06-28 16:05:28 -07:00
friendica de93c61e0d remove titles in ostatus even when edited date differs from created date 2012-06-28 16:04:00 -07:00
Zach Prezkuta cd9ce0ecb3 fix logic for nested lists--should be OR, not AND 2012-06-27 21:21:26 -06:00
Sebastian Egbers 587b081a38 moved api direct message formating to own function. 
added same formating to direct reply message, when posting a new message.
 2012-06-26 08:54:01 +02:00
Sebastian Egbers 0f0fb2e2f3 Merge branch 'master' of https://github.com/friendica/friendica 2012-06-26 08:33:41 +02:00
friendica a4b407eb54 stray s 2012-06-25 22:01:32 -07:00
friendica d32d0e2154 typos 2012-06-25 21:39:07 -07:00
friendica 78ede4744f add event titles to discovered birthday events 2012-06-25 21:37:38 -07:00
friendica 0f0ffce1b6 change required doco 2012-06-25 21:27:34 -07:00
friendica 359a98cd22 change event behaviour so that title is required but description is not 2012-06-25 21:20:08 -07:00
friendica fbaca4b742 event summary/title 2012-06-25 20:55:27 -07:00
friendica 53f0aee82d Merge https://github.com/friendica/friendica into pull 2012-06-25 18:16:55 -07:00
friendica f1991a5952 propagate remote deletes 2012-06-25 18:15:56 -07:00
Zach Prezkuta 5773241537 add some debug logging 2012-06-25 19:03:03 -06:00
Zach Prezkuta c0c50ece0f revert extra Diaspora disabling changes to try to eliminate Mustard double-posting 2012-06-25 19:03:03 -06:00
Zach Prezkuta 8bb7ab88fb Clean up the Diaspora connectivity: 
- Move Diaspora code into separate functions to make it more modular
- Create more checks for whether Diaspora connectivity has been enabled
 2012-06-25 19:03:03 -06:00
friendica f0b41709eb improve remote delete forwarding 2012-06-25 17:45:33 -07:00
friendica fad2679c7e Merge https://github.com/friendica/friendica into pull 
Conflicts:
	include/bbcode.php
 2012-06-25 16:05:42 -07:00
friendica b044cd922d typos in bbcode, add service class restrictions to jot uploads 2012-06-25 16:03:46 -07:00
Simon L'nu 939ebe16f8 fix typo and syntax error 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-06-25 18:49:36 -04:00
friendica cb450d3365 Merge pull request #360 from fermionic/more-nested-lists 
allow nested [ol] and [ul] lists too
 2012-06-25 14:20:16 -07:00
Zach Prezkuta fa7e803f73 fix check for parent of StatusNet API post 2012-06-25 08:26:12 -06:00
Zach Prezkuta 4293de7554 allow nested [ol] and [ul] lists too 2012-06-25 08:26:00 -06:00
Sebastian Egbers 8c251aebc7 fixed direct message reply in api call. 2012-06-25 16:25:34 +02:00
Sebastian Egbers af1d4bb632 modified api message reply to set title to conversion title, when replying. 2012-06-25 15:53:56 +02:00
Sebastian Egbers 020deedd7c Merge branch 'master' of https://github.com/friendica/friendica 2012-06-25 13:59:39 +02:00
friendica 7ea5917bf7 more service class functionality 2012-06-25 03:25:06 -07:00
friendica 35a098e0dc service limits for photo uploads 2012-06-25 01:37:44 -07:00
friendica ad6c82bdea implement "follow" service limits 2012-06-24 22:23:17 -07:00
friendica c464bc494c add like/dislike to profiles 2012-06-24 21:16:55 -07:00
friendica 7f3813e9b0 service class basics 2012-06-24 00:56:27 -07:00
fermionic 49ecf58163 Merge pull request #357 from fermionic/fix-relayable-signature-handle 
ok now I'm just making silly mistakes--take out premature function locki...
 2012-06-23 21:29:52 -07:00
Zach Prezkuta 59ebe6f111 ok now I'm just making silly mistakes--take out premature function locking code 2012-06-23 22:28:28 -06:00
friendica 92a997365f Merge https://github.com/friendica/friendica into pull 2012-06-23 21:11:41 -07:00
friendica 1574396d04 sort out some "like" issues 2012-06-23 21:11:18 -07:00
fermionic 642880f89a Merge pull request #356 from fermionic/fix-relayable-signature-handle 
use author handle instead of sender handle
 2012-06-23 21:08:43 -07:00
Zach Prezkuta 0877c5b687 use author handle instead of sender handle 2012-06-23 22:04:20 -06:00
Zach Prezkuta 5d2eed3517 allow bare URLS to make it through to Diaspora 2012-06-23 22:02:08 -06:00
Zach Prezkuta 1f96839674 small optimization 2012-06-23 20:01:29 -06:00
Zach Prezkuta 4ef33ac6eb fix BB-to-Diaspora list formatting 2012-06-23 19:57:59 -06:00
Max Weller cbf1cab0da Merge remote-tracking branch 'sebastian/master' 2012-06-23 22:59:03 +02:00
Max Weller e3c36dfd1d add reliable way to get server version 2012-06-23 22:52:50 +02:00
Max Weller 11b6beae06 make it selectable 2012-06-23 22:39:11 +02:00
Max Weller 111ace5abd I want HTML code! 2012-06-23 22:35:43 +02:00
Max Weller 9d462c6b6a new param getUserObjects to avoid retransmitting the whole user info objects 2012-06-23 19:38:15 +02:00
Max Weller 2c992c5969 bugfix 2012-06-23 19:35:01 +02:00
Max Weller f45c881815 changes on api_direct_messages_box to allow to retrieve conversations and all messages 2012-06-23 19:29:58 +02:00
Max Weller d8a376666c modified direct_messages 2012-06-23 19:21:48 +02:00
Zach Prezkuta 90f8454190 allow linking to Diaspora's scaled-down images 2012-06-23 11:02:15 -06: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 63141c73d8 debugging 2012-06-23 07:26:45 -07:00
friendica a132eda2cf cokmment likes not propagating 2012-06-23 06:41:37 -07:00
friendica 1ba0d73a9a make feeds work with comment likes/dislikes 2012-06-23 06:13:11 -07:00
friendica f55e8e831c typo 2012-06-23 06:04:56 -07:00
friendica 49360b0a64 Merge https://github.com/friendica/friendica into pull 2012-06-23 05:47:31 -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
Michael Vogel a81af2e042 Merge remote branch 'upstream/master' 
Conflicts:
	include/bb2diaspora.php
 2012-06-23 12:50:00 +02:00
Michael Vogel 7a4ad4564d Diaspora: Messages are now looking better 2012-06-23 12:42:01 +02:00
Zach Prezkuta 9c9e727042 cleanup lists and more comment signature stuff 2012-06-22 20:45:37 -06:00
Zach Prezkuta 7b219649a4 expand support for BB code-to-Diaspora conversion 2012-06-22 20:45:37 -06:00
Vasudev Kamath 6e4760dd9c Merge branch 'master' of git://github.com/friendica/friendica 2012-06-23 08:11:35 +05:30
Sebastian Egbers cd25c3b5dd added replyto and subject to direct messages. 2012-06-22 14:54:31 +02:00
Sebastian Egbers c14270ac64 modified conversion to use x function for parameter checking. 2012-06-22 13:35:36 +02:00
Max Weller 6fe8a13b64 Added ORDER BY clause for conversation view 2012-06-21 12:55:03 +02:00
Max Weller 0f5a6bfcdb Added statuses/show parameter ?conversation=true 2012-06-21 10:53:48 +02:00
friendica 53c9ea7606 show last.fm source in username 2012-06-20 23:04:55 -07:00
friendica 91a3a2d551 follow last.fm scrobbles 2012-06-20 22:59:01 -07:00
Zach Prezkuta 73c6f40ebc create new signed text for relayables right when relaying them 2012-06-20 20:52:09 -06:00
friendica bf0ab10caf undefined unmark_for_death 2012-06-20 16:35:49 -07:00
friendica 0d0f129d04 Merge https://github.com/friendica/friendica into pull 2012-06-20 05:06:20 -07:00
friendica f0db196288 iframes were getting stripped at the rss/atom parser level. We can preserve these because we will strip them in the purifier after checking for supported video sources 2012-06-20 05:04:51 -07:00
friendica 961c633773 Merge pull request #344 from ridcully/master 
exclude_replies for twitter api
 2012-06-20 01:01:55 -07:00
friendica b3bf48782f allow dfrn_deliver to undo a mark_for_death just in case the poller is consistently getting killed. 2012-06-19 20:59:22 -07:00
friendica 1dd33770ed plugin optimisation - don't loop through every single plugin callback for every hook call, only those registered for that hook 2012-06-19 18:26:40 -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) 6df74b8cd9 Now using App::get_cached_avatar_image for navigation bar 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
Sebastian Egbers eab3938471 added exclude_replies option to api call statuses/user_timeline. 2012-06-19 16:27:23 +02:00
Sebastian Egbers 43532b7414 added exclude_replies option to api call statuses/home_timeline. 2012-06-19 16:15:19 +02:00
friendica dbceef04e8 exif_read_data may not be available and isn't a requirement - check and silently ignore exif orientation if it isn't there 2012-06-18 20:21:54 -07:00
Zach Prezkuta 7cd516e34f fix some whitespace issues 2012-06-18 21:06:54 -06:00
Zach Prezkuta 42fa47e8f7 rotate uploaded images if an EXIF rotation is present 2012-06-18 21:02:11 -06:00
friendica 341a5a2672 public forum author using private posting, correct the comment permissions downstream. 2012-06-18 17:19:56 -07:00
Thomas Willingham 371bdfb19d Typo breaking tag notifications 2012-06-18 22:00:18 +01:00
Michael 6eaca19f41 Merge branch 'master' of github.com:annando/friendica 
Conflicts:
	include/oembed.php
 2012-06-18 08:51:12 +02:00
Michael d53414a333 OEmbed: Don't output the width of images 2012-06-18 08:49:35 +02:00
Michael Vogel cc56f33b80 New option in the bbcode parser to disable oembed. 2012-06-18 01:29:08 +02:00
Zvi ben Yaakov (a.k.a rdc) 8af9fe8df7 Added missing backticks to navigation bar query 2012-06-17 23:39:28 +03:00
Zvi ben Yaakov (a.k.a rdc) b0021a4637 Enabled Profile photo revisions to be displayed in navigation bar 2012-06-17 23:22:37 +03:00
Michael Vogel 3968e77f9e New function to convert bbcode to markdown. 2012-06-17 19:49:05 +02:00
friendica 7c2d27e275 rev update 2012-06-16 17:29:42 -07:00
Hauke Zuehl cc7d849ce3 Merge remote branch 'upstream/master' 2012-06-16 19:49:04 +02:00
fermionic 950dacbbdd Merge pull request #338 from fermionic/diaspora-dont-check-more-signatures-than-diaspora-does 
Diaspora dont check more signatures than diaspora does
 2012-06-16 09:49:19 -07:00
Zach Prezkuta 3132ed2979 more cleanup 2012-06-16 10:45:26 -06:00
Zach Prezkuta 577cfdd314 some cleanup of obsolete code 2012-06-16 10:41:25 -06:00
Zach Prezkuta 0ff86e28bb fix small typo for logging command in api.php 2012-06-16 10:25:46 -06:00
Zach Prezkuta 0946c4a375 still need the original author information for comments and likes 2012-06-16 10:25:33 -06:00
Zach Prezkuta 09eb52810b update signature checking for relayables 2012-06-16 10:25:32 -06:00
Hauke Zuehl f9a40ccbde Merge remote branch 'upstream/master' 2012-06-16 18:04:59 +02:00
Hauke Zuehl 1231dd72f0 Check if $rr exists 2012-06-16 15:07:23 +02:00
friendica 4faf0e609f rev update 2012-06-16 03:35:45 -07:00
friendica ff45e11284 redundant log entry 2012-06-14 17:55:30 -07:00
friendica 2efee75557 also mark for death if there isn't any xml to be found 2012-06-14 17:38:39 -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 be090cc851 better handling of dead contacts 2012-06-14 16:56:46 -07:00
friendica 79e2ae3791 syntax on sql 2012-06-13 22:34:48 -07:00
friendica edeca6d815 remove php version restriction on archive widget 2012-06-13 20:59:19 -07:00
friendica b0a0c1ef4d couple of little fixes to enotify positional params 2012-06-13 20:03:18 -07:00
friendica 7d8b087f4a fix to imported youtube videos, updating of contact profile photos, do not remove "dead" contacts but archive them. 2012-06-13 19:59:20 -07:00
friendica 24bf4632af Merge https://github.com/friendica/friendica into pull 2012-06-13 16:25:57 -07:00
friendica 85876be48a Merge https://github.com/fabrixxm/friendica into pull 
Conflicts:
	util/messages.po
 2012-06-13 16:25:09 -07:00
friendica 36491462ba Merge pull request #333 from Erkan-Yilmaz/master 
missing bracket
 2012-06-13 16:21:15 -07:00
friendica d908c9dd71 disable archive widget for PHP < 5.3 2012-06-13 16:17:45 -07:00
Erkan Yilmaz e8e1de3603 add missing bracket 2012-06-13 20:41:53 +02:00
fabrixxm feab17bfea enotify: fix stupid typo 2012-06-13 12:08:34 -04:00
fabrixxm 46cb8174fa enotify: rework strings to more easy to translate 2012-06-13 11:55:21 -04:00
friendica a424fecdae this should catch any weirdness caused by being in different timezones and making your first post on the 31st of March 2012-06-12 22:52:34 -07:00
friendica bbdb8751e5 that was it 2012-06-12 21:39:39 -07:00
friendica 82ad881c85 think this will fix it 2012-06-12 21:38:10 -07:00
friendica d955813f22 tracking another edge case 2012-06-12 21:34:28 -07:00
friendica 08af43f396 edge case 2012-06-12 21:30:17 -07:00
friendica 920ea2e1c7 archive widget 2012-06-12 20:46:30 -07:00
friendica 832d9eeaaf more fixes 2012-06-12 16:17:34 -07:00
friendica 08b3126dae Merge https://github.com/friendica/friendica into pull 2012-06-12 02:48:00 -07:00
friendica 1dd52c20cf move parens to proper place 2012-06-12 02:47:05 -07:00
Michael Vogel a1c407e017 Removed "oauth/authorize" from the list of not implemented functions since it is implemented in "mod/api.php" 2012-06-12 12:39:28 +03:00
friendica b6ff71acaa survive bad/un-parseable input to datetime_convert 2012-06-12 02:06:29 -07:00
friendica 645c2f9092 Merge pull request #331 from mexon/upstream 
Add a hook for post-processing remote items
 2012-06-12 00:52:36 -07:00
Matthew Exon 33a4e45f6b Add a hook for post-processing remote items after they've been stored in the database and have an ID 2012-06-12 07:58:12 +02:00
friendica b7e2f802d8 revert an optimisation that was wrong 2012-06-11 21:50:10 -07:00
friendica 24e85c95b6 date based profile wall filter - backend 2012-06-11 19:36:04 -07:00
friendica 75104416e0 reduce reverted edits due to edit arriving before original 2012-06-11 18:14:49 -07:00
friendica 09f74be14c variable confusion in poller, don't allow negative page offsets 2012-06-11 17:24:16 -07:00
friendica 3b9c3d886d sheesh 2012-06-11 16:21:27 -07:00
Vasudev Kamath 11974b4d94 Merge branch 'master' of git://github.com/friendica/friendica 2012-06-11 20:47:11 +05:30
friendica afa8815411 bug #447 - make followed feeds private 2012-06-11 05:28:08 -07:00
friendica da7773a259 ostatus hub subscription issues 2012-06-07 19:53:39 -07:00
friendica ba2452a076 png support for embedded private photos 2012-06-07 16:02:56 -07:00