mexon/friendica
1
0
Fork 0
Code Pull requests Activity
6520 commits 5 branches 60 tags 188 MiB
Commit graph

6520 commits

This branch
This branch
All branches
Author SHA1 Message Date
friendica db0b7c36ea Merge https://github.com/friendica/friendica into pull 2012-07-24 17:45:12 -07:00
friendica a6f006ff17 Merge pull request #410 from fermionic/broken-share-box-in-dispy 
update head.tpl for dispy
 2012-07-24 17:32:49 -07:00
Zach Prezkuta 2e080f594e update head.tpl for dispy 2012-07-24 18:29:23 -06:00
friendica 00043f3f1e Merge https://github.com/friendica/friendica into pull 2012-07-24 17:25:36 -07:00
friendica f48e491ba0 rev update 2012-07-24 17:24:53 -07:00
fermionic 30f37c8b5c Merge pull request #409 from fermionic/display-settings-dont-work-on-mobile 
use regular theme choosing logic if no mobile theme is specified
 2012-07-24 17:15:15 -07:00
Zach Prezkuta 657347254f use regular theme choosing logic if no mobile theme is specified 2012-07-24 18:13:19 -06:00
friendica 57a75d240b Merge pull request #406 from fermionic/frost-theme 
Introducing Frost
 2012-07-24 15:28:16 -07:00
friendica cc0c4474c0 Merge pull request #407 from fermionic/frost-mobile 
Introducing Frost Mobile
 2012-07-24 15:27:49 -07:00
friendica d60a834906 Merge pull request #408 from CyberDomovoy/diaspora 
Replace spaces with undercores in tags when sending to diaspora
 2012-07-24 15:26:18 -07:00
Domovoy 50d1bdd902 Removed useless function 2012-07-24 17:32:13 +02:00
Zach Prezkuta 9378bc1375 disable tos and privacy links 2012-07-24 09:27:27 -06:00
Zach Prezkuta 178329b6dc disable tos and privacy links 2012-07-24 09:26:12 -06:00
Domovoy c8f484e4a5 Rplace spaces with undercores in tags 2012-07-24 17:22:56 +02:00
Zach Prezkuta f9809102a2 Introducing Frost Mobile 2012-07-24 09:16:51 -06:00
Zach Prezkuta 8126e8ea47 Introducing Frost 2012-07-24 09:15:57 -06: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
friendica dbdcbaa7ef Merge https://github.com/friendica/friendica into pull 2012-07-23 16:51:02 -07:00
friendica ea2c3748f0 Merge pull request #404 from CyberDomovoy/hook_priority 
Hook priority
 2012-07-23 16:50:22 -07:00
Domovoy c052c6afca Database can now be automatically updated 2012-07-24 01:21:02 +02:00
friendica 0d631cc08c hopefully better update handling - never update the current DB version or continue with other updates if there was a failure of any individual update. 2012-07-23 15:57:40 -07:00
friendica b20a80bf39 rev update 2012-07-23 15:27:25 -07: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 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 96c47a6577 Merge https://github.com/friendica/friendica into pull 2012-07-22 15:40:15 -07:00
friendica cdf67ce725 rev update 2012-07-22 15:39:25 -07:00
friendica c455e623bb Merge pull request #403 from CyberDomovoy/Imagick 
Imagick
 2012-07-22 15:36:42 -07: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
friendica 06a6b22c97 Merge pull request #402 from CyberDomovoy/Imagick 
Imagick
 2012-07-22 05:03:58 -07: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 6608cc5018 Merge branch 'master' of https://github.com/friendica/friendica into Imagick 2012-07-22 12:10:48 +02:00
friendica 691e770a68 Merge pull request #401 from copyninja/master 
Image part of Site should be accessed only if its present
 2012-07-22 00:47:56 -07:00
Vasudev Kamath d3baaadf23 Merge branch 'master' of git://github.com/friendica/friendica 2012-07-22 12:43:32 +05:30
Vasudev Kamath 863617013c Access image part of siteinfo only if $siteinfo["images"] is actually set. The current 
code didn't check this so I was getting an error
     Warning: Invalid argument supplied for foreach() in /home/vasudev/Public/friendica/mod/parse_url.php on line 305

Implemented a check before accessing $siteinfo["images"] with this commit and now warning doesn't come when giving URL of a site which doesn't have image from link button of post area
 2012-07-22 12:41:07 +05:30
friendica 5255a5c9a9 rev update 2012-07-21 16:44:15 -07:00