Commit graph

6531 commits

Author SHA1 Message Date
Simon L'nu
794ae669ce fixes to cursor
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-07-25 22:28:09 -04:00
friendica
2e5c970cb1 Merge pull request #412 from rainulf/master
Sending a pull request
2012-07-25 19:03:58 -07:00
Rainulf Pineda
1573c10631 Fixed syntax error in usage of anonymous function. 2012-07-25 21:38:28 -04:00
friendica
6ac45f2f6f Merge https://github.com/friendica/friendica into pull 2012-07-25 15:55:30 -07:00
friendica
b9f13400d9 rev update 2012-07-25 15:52:26 -07: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
Michael
f140a6da89 Further performance improvements 2012-07-25 22:50:06 +02:00
Michael Vogel
69b883829a Speed improvements in the database 2012-07-25 21:28:06 +02:00
fabrixxm
42e80a162b Merge pull request #411 from fabrixxm/master
quattro: add id to items container div
2012-07-25 05:16:48 -07:00
Fabrixxm
727c93cb8c quattro: add id to items container div
needed to make commit 4c6a4321 work
2012-07-25 08:12:21 -04:00
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