]>
git.mxchange.org Git - friendica.git/log
Tobias Diekershoff [Thu, 14 Jul 2016 07:00:07 +0000 (09:00 +0200)]
Merge pull request #2679 from annando/1607-diaspora
Diaspora: Link to protocol description added.
Michael Vogel [Thu, 14 Jul 2016 05:20:20 +0000 (07:20 +0200)]
Diaspora: Link to protocol description added. Support for creation date of comments
Tobias Diekershoff [Wed, 13 Jul 2016 22:26:26 +0000 (00:26 +0200)]
Merge pull request #2677 from annando/1607-worker-cooldown
Worker: New value for cooldown time after each function call
Michael Vogel [Wed, 13 Jul 2016 17:43:16 +0000 (19:43 +0200)]
Worker: New value for cooldown time after each function call
fabrixxm [Wed, 13 Jul 2016 08:17:19 +0000 (10:17 +0200)]
Merge pull request #2676 from tobiasd/
20160713-lighttpdconfig
added configuration reg. curl and lighttpd with error code 417
Tobias Diekershoff [Wed, 13 Jul 2016 07:33:28 +0000 (09:33 +0200)]
added configuration reg. curl and lighttpd with error code 417
Tobias Diekershoff [Tue, 12 Jul 2016 14:16:19 +0000 (16:16 +0200)]
Merge pull request #2674 from annando/1607-warning-theme-info
Bugfix: Avoid a warning if "theme_info" isn't an array
Michael Vogel [Tue, 12 Jul 2016 10:59:34 +0000 (12:59 +0200)]
Bugfix: Avoid a warning if "theme_info" isn't an array
rabuzarus [Mon, 11 Jul 2016 19:42:48 +0000 (21:42 +0200)]
Merge pull request #2669 from annando/1607-new-probe
New probing mechanism
rabuzarus [Mon, 11 Jul 2016 19:41:23 +0000 (21:41 +0200)]
Merge pull request #2673 from annando/1607-mail-avatar
Bugfix: Avatar pictures of mail contacts weren't displayed correctly
Michael Vogel [Mon, 11 Jul 2016 18:45:56 +0000 (20:45 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1607-new-probe
Michael Vogel [Mon, 11 Jul 2016 18:42:18 +0000 (20:42 +0200)]
Bugfix: Avatar pictures of mail contacts weren't displayed correctly
Michael Vogel [Mon, 11 Jul 2016 17:48:37 +0000 (19:48 +0200)]
Some more little documentation
Michael Vogel [Mon, 11 Jul 2016 13:20:10 +0000 (15:20 +0200)]
Merge pull request #2672 from rabuzarus/1007-page_template
add possibility to load custom page templates + none.php pagetemplate…
rabuzarus [Mon, 11 Jul 2016 08:33:39 +0000 (10:33 +0200)]
add possibility to load custom page templates + none.php pagetemplate is part of core now
Michael Vogel [Sun, 10 Jul 2016 16:44:48 +0000 (18:44 +0200)]
Some more documentation
Michael Vogel [Sun, 10 Jul 2016 12:08:27 +0000 (14:08 +0200)]
Added fcontact doc
Michael Vogel [Sun, 10 Jul 2016 12:03:10 +0000 (14:03 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1607-new-probe
Tobias Diekershoff [Sun, 10 Jul 2016 11:55:56 +0000 (13:55 +0200)]
Merge pull request #2671 from annando/1607-diaspora-soapbox-connect
Bugfix: Diaspora connect requests to soapbox account work now
Michael Vogel [Sun, 10 Jul 2016 11:11:09 +0000 (13:11 +0200)]
Diaspora: Send the profile data after a successful connect
Michael Vogel [Sun, 10 Jul 2016 10:18:10 +0000 (12:18 +0200)]
Just make the bugfix a little bit simpler
Michael Vogel [Sun, 10 Jul 2016 10:09:58 +0000 (12:09 +0200)]
Bugfix: Diaspora connects to a Soapbox account weren't established correctly
Michael Vogel [Sun, 10 Jul 2016 07:29:43 +0000 (09:29 +0200)]
Small text correction
Michael Vogel [Sun, 10 Jul 2016 07:28:41 +0000 (09:28 +0200)]
Merge pull request #2670 from tobiasd/
20160709-credits
regen credits.txt
Michael Vogel [Sun, 10 Jul 2016 07:27:40 +0000 (09:27 +0200)]
Fallback for empty names
Tobias Diekershoff [Sun, 10 Jul 2016 06:15:56 +0000 (08:15 +0200)]
Merge pull request #2668 from annando/1607-diaspora-retraction
Diaspora: Relayed retraction hadn't worked.
Michael Vogel [Sat, 9 Jul 2016 18:39:03 +0000 (20:39 +0200)]
Merge pull request #2667 from tobiasd/
20160709-messages
regen messages.po
Michael Vogel [Sat, 9 Jul 2016 18:09:09 +0000 (20:09 +0200)]
Remove obsolote functions
Tobias Diekershoff [Sat, 9 Jul 2016 10:10:22 +0000 (12:10 +0200)]
regen credits.txt
Tobias Diekershoff [Sat, 9 Jul 2016 05:20:48 +0000 (07:20 +0200)]
regen messages.po
Michael Vogel [Fri, 8 Jul 2016 20:55:39 +0000 (22:55 +0200)]
Changed documentation
Michael Vogel [Fri, 8 Jul 2016 20:31:11 +0000 (22:31 +0200)]
OStatus now has "location" and "about", probing for urls added
Michael Vogel [Fri, 8 Jul 2016 19:15:20 +0000 (21:15 +0200)]
Probing now has a Twitter detection.
Michael Vogel [Fri, 8 Jul 2016 18:39:14 +0000 (20:39 +0200)]
Diaspora: Relayed retraction hadn't worked.
Michael Vogel [Fri, 8 Jul 2016 18:37:10 +0000 (20:37 +0200)]
If the nick is missing then take the first part of the name
Michael Vogel [Thu, 7 Jul 2016 21:35:44 +0000 (23:35 +0200)]
To-Do added
Michael Vogel [Thu, 7 Jul 2016 21:35:14 +0000 (23:35 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1607-new-probe
Michael Vogel [Thu, 7 Jul 2016 21:04:30 +0000 (23:04 +0200)]
Added documentation
Michael Vogel [Thu, 7 Jul 2016 20:37:16 +0000 (22:37 +0200)]
If a page contains a feed url then follow it.
Tobias Diekershoff [Thu, 7 Jul 2016 20:36:20 +0000 (22:36 +0200)]
Merge pull request #2666 from annando/1607-more-logging
Logging for feeds improved, new "process id" for logging
Michael Vogel [Thu, 7 Jul 2016 19:57:10 +0000 (21:57 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1607-new-probe
Michael Vogel [Thu, 7 Jul 2016 18:32:13 +0000 (20:32 +0200)]
Logging for feeds improved, new "process id" for logging
fabrixxm [Tue, 5 Jul 2016 14:09:44 +0000 (16:09 +0200)]
Merge pull request #2665 from tobiasd/
20160705-mime
adjust the rand bounderies to be within the allowed max value
Tobias Diekershoff [Tue, 5 Jul 2016 13:45:39 +0000 (15:45 +0200)]
adjust the rand bounderies to be within the allowed max value
Michael Vogel [Tue, 5 Jul 2016 07:49:19 +0000 (09:49 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1607-new-probe
rabuzarus [Tue, 5 Jul 2016 07:30:00 +0000 (09:30 +0200)]
Merge pull request #2664 from annando/1607-remote-auth
Bugfix: Remote auth and picture permissions should now work again.
Michael Vogel [Tue, 5 Jul 2016 06:51:28 +0000 (08:51 +0200)]
Bugfix: Remote auth and picture permissions should now work again.
rabuzarus [Mon, 4 Jul 2016 21:10:38 +0000 (23:10 +0200)]
Merge pull request #2663 from annando/1607-photos-session
Bugfix: On "photos" the session management has to work
Michael Vogel [Mon, 4 Jul 2016 20:36:24 +0000 (22:36 +0200)]
Bugfix: On "photos" the session management has to work
Michael Vogel [Mon, 4 Jul 2016 20:34:35 +0000 (22:34 +0200)]
You can now prove with an uid (important for mails)
Michael Vogel [Mon, 4 Jul 2016 06:05:30 +0000 (08:05 +0200)]
Removed the legacy function calls, removed unused functions
Michael Vogel [Sun, 3 Jul 2016 22:49:38 +0000 (00:49 +0200)]
Warnings removed
Michael Vogel [Sun, 3 Jul 2016 22:14:08 +0000 (00:14 +0200)]
Removed old code
Michael Vogel [Sun, 3 Jul 2016 21:11:21 +0000 (23:11 +0200)]
Support for noscrape when probing.
Michael Vogel [Sun, 3 Jul 2016 20:27:16 +0000 (22:27 +0200)]
New class to probe urls
Tobias Diekershoff [Sun, 3 Jul 2016 08:40:41 +0000 (10:40 +0200)]
Merge pull request #2662 from rabuzarus/0307_frio-fix_contact-url
frio: fix url variable for textcomplete in contact_template
rabuzarus [Sun, 3 Jul 2016 07:50:34 +0000 (09:50 +0200)]
frio: fix url variable for textcomplete in contact_template
Tobias Diekershoff [Sun, 3 Jul 2016 04:24:27 +0000 (06:24 +0200)]
Merge pull request #2661 from annando/1607-refresh
Automatically refresh after two minutes when system is overloaded
Michael Vogel [Sat, 2 Jul 2016 22:26:00 +0000 (00:26 +0200)]
Automatically refresh after two minutes when system is overloaded
Tobias Diekershoff [Sat, 2 Jul 2016 21:17:26 +0000 (23:17 +0200)]
Merge pull request #2660 from annando/1607-worker-admin
Site settings: some settings are disabled when the worker is active
Michael Vogel [Sat, 2 Jul 2016 21:08:33 +0000 (23:08 +0200)]
Site settings: some settings are disabled when the worker is active
Tobias Diekershoff [Sat, 2 Jul 2016 20:07:41 +0000 (22:07 +0200)]
Merge pull request #2659 from annando/1607-bugfix-scrape-diaspora
Bugfix: The notify value for Diaspora wasn't assigned
Tobias Diekershoff [Sat, 2 Jul 2016 19:52:48 +0000 (21:52 +0200)]
Merge pull request #2658 from annando/1607-maxload
Central Backend/Frontend detection when checking for overload
Michael Vogel [Sat, 2 Jul 2016 19:14:21 +0000 (21:14 +0200)]
Bugfix: The notify value for Diaspora wasn't assigned
Tobias Diekershoff [Sat, 2 Jul 2016 18:06:20 +0000 (20:06 +0200)]
Merge pull request #2657 from annando/1607-share-contact
Only use the profile data in shares if there is data
Tobias Diekershoff [Sat, 2 Jul 2016 17:29:43 +0000 (19:29 +0200)]
Merge pull request #2656 from annando/1607-is-result2
Moves the function "is_result" from the dba class to the dbm class
Michael Vogel [Sat, 2 Jul 2016 15:51:16 +0000 (17:51 +0200)]
Obly use the profile data in shares if there is data
Michael Vogel [Sat, 2 Jul 2016 12:01:52 +0000 (14:01 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1607-is-result2
Michael Vogel [Sat, 2 Jul 2016 12:00:42 +0000 (14:00 +0200)]
Moves the function "is_result" from dba to dbm.
Tobias Diekershoff [Sat, 2 Jul 2016 11:53:35 +0000 (13:53 +0200)]
Merge pull request #2654 from annando/1607-thumb-micro
use thumb avatar size instead of micro size in the contact list
Tobias Diekershoff [Sat, 2 Jul 2016 11:53:20 +0000 (13:53 +0200)]
Merge pull request #2655 from annando/develop
Fixed pull request 2390
Michael Vogel [Sat, 2 Jul 2016 11:42:42 +0000 (13:42 +0200)]
Remove unused function
Michael Vogel [Sat, 2 Jul 2016 11:38:39 +0000 (13:38 +0200)]
Merge branch 'Quix0r-rewrites/is_filled_array_introduced' into develop
Michael Vogel [Sat, 2 Jul 2016 11:38:23 +0000 (13:38 +0200)]
Merge branch 'rewrites/is_filled_array_introduced' of git://github.com/Quix0r/friendica into Quix0r-rewrites/is_filled_array_introduced
Conflicts:
boot.php
Michael Vogel [Sat, 2 Jul 2016 07:32:42 +0000 (09:32 +0200)]
use thumb avatar size instead of micro size in the contact list
Michael Vogel [Sat, 2 Jul 2016 07:31:28 +0000 (09:31 +0200)]
Added the new function to the poller.
Michael Vogel [Sat, 2 Jul 2016 06:54:57 +0000 (08:54 +0200)]
Backend/Frontend detection when checking for overload
Tobias Diekershoff [Fri, 1 Jul 2016 15:18:25 +0000 (17:18 +0200)]
Merge pull request #2653 from rabuzarus/0107_frio_jot_textcomplete
frio: fix textcomplete for jot
rabuzarus [Fri, 1 Jul 2016 15:03:40 +0000 (17:03 +0200)]
frio: fix textcomplete for jot
rabuzarus [Fri, 1 Jul 2016 10:39:36 +0000 (12:39 +0200)]
Merge pull request #2652 from annando/1606-diaspora-fetch3
Diaspora: Support for reading the /fetch/post/ functionality
Michael Vogel [Thu, 30 Jun 2016 20:58:56 +0000 (22:58 +0200)]
If it doesn't work with the new method, try the old one
Michael Vogel [Thu, 30 Jun 2016 20:42:46 +0000 (22:42 +0200)]
Some logging added.
Michael Vogel [Thu, 30 Jun 2016 20:18:48 +0000 (22:18 +0200)]
Diaspora: Support for reading the /fetch/post/ functionality
rabuzarus [Thu, 30 Jun 2016 13:21:28 +0000 (15:21 +0200)]
Merge pull request #2651 from annando/1606-fetch-loop
Avoid redirection loops at /fetch/ and /p/
Michael Vogel [Thu, 30 Jun 2016 10:02:35 +0000 (12:02 +0200)]
Avoid redirection loops at /fetch/ and /p/
Tobias Diekershoff [Thu, 30 Jun 2016 07:47:40 +0000 (09:47 +0200)]
Merge pull request #2650 from annando/1606-diaspora-fetch
Diaspora: Support for new fetch functionality (replacement for /p/)
Michael Vogel [Thu, 30 Jun 2016 06:58:36 +0000 (08:58 +0200)]
urlencode is better
Michael Vogel [Thu, 30 Jun 2016 06:55:26 +0000 (08:55 +0200)]
Do a redirect when the post doesn't come from our system but we know where it comes from.
Michael Vogel [Thu, 30 Jun 2016 05:56:06 +0000 (07:56 +0200)]
Small bugfix
Michael Vogel [Thu, 30 Jun 2016 05:46:00 +0000 (07:46 +0200)]
Just some more centralised functionality
Michael Vogel [Thu, 30 Jun 2016 05:32:07 +0000 (07:32 +0200)]
Cleaned up the code
Michael Vogel [Wed, 29 Jun 2016 23:18:44 +0000 (01:18 +0200)]
It should be now valid
Michael Vogel [Wed, 29 Jun 2016 22:22:42 +0000 (00:22 +0200)]
The key_id was added
Michael Vogel [Wed, 29 Jun 2016 20:50:30 +0000 (22:50 +0200)]
Diaspora: Support for new fetch functionality (replacement for /p/)
Tobias Diekershoff [Wed, 29 Jun 2016 19:51:48 +0000 (21:51 +0200)]
Merge pull request #2649 from annando/1606-diaspora-sign2
Diaspora: Another Bugfix for the new protocol
Michael Vogel [Wed, 29 Jun 2016 18:37:04 +0000 (20:37 +0200)]
Diaspora: Another Bugfix for the new protocol
Tobias Diekershoff [Wed, 29 Jun 2016 09:54:13 +0000 (11:54 +0200)]
Merge pull request #2648 from annando/1606-diaspora-signature
Diaspora: Incompatibilities with signature check solved
Michael Vogel [Wed, 29 Jun 2016 08:33:43 +0000 (10:33 +0200)]
Diaspora: Incompatibilities with signature check solved
Tobias Diekershoff [Tue, 28 Jun 2016 10:41:43 +0000 (12:41 +0200)]
Merge pull request #2647 from rabuzarus/2806_viewcontacts
viewcontacts - fix: tabmenu was not returned
rabuzarus [Tue, 28 Jun 2016 10:32:09 +0000 (12:32 +0200)]
viewcontacts - fix: tabmenu was not returned