friendica
3076f838f6
Merge https://github.com/friendica/friendica into pull
2012-07-10 20:33:28 -07:00
fermionic
bb817cb76d
Merge pull request #388 from fermionic/diaspora-signature-small-cleanup
...
small cleanup
2012-07-10 18:30:55 -07:00
Zach Prezkuta
fc6f7daf38
small cleanup
2012-07-10 19:28:38 -06:00
friendica
12255dded5
rev update
2012-07-10 18:05:13 -07:00
friendica
1fda9e9365
rev update
2012-07-10 01:06:11 -07:00
fermionic
2096a5782e
Merge pull request #387 from fermionic/diaspora-slight-signature-bug
...
missed a couple of variable names when I redid comment and like code
2012-07-09 19:38:16 -07: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
friendica
61ff2ecab2
Merge pull request #385 from fermionic/peculiar-queue-hangup
...
Prevent long delays in Diaspora delivery
2012-07-09 15:47:55 -07: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
tomtom84
9ae7555143
Merge pull request #384 from tomtom84/master
...
diabook
2012-07-08 12:53:42 -07:00
tomtom84
f475850739
diabook: add notification in website-title, whenever new notifications arrive
2012-07-08 21:50:17 +02:00
Zach Prezkuta
fb4295f07f
better check for image EXIF support
2012-07-08 11:17:50 -06:00
tobiasd
5fc47d03bc
Merge pull request #382 from fermionic/archive-widget-bug
...
check for posted dates based on month only
2012-07-08 08:39:01 -07: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
friendica
63f10f6c6b
Merge https://github.com/friendica/friendica into pull
2012-07-07 21:55:15 -07:00
friendica
a3640b4e9f
Merge pull request #381 from fermionic/embed-multiple-private-photos
...
Embed multiple private photos
2012-07-07 21:15:52 -07: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
friendica
e94f7ed23d
rev update
2012-07-07 16:20:34 -07: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
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
friendica
7788a93258
Merge pull request #380 from copyninja/master
...
orient function should not be called on png image types
2012-07-07 04:18:13 -07:00
Vasudev Kamath
1b3d84422e
orient function uses exif_read_data for which valid image types are only JPEG and TIFF as per the document [1].
...
When trying to upload an screenshot with png type I was getting message as *failed* even though image was uploading. So added a fix to check image type before calling orient function. Not sure if this is a proper fix but after this i'm not getting any error during file upload
[1] http://au2.php.net/manual/en/function.exif-read-data.php
2012-07-07 16:17:26 +05:30
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
a122fecf50
add additional page types to admin user report
2012-07-05 22:30:13 -07:00
friendica
8b19168999
a bit more colour
2012-07-05 22:20:27 -07:00
friendica
a6514e81bb
remove obsolete zot encapsulation functions
2012-07-05 20:58:45 -07:00
friendica
868e04f5eb
Merge pull request #378 from fermionic/apparent-typo-in-function-name
...
my php thinks this is a typo
2012-07-05 19:56:38 -07:00
Zach Prezkuta
47c7fd89ba
my php thinks this is a typo
2012-07-05 20:39:22 -06:00
friendica
a71365d566
Merge pull request #377 from fermionic/local-delete-blank-out-title-and-body
...
clear title and body of items on local delete
2012-07-05 19:14:27 -07: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
d7920c4c25
term (tag, mention, category, file, etc.) table
2012-07-05 17:59:56 -07:00
friendica
8af78079cb
Merge https://github.com/friendica/friendica into pull
2012-07-05 16:06:43 -07:00
friendica
9951071b5b
rev update
2012-07-05 16:06:01 -07: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
friendica
10336651ba
Merge pull request #374 from fermionic/diaspora-prevent-fcontact-race-conditions
...
Prevent fcontact race conditions
2012-07-05 15:57:28 -07:00
Zach Prezkuta
2edfc3b539
final db updates after testing
2012-07-05 14:31:19 -06: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
