friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
23,081 Commits 2 Branches 63 Tags 237 MiB
Commit Graph

23081 Commits

Author SHA1 Message Date
Hypolite Petovan 7320c5e8e8 Normalize Contact::magicLinkByContact method name 2019-02-23 17:32:10 -05:00
Michael ed54345ce1 Only check once 2019-02-23 22:27:03 +00:00
Michael 28f7c72cc7 Don't allow calling the install page after the install had been processed 2019-02-23 21:58:35 +00:00
Hypolite Petovan ae7115894f
Merge pull request #6734 from annando/fix-follow 
Fix: Following url with html entities now works again
 2019-02-23 16:49:19 -05:00
Michael 7e93355671 Fix: Following url with html entities now works again 2019-02-23 21:20:56 +00:00
Hypolite Petovan b9bd7b4f10
Merge pull request #6731 from annando/undefined-property 
Fixes "Undefined property: Friendica\App::$queue"
 2019-02-23 12:04:12 -05:00
Michael 7703875b55 Fixes "Undefined property: Friendica\App::$queue" 2019-02-23 16:08:02 +00:00
Hypolite Petovan 44953f045e
Merge pull request #6730 from nupplaphil/dba_reconnect 
DBA::(re-)connect fix for basePath
 2019-02-23 08:45:31 -05:00
Hypolite Petovan 1a0398a5b3
Merge pull request #6723 from nupplaphil/issue/6658-worker_id 
Adding worker ID to log
 2019-02-23 08:38:08 -05:00
Philipp Holzer 5f17ce574f
Fixing DBA::(re-)connect() 2019-02-23 12:50:52 +01:00
Philipp Holzer a73235b6ee
Fixing DBA::(re-)connect() 2019-02-23 12:49:56 +01:00
Philipp Holzer c53f0a4382
Fixing DBA::reconnect() 2019-02-23 12:48:39 +01:00
Philipp Holzer 8760d89eb8
reverting back workerLogger to Logger 2019-02-23 10:24:22 +01:00
Tobias Diekershoff 5f84c7f3ad
Merge pull request #6727 from nupplaphil/issue/6472-nodeinfo 
Returning 404 if nodeinfo isn't enabled
 2019-02-23 10:24:16 +01:00
Tobias Diekershoff 26931f2301
Merge pull request #6728 from nupplaphil/issue/6337-warnings 
Fixing Update retval warning
 2019-02-23 10:23:46 +01:00
Philipp Holzer 5b2f394e3e
Fixing #issuecomment-456403983 2019-02-23 10:16:07 +01:00
Philipp Holzer 45cc8180b1
Return 404 if nodeinfo isn't enabled. 2019-02-23 10:10:33 +01:00
Hypolite Petovan c1896eee34
Merge pull request #6725 from nupplaphil/6691-rendertime-fix 
Addon loading fix
 2019-02-22 23:53:11 -05:00
Hypolite Petovan 98d584b737
Merge pull request #6724 from nupplaphil/issue/config_set 
Config Set Bugfix
 2019-02-22 21:29:26 -05:00
Philipp Holzer dddaf8ea1d
improve tests 2019-02-23 01:37:29 +01:00
Philipp Holzer 3aae84edd1
[rendertime] Timing problem during addon config read 2019-02-23 01:24:08 +01:00
Philipp Holzer 40e9bbeb88
cleanup 2019-02-23 00:53:31 +01:00
Philipp Holzer b23368b0ea
bugfixing test 2019-02-23 00:51:08 +01:00
Philipp Holzer 13807129aa
fixing preload adapter 2019-02-23 00:23:41 +01:00
Philipp Holzer 1dee89f215
fixing tests and preload config 2019-02-23 00:09:57 +01:00
Philipp Holzer 8d56fb8fbe
bugfix marking of db-values 2019-02-22 23:57:04 +01:00
Philipp Holzer b47fc97b06
readded note 2019-02-22 23:55:13 +01:00
Philipp Holzer 16863c5d82
switched back to logger 2019-02-22 23:53:20 +01:00
Philipp Holzer 8c3aebc376
Bugfixings in Config 
- replaced usage of "!<unset>!" with null-returns
- fixed bool settings (0/1)
- fixed overriding config-values
- fixed basepath problems
 2019-02-22 23:51:13 +01:00
Philipp Holzer a613523dd7
skip WorkerLogger for Logging 2019-02-22 20:45:13 +01:00
Philipp Holzer 9c12f3f226
Formatting logger to new style 2019-02-22 20:41:13 +01:00
Philipp Holzer cec6f49023
Removed unused code 2019-02-22 20:24:10 +01:00
Philipp Holzer ee37632695
Adding worker id & functionname to worker logs 2019-02-22 20:10:27 +01:00
Hypolite Petovan 2d91d5c3d9
Merge pull request #6717 from annando/network-mentions 
Automatically adding mentions in the network stream hadn't really worked
 2019-02-21 21:14:23 -05:00
Hypolite Petovan 4375edd63e
Merge pull request #6719 from annando/worker-scheduler 
New scheduler mechanism - now to the correct branch
 2019-02-21 16:12:19 -05:00
Michael 08d92d7ad8 Automatically adding mentions in the network stream hadn't really worked 2019-02-21 20:42:00 +00:00
Michael 7810227040 Reverted test stuff 2019-02-21 19:34:12 +00:00
Michael 3450f12cba Changed log calls 2019-02-21 19:32:31 +00:00
Michael Vogel ca05a0674e
Merge pull request #6715 from tobiasd/20190221-cs 
CS translation update THX Aditoo
 2019-02-21 09:49:08 +01:00
Tobias Diekershoff 43ce3cb511 CS translation update THX Aditoo 2019-02-21 06:52:36 +01:00
Hypolite Petovan d2e7828bda
Merge pull request #6713 from annando/composer 
Updated composer lockfile
 2019-02-20 18:56:40 -05:00
Michael f2881d95c2 Updated composer lockfile 2019-02-20 23:16:36 +00:00
Hypolite Petovan 73cafb5b11
Merge pull request #6709 from annando/urlpath 
Issue 6679: Quick fix
 2019-02-20 16:40:06 -05:00
Michael 886da50474 Issue 6679: Quick fix 2019-02-20 21:06:52 +00:00
Hypolite Petovan a81696cd1c
Merge pull request #6708 from Aditoo17/develop 
Change iframe address
 2019-02-20 14:38:23 -05:00
Aditoo17 5349de3a9f
Change iframe address 2019-02-20 20:32:19 +01:00
Aditoo17 c11b7f7075
Change iframe address 2019-02-20 20:32:01 +01:00
Hypolite Petovan 1637835461
Merge pull request #6707 from nupplaphil/6691-rendertime-fix 
Fixing Rendertime
 2019-02-20 12:08:45 -05:00
Philipp Holzer 52c5ef9a75
bugfix test 2019-02-20 17:37:46 +01:00
Philipp Holzer 466f7a0ee5
adding test 2019-02-20 17:20:17 +01:00