]> git.mxchange.org Git - friendica.git/log
friendica.git
12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Tue, 17 Jul 2012 00:04:23 +0000 (17:04 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update
friendica [Tue, 17 Jul 2012 00:03:23 +0000 (17:03 -0700)]
rev update

12 years agoMerge pull request #399 from mschmitt/master
friendica [Mon, 16 Jul 2012 22:38:06 +0000 (15:38 -0700)]
Merge pull request #399 from mschmitt/master

Esperanto at 100% again

12 years agoEsperanto -> 100%
Martin Schmitt [Mon, 16 Jul 2012 20:33:23 +0000 (22:33 +0200)]
Esperanto -> 100%

12 years agorecover from datetime parse issues, inspired by https://github.com/friendica/friendic...
friendica [Mon, 16 Jul 2012 04:00:11 +0000 (21:00 -0700)]
recover from datetime parse issues, inspired by https://github.com/friendica/friendica/pull/396

12 years agoname mixup in wall-to-wall hovertips
friendica [Mon, 16 Jul 2012 03:56:09 +0000 (20:56 -0700)]
name mixup in wall-to-wall hovertips

12 years agomissing param
friendica [Mon, 16 Jul 2012 00:07:53 +0000 (17:07 -0700)]
missing param

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Sun, 15 Jul 2012 21:23:43 +0000 (14:23 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update
friendica [Sun, 15 Jul 2012 21:22:45 +0000 (14:22 -0700)]
rev update

12 years agoMerge pull request #397 from simonlnu/master
Simon [Sun, 15 Jul 2012 16:05:54 +0000 (09:05 -0700)]
Merge pull request #397 from simonlnu/master

re-add the sparkle stuff

12 years agore-add the sparkle stuff
Simon L'nu [Sun, 15 Jul 2012 16:03:53 +0000 (12:03 -0400)]
re-add the sparkle stuff

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agosql fix - this should work a bit better
friendica [Sun, 15 Jul 2012 03:38:30 +0000 (20:38 -0700)]
sql fix - this should work a bit better

12 years agosql errors on profile page
friendica [Sun, 15 Jul 2012 03:28:17 +0000 (20:28 -0700)]
sql errors on profile page

12 years agorev update
friendica [Sat, 14 Jul 2012 21:16:24 +0000 (14:16 -0700)]
rev update

12 years agoMerge pull request #395 from unary/altpager
friendica [Sat, 14 Jul 2012 21:10:57 +0000 (14:10 -0700)]
Merge pull request #395 from unary/altpager

add alt_pager function, add ability to use new pager logic on network, p...

12 years agoadd alt_pager function, add ability to use new pager logic on network, profile, commu...
Michael Johnston [Sat, 14 Jul 2012 18:21:58 +0000 (14:21 -0400)]
add alt_pager function, add ability to use new pager logic on network, profile, community, and search.

12 years agoMerge pull request #394 from unary/community-pagination
friendica [Sat, 14 Jul 2012 07:28:39 +0000 (00:28 -0700)]
Merge pull request #394 from unary/community-pagination

fix pagination on community page

12 years agofix pagination on community page
Michael Johnston [Sat, 14 Jul 2012 04:46:41 +0000 (00:46 -0400)]
fix pagination on community page

12 years agodon't use language detection if < php 5.3
friendica [Fri, 13 Jul 2012 22:38:02 +0000 (15:38 -0700)]
don't use language detection if < php 5.3

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Fri, 13 Jul 2012 21:57:08 +0000 (14:57 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update
friendica [Fri, 13 Jul 2012 20:52:23 +0000 (13:52 -0700)]
rev update

12 years agoMerge pull request #393 from fermionic/live-updates-for-unlikes
Simon [Fri, 13 Jul 2012 19:40:57 +0000 (12:40 -0700)]
Merge pull request #393 from fermionic/live-updates-for-unlikes

allow live updates for unlikes and undislikes

12 years agoallow live updates for unlikes and undislikes
Zach Prezkuta [Fri, 13 Jul 2012 15:09:01 +0000 (09:09 -0600)]
allow live updates for unlikes and undislikes

12 years agomove plink sparkles to the right html element in dispy
friendica [Fri, 13 Jul 2012 11:22:42 +0000 (04:22 -0700)]
move plink sparkles to the right html element in dispy

12 years agoMerge pull request #392 from simonlnu/master
Simon [Fri, 13 Jul 2012 08:35:55 +0000 (01:35 -0700)]
Merge pull request #392 from simonlnu/master

add doctitle thingy, and update cursor

12 years agoadd doctitle thingy, and update cursor
Simon L'nu [Fri, 13 Jul 2012 08:35:16 +0000 (04:35 -0400)]
add doctitle thingy, and update cursor

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge pull request #391 from simonlnu/master
Simon [Fri, 13 Jul 2012 06:38:58 +0000 (23:38 -0700)]
Merge pull request #391 from simonlnu/master

add some sparkle ;)

12 years agoadd some sparkle ;)
Simon L'nu [Fri, 13 Jul 2012 06:37:45 +0000 (02:37 -0400)]
add some sparkle ;)

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge pull request #389 from fermionic/diaspora-likes-on-comments
friendica [Fri, 13 Jul 2012 05:52:00 +0000 (22:52 -0700)]
Merge pull request #389 from fermionic/diaspora-likes-on-comments

make likes on comments work with Diaspora, fix some small bugs

12 years agoMerge pull request #390 from fermionic/diaspora-fixed-mangled-text
friendica [Fri, 13 Jul 2012 05:51:20 +0000 (22:51 -0700)]
Merge pull request #390 from fermionic/diaspora-fixed-mangled-text

focus preg_replace to prevent it from catching too much

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Fri, 13 Jul 2012 05:49:50 +0000 (22:49 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agomake likes on comments work with Diaspora, some small bugs
Zach Prezkuta [Fri, 13 Jul 2012 00:53:51 +0000 (18:53 -0600)]
make likes on comments work with Diaspora, some small bugs

12 years agofocus preg_replace to prevent it from catching too much
Zach Prezkuta [Fri, 13 Jul 2012 05:12:48 +0000 (23:12 -0600)]
focus preg_replace to prevent it from catching too much

12 years agoadd plink to profile notifications
friendica [Thu, 12 Jul 2012 23:12:37 +0000 (16:12 -0700)]
add plink to profile notifications

12 years agorev update
friendica [Thu, 12 Jul 2012 23:11:43 +0000 (16:11 -0700)]
rev update

12 years agoAdd sparkle cursor to Quattro/Vier/TestBubble
Thomas Willingham [Thu, 12 Jul 2012 18:21:21 +0000 (19:21 +0100)]
Add sparkle cursor to Quattro/Vier/TestBubble

12 years agolanguage detection - result is stored in item['postopts']
friendica [Thu, 12 Jul 2012 05:45:14 +0000 (22:45 -0700)]
language detection - result is stored in item['postopts']

12 years agoadd some sparkle to plinks
friendica [Thu, 12 Jul 2012 04:04:08 +0000 (21:04 -0700)]
add some sparkle to plinks

12 years agorev update
friendica [Thu, 12 Jul 2012 00:55:39 +0000 (17:55 -0700)]
rev update

12 years agonotification issue on wall-to-wall posts
friendica [Wed, 11 Jul 2012 09:58:57 +0000 (02:58 -0700)]
notification issue on wall-to-wall posts

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Wed, 11 Jul 2012 03:33:28 +0000 (20:33 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoMerge pull request #388 from fermionic/diaspora-signature-small-cleanup
fermionic [Wed, 11 Jul 2012 01:30:55 +0000 (18:30 -0700)]
Merge pull request #388 from fermionic/diaspora-signature-small-cleanup

small cleanup

12 years agosmall cleanup
Zach Prezkuta [Wed, 11 Jul 2012 01:28:38 +0000 (19:28 -0600)]
small cleanup

12 years agorev update
friendica [Wed, 11 Jul 2012 01:05:13 +0000 (18:05 -0700)]
rev update

12 years agorev update
friendica [Tue, 10 Jul 2012 08:06:11 +0000 (01:06 -0700)]
rev update

12 years agoMerge pull request #387 from fermionic/diaspora-slight-signature-bug
fermionic [Tue, 10 Jul 2012 02:38:16 +0000 (19:38 -0700)]
Merge pull request #387 from fermionic/diaspora-slight-signature-bug

missed a couple of variable names when I redid comment and like code

12 years agomissed a couple of variable names when I redid comment and like code
Zach Prezkuta [Tue, 10 Jul 2012 02:35:59 +0000 (20:35 -0600)]
missed a couple of variable names when I redid comment and like code

12 years agoMerge pull request #385 from fermionic/peculiar-queue-hangup
friendica [Mon, 9 Jul 2012 22:47:55 +0000 (15:47 -0700)]
Merge pull request #385 from fermionic/peculiar-queue-hangup

Prevent long delays in Diaspora delivery

12 years agodon't check for was_recently_delayed in diaspora_transmit during a queue run
Zach Prezkuta [Mon, 9 Jul 2012 15:39:09 +0000 (09:39 -0600)]
don't check for was_recently_delayed in diaspora_transmit during a queue run

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Mon, 9 Jul 2012 05:34:21 +0000 (22:34 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agodiaspora message receive security issue - check message crypto signer against purport...
friendica [Mon, 9 Jul 2012 05:32:04 +0000 (22:32 -0700)]
diaspora message receive security issue - check message crypto signer against purported message author and bail if they don't match.

12 years agoMerge pull request #383 from fermionic/auto-orient-all-uploaded-images
friendica [Sun, 8 Jul 2012 22:32:20 +0000 (15:32 -0700)]
Merge pull request #383 from fermionic/auto-orient-all-uploaded-images

auto-orient uploaded wall photos and profile photos also

12 years agoMerge pull request #384 from tomtom84/master
tomtom84 [Sun, 8 Jul 2012 19:53:42 +0000 (12:53 -0700)]
Merge pull request #384 from tomtom84/master

diabook

12 years agodiabook: add notification in website-title, whenever new notifications arrive
tomtom84 [Sun, 8 Jul 2012 19:50:17 +0000 (21:50 +0200)]
diabook: add notification in website-title, whenever new notifications arrive

12 years agobetter check for image EXIF support
Zach Prezkuta [Sun, 8 Jul 2012 17:17:50 +0000 (11:17 -0600)]
better check for image EXIF support

12 years agoMerge pull request #382 from fermionic/archive-widget-bug
tobiasd [Sun, 8 Jul 2012 15:39:01 +0000 (08:39 -0700)]
Merge pull request #382 from fermionic/archive-widget-bug

check for posted dates based on month only

12 years agoauto-orient uploaded wall photos and profile photos also
Zach Prezkuta [Sun, 8 Jul 2012 15:18:05 +0000 (09:18 -0600)]
auto-orient uploaded wall photos and profile photos also

12 years agocheck for posted dates based on month only
Zach Prezkuta [Sun, 8 Jul 2012 14:46:46 +0000 (08:46 -0600)]
check for posted dates based on month only

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Sun, 8 Jul 2012 04:55:15 +0000 (21:55 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoMerge pull request #381 from fermionic/embed-multiple-private-photos
friendica [Sun, 8 Jul 2012 04:15:52 +0000 (21:15 -0700)]
Merge pull request #381 from fermionic/embed-multiple-private-photos

Embed multiple private photos

12 years agocleanup
Zach Prezkuta [Sun, 8 Jul 2012 00:48:20 +0000 (18:48 -0600)]
cleanup

12 years agofix bugs
Zach Prezkuta [Sun, 8 Jul 2012 00:47:13 +0000 (18:47 -0600)]
fix bugs

12 years agorev update
friendica [Sat, 7 Jul 2012 23:20:34 +0000 (16:20 -0700)]
rev update

12 years agoallow more than one embedded private photo
Zach Prezkuta [Sat, 7 Jul 2012 22:20:24 +0000 (16:20 -0600)]
allow more than one embedded private photo

12 years agoadd function to exclude embedded images when checking message length
Zach Prezkuta [Fri, 6 Jul 2012 23:09:23 +0000 (17:09 -0600)]
add function to exclude embedded images when checking message length

12 years agoMerge pull request #379 from fermionic/events-display-wrong-in-diaspora
friendica [Sat, 7 Jul 2012 11:19:15 +0000 (04:19 -0700)]
Merge pull request #379 from fermionic/events-display-wrong-in-diaspora

remove check for event description in bb2diaspora

12 years agoMerge pull request #380 from copyninja/master
friendica [Sat, 7 Jul 2012 11:18:13 +0000 (04:18 -0700)]
Merge pull request #380 from copyninja/master

orient function should not be called on png image types

12 years agoorient function uses exif_read_data for which valid image types are only JPEG and...
Vasudev Kamath [Sat, 7 Jul 2012 10:47:26 +0000 (16:17 +0530)]
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

12 years agoremove check for event description, since it's not required to create an event
Zach Prezkuta [Fri, 6 Jul 2012 23:10:40 +0000 (17:10 -0600)]
remove check for event description, since it's not required to create an event

12 years agoMerge branch 'master' of git://github.com/friendica/friendica
Vasudev Kamath [Fri, 6 Jul 2012 17:17:27 +0000 (22:47 +0530)]
Merge branch 'master' of git://github.com/friendica/friendica

12 years agoadd additional page types to admin user report
friendica [Fri, 6 Jul 2012 05:30:13 +0000 (22:30 -0700)]
add additional page types to admin user report

12 years agoa bit more colour
friendica [Fri, 6 Jul 2012 05:20:27 +0000 (22:20 -0700)]
a bit more colour

12 years agoremove obsolete zot encapsulation functions
friendica [Fri, 6 Jul 2012 03:58:45 +0000 (20:58 -0700)]
remove obsolete zot encapsulation functions

12 years agoMerge pull request #378 from fermionic/apparent-typo-in-function-name
friendica [Fri, 6 Jul 2012 02:56:38 +0000 (19:56 -0700)]
Merge pull request #378 from fermionic/apparent-typo-in-function-name

my php thinks this is a typo

12 years agomy php thinks this is a typo
Zach Prezkuta [Fri, 6 Jul 2012 02:39:22 +0000 (20:39 -0600)]
my php thinks this is a typo

12 years agoMerge pull request #377 from fermionic/local-delete-blank-out-title-and-body
friendica [Fri, 6 Jul 2012 02:14:27 +0000 (19:14 -0700)]
Merge pull request #377 from fermionic/local-delete-blank-out-title-and-body

clear title and body of items on local delete

12 years agoclear title and body of items on local delete
Zach Prezkuta [Fri, 6 Jul 2012 02:07:01 +0000 (20:07 -0600)]
clear title and body of items on local delete

12 years agoMerge pull request #376 from fermionic/diaspora-prevent-fcontact-race-conditions
friendica [Fri, 6 Jul 2012 01:10:32 +0000 (18:10 -0700)]
Merge pull request #376 from fermionic/diaspora-prevent-fcontact-race-conditions

slightly better way of handling last loop

12 years agoslightly better way of handling last loop
Zach Prezkuta [Fri, 6 Jul 2012 01:08:30 +0000 (19:08 -0600)]
slightly better way of handling last loop

12 years agoMerge pull request #375 from fermionic/diaspora-prevent-fcontact-race-conditions
friendica [Fri, 6 Jul 2012 01:05:32 +0000 (18:05 -0700)]
Merge pull request #375 from fermionic/diaspora-prevent-fcontact-race-conditions

add some timeouts to prevent deadlock

12 years agoadd some timeouts to prevent deadlock
Zach Prezkuta [Fri, 6 Jul 2012 01:01:13 +0000 (19:01 -0600)]
add some timeouts to prevent deadlock

12 years agoterm (tag, mention, category, file, etc.) table
friendica [Fri, 6 Jul 2012 00:59:56 +0000 (17:59 -0700)]
term (tag, mention, category, file, etc.) table

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Thu, 5 Jul 2012 23:06:43 +0000 (16:06 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update
friendica [Thu, 5 Jul 2012 23:06:01 +0000 (16:06 -0700)]
rev update

12 years agoMerge pull request #373 from fermionic/more-list-fixes
friendica [Thu, 5 Jul 2012 23:03:29 +0000 (16:03 -0700)]
Merge pull request #373 from fermionic/more-list-fixes

fix small bug in lists and revert Diaspora list processing to non-Markdo...

12 years agoMerge pull request #374 from fermionic/diaspora-prevent-fcontact-race-conditions
friendica [Thu, 5 Jul 2012 22:57:28 +0000 (15:57 -0700)]
Merge pull request #374 from fermionic/diaspora-prevent-fcontact-race-conditions

Prevent fcontact race conditions

12 years agofinal db updates after testing
Zach Prezkuta [Thu, 5 Jul 2012 20:31:19 +0000 (14:31 -0600)]
final db updates after testing

12 years agocleanup some syntax errors in lock.php
Zach Prezkuta [Sat, 23 Jun 2012 20:25:18 +0000 (14:25 -0600)]
cleanup some syntax errors in lock.php

12 years ago"lock" is a reserved MySQL keyword
Zach Prezkuta [Sun, 17 Jun 2012 17:25:36 +0000 (11:25 -0600)]
"lock" is a reserved MySQL keyword

12 years agominor cleanup in lock.php
Zach Prezkuta [Sat, 16 Jun 2012 17:28:44 +0000 (11:28 -0600)]
minor cleanup in lock.php

12 years agocleanup obsolete comments
Zach Prezkuta [Fri, 15 Jun 2012 03:01:59 +0000 (21:01 -0600)]
cleanup obsolete comments

12 years agoadd rudimentary locking capability to Friendica functions
Zach Prezkuta [Fri, 15 Jun 2012 02:58:25 +0000 (20:58 -0600)]
add rudimentary locking capability to Friendica functions

12 years agofix small bug in lists and revert Diaspora list processing to non-Markdownify version
Zach Prezkuta [Thu, 5 Jul 2012 18:52:20 +0000 (12:52 -0600)]
fix small bug in lists and revert Diaspora list processing to non-Markdownify version

12 years agorecycle symbol woes with multiple html entity encode/decode cycles going on
friendica [Thu, 5 Jul 2012 06:24:59 +0000 (23:24 -0700)]
recycle symbol woes with multiple html entity encode/decode cycles going on

12 years agorender the recycle symbol correctly on Diaspora reshares
friendica [Thu, 5 Jul 2012 05:44:04 +0000 (22:44 -0700)]
render the recycle symbol correctly on Diaspora reshares

12 years agosome initial code and benchmarking for "red" content rendering engine
friendica [Thu, 5 Jul 2012 03:37:15 +0000 (20:37 -0700)]
some initial code and benchmarking for "red" content rendering engine

12 years agorestore translation of bbcode videos, events, bookmarks, etc. to diaspora
friendica [Thu, 5 Jul 2012 02:12:09 +0000 (19:12 -0700)]
restore translation of bbcode videos, events, bookmarks, etc. to diaspora

12 years agofix !@#$ tinymce linebreaks for the thousandth time
friendica [Thu, 5 Jul 2012 00:15:43 +0000 (17:15 -0700)]
fix !@#$ tinymce linebreaks for the thousandth time

12 years agoadd smarty engine, remove some obsolete zot1 stuff
friendica [Wed, 4 Jul 2012 05:23:08 +0000 (22:23 -0700)]
add smarty engine, remove some obsolete zot1 stuff

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Wed, 4 Jul 2012 04:41:05 +0000 (21:41 -0700)]
Merge https://github.com/friendica/friendica into pull