Commit graph

12501 commits

Author SHA1 Message Date
Michael Vogel 2a088d27d0 Merge pull request #2672 from rabuzarus/1007-page_template
add possibility to load custom page templates + none.php pagetemplate…
2016-07-11 15:20:10 +02:00
rabuzarus 15471f3835 add possibility to load custom page templates + none.php pagetemplate is part of core now 2016-07-11 10:33:39 +02:00
Tobias Diekershoff 26098fa263 Merge pull request #2671 from annando/1607-diaspora-soapbox-connect
Bugfix: Diaspora connect requests to soapbox account work now
2016-07-10 13:55:56 +02:00
Michael Vogel 9ac26802ce Diaspora: Send the profile data after a successful connect 2016-07-10 13:11:09 +02:00
Michael Vogel 19377f2a9c Just make the bugfix a little bit simpler 2016-07-10 12:18:10 +02:00
Michael Vogel 84aa01b377 Bugfix: Diaspora connects to a Soapbox account weren't established correctly 2016-07-10 12:09:58 +02:00
Michael Vogel 3cb38a8fff Merge pull request #2670 from tobiasd/20160709-credits
regen credits.txt
2016-07-10 09:28:41 +02:00
Tobias Diekershoff fd105609a4 Merge pull request #2668 from annando/1607-diaspora-retraction
Diaspora: Relayed retraction hadn't worked.
2016-07-10 08:15:56 +02:00
Michael Vogel 94478bc366 Merge pull request #2667 from tobiasd/20160709-messages
regen messages.po
2016-07-09 20:39:03 +02:00
Tobias Diekershoff 080b567860 regen credits.txt 2016-07-09 12:10:22 +02:00
Tobias Diekershoff cacd07a5ea regen messages.po 2016-07-09 07:20:48 +02:00
Michael Vogel e43a90252c Diaspora: Relayed retraction hadn't worked. 2016-07-08 20:39:14 +02:00
Tobias Diekershoff b4b2a6d5b8 Merge pull request #2666 from annando/1607-more-logging
Logging for feeds improved, new "process id" for logging
2016-07-07 22:36:20 +02:00
Michael Vogel fc25e605cb Logging for feeds improved, new "process id" for logging 2016-07-07 20:32:13 +02:00
fabrixxm 0bfcd1fe63 Merge pull request #2665 from tobiasd/20160705-mime
adjust the rand bounderies to be within the allowed max value
2016-07-05 16:09:44 +02:00
Tobias Diekershoff 5b03db4a1b adjust the rand bounderies to be within the allowed max value 2016-07-05 15:45:39 +02:00
rabuzarus 6e7f7210a8 Merge pull request #2664 from annando/1607-remote-auth
Bugfix: Remote auth and picture permissions should now work again.
2016-07-05 09:30:00 +02:00
Michael Vogel e006bc24d7 Bugfix: Remote auth and picture permissions should now work again. 2016-07-05 08:51:28 +02:00
rabuzarus 8a988d3f31 Merge pull request #2663 from annando/1607-photos-session
Bugfix: On "photos" the session management has to work
2016-07-04 23:10:38 +02:00
Michael Vogel e3fb9155f0 Bugfix: On "photos" the session management has to work 2016-07-04 22:36:24 +02:00
Tobias Diekershoff c6a348d3dc Merge pull request #2662 from rabuzarus/0307_frio-fix_contact-url
frio: fix url variable for textcomplete in contact_template
2016-07-03 10:40:41 +02:00
rabuzarus 1cf4924e20 frio: fix url variable for textcomplete in contact_template 2016-07-03 09:50:34 +02:00
Tobias Diekershoff c772edc313 Merge pull request #2661 from annando/1607-refresh
Automatically refresh after two minutes when system is overloaded
2016-07-03 06:24:27 +02:00
Michael Vogel 0ed93df91f Automatically refresh after two minutes when system is overloaded 2016-07-03 00:26:00 +02:00
Tobias Diekershoff aba590b4c4 Merge pull request #2660 from annando/1607-worker-admin
Site settings: some settings are disabled when the worker is active
2016-07-02 23:17:26 +02:00
Michael Vogel 2ef50cb7e6 Site settings: some settings are disabled when the worker is active 2016-07-02 23:08:33 +02:00
Tobias Diekershoff ce64955fe0 Merge pull request #2659 from annando/1607-bugfix-scrape-diaspora
Bugfix: The notify value for Diaspora wasn't assigned
2016-07-02 22:07:41 +02:00
Tobias Diekershoff 598a9f76a6 Merge pull request #2658 from annando/1607-maxload
Central Backend/Frontend detection when checking for overload
2016-07-02 21:52:48 +02:00
Michael Vogel 34475ad262 Bugfix: The notify value for Diaspora wasn't assigned 2016-07-02 21:14:21 +02:00
Tobias Diekershoff 7cda169f24 Merge pull request #2657 from annando/1607-share-contact
Only use the profile data in shares if there is data
2016-07-02 20:06:20 +02:00
Tobias Diekershoff 14f606957f Merge pull request #2656 from annando/1607-is-result2
Moves the function "is_result" from the dba class to the dbm class
2016-07-02 19:29:43 +02:00
Michael Vogel f1af0fe360 Obly use the profile data in shares if there is data 2016-07-02 17:51:16 +02:00
Michael Vogel c7f10bacb5 Merge remote-tracking branch 'upstream/develop' into 1607-is-result2 2016-07-02 14:01:52 +02:00
Michael Vogel e4c6cfd2d8 Moves the function "is_result" from dba to dbm. 2016-07-02 14:00:42 +02:00
Tobias Diekershoff b580a338f6 Merge pull request #2654 from annando/1607-thumb-micro
use thumb avatar size instead of micro size in the contact list
2016-07-02 13:53:35 +02:00
Tobias Diekershoff 90f98414cf Merge pull request #2655 from annando/develop
Fixed pull request 2390
2016-07-02 13:53:20 +02:00
Michael Vogel 91e20f2f9b Remove unused function 2016-07-02 13:42:42 +02:00
Michael Vogel ddfd425cd7 Merge branch 'Quix0r-rewrites/is_filled_array_introduced' into develop 2016-07-02 13:38:39 +02:00
Michael Vogel 7d531afd00 Merge branch 'rewrites/is_filled_array_introduced' of git://github.com/Quix0r/friendica into Quix0r-rewrites/is_filled_array_introduced
Conflicts:
	boot.php
2016-07-02 13:38:23 +02:00
Michael Vogel e67554924a use thumb avatar size instead of micro size in the contact list 2016-07-02 09:32:42 +02:00
Michael Vogel c549ae939c Added the new function to the poller. 2016-07-02 09:31:28 +02:00
Michael Vogel b3c8ff836d Backend/Frontend detection when checking for overload 2016-07-02 08:54:57 +02:00
Tobias Diekershoff 0344d26896 Merge pull request #2653 from rabuzarus/0107_frio_jot_textcomplete
frio: fix textcomplete for jot
2016-07-01 17:18:25 +02:00
rabuzarus 9170955f80 frio: fix textcomplete for jot 2016-07-01 17:03:40 +02:00
rabuzarus 9262afef93 Merge pull request #2652 from annando/1606-diaspora-fetch3
Diaspora: Support for reading the /fetch/post/ functionality
2016-07-01 12:39:36 +02:00
Michael Vogel c1ce7059b6 If it doesn't work with the new method, try the old one 2016-06-30 22:58:56 +02:00
Michael Vogel e5dd67121f Some logging added. 2016-06-30 22:42:46 +02:00
Michael Vogel 97abbe83f4 Diaspora: Support for reading the /fetch/post/ functionality 2016-06-30 22:18:48 +02:00
rabuzarus b2e21ca7b8 Merge pull request #2651 from annando/1606-fetch-loop
Avoid redirection loops at /fetch/ and /p/
2016-06-30 15:21:28 +02:00
Michael Vogel a7ee8a8bc9 Avoid redirection loops at /fetch/ and /p/ 2016-06-30 12:02:35 +02:00