Commit graph

12822 commits

Author SHA1 Message Date
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
8a11a60932 Small text correction 2016-07-10 09:29:43 +02:00
Michael Vogel
3cb38a8fff Merge pull request #2670 from tobiasd/20160709-credits
regen credits.txt
2016-07-10 09:28:41 +02:00
Michael Vogel
b9da831138 Fallback for empty names 2016-07-10 09:27:40 +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
Michael Vogel
f27bc00464 Remove obsolote functions 2016-07-09 20:09:09 +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
058c93a64c Changed documentation 2016-07-08 22:55:39 +02:00
Michael Vogel
f86dac652f OStatus now has "location" and "about", probing for urls added 2016-07-08 22:31:11 +02:00
Michael Vogel
0ccb171449 Probing now has a Twitter detection. 2016-07-08 21:15:20 +02:00
Michael Vogel
e43a90252c Diaspora: Relayed retraction hadn't worked. 2016-07-08 20:39:14 +02:00
Michael Vogel
b954714464 If the nick is missing then take the first part of the name 2016-07-08 20:37:10 +02:00
Michael Vogel
edfee710fe To-Do added 2016-07-07 23:35:44 +02:00
Michael Vogel
db1d8caaf2 Merge remote-tracking branch 'upstream/develop' into 1607-new-probe 2016-07-07 23:35:14 +02:00
Michael Vogel
a65547c578 Added documentation 2016-07-07 23:04:30 +02:00
Michael Vogel
c625b6aba8 If a page contains a feed url then follow it. 2016-07-07 22:37:16 +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
2e37234a41 Merge remote-tracking branch 'upstream/develop' into 1607-new-probe 2016-07-07 21:57:10 +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
Michael Vogel
1cc5d08def Merge remote-tracking branch 'upstream/develop' into 1607-new-probe 2016-07-05 09:49:19 +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
Michael Vogel
585c893456 You can now prove with an uid (important for mails) 2016-07-04 22:34:35 +02:00
Michael Vogel
4e5d335492 Removed the legacy function calls, removed unused functions 2016-07-04 08:05:30 +02:00
Michael Vogel
e1c0b4fe03 Warnings removed 2016-07-04 00:49:38 +02:00
Michael Vogel
f5593b1981 Removed old code 2016-07-04 00:14:08 +02:00
Michael Vogel
b124b94288 Support for noscrape when probing. 2016-07-03 23:11:21 +02:00
Michael Vogel
99f94edc9c New class to probe urls 2016-07-03 22:27:16 +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