strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
22845 commits 2 branches 55 tags 148 MiB
Commit graph

22845 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 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
Philipp Holzer 107293bd61
Fixing rendertime 2019-02-20 17:12:40 +01:00
Michael Vogel b07144de12
Merge pull request #6706 from tobiasd/20190220-fr 
update FR translations THX hypolite
 2019-02-20 15:41:37 +01:00
Tobias Diekershoff 5b18bcc12b update FR translations THX hypolite 2019-02-20 14:45:16 +01:00
Hypolite Petovan ae8125fbf7 Welcome 2019.03-rc 2019-02-20 08:14:32 -05:00
Tobias Diekershoff 1df19d3553
Merge pull request #6697 from annando/memory-jsonld 
Avoid memory issue in exception of JSON-LD parser
 2019-02-19 09:40:01 +01:00
Michael 4facd1dfdb Avoid memory issue in exception 2019-02-19 07:49:27 +00:00
Michael Vogel 182058943f
Merge pull request #6694 from Quix0r/rewrites/added-missing-var-init 
Some rewrites
 2019-02-19 07:52:36 +01:00
Michael Vogel c7a02d7e58
Merge pull request #6696 from tobiasd/20190219-de 
DE translation update THX Ulf Rompe
 2019-02-19 07:50:32 +01:00
Michael Vogel fad70d462d
Merge pull request #6695 from tobiasd/20190219-doc 
added forgotten line break
 2019-02-19 06:54:52 +01:00
Tobias Diekershoff 6fc581b03d DE translation update THX Ulf Rompe 2019-02-19 06:47:52 +01:00
Tobias Diekershoff b40485e61c added forgotten linebreak 2019-02-19 06:24:33 +01:00
Roland Häder 9fa812b35d
Rewrites: 
- converted single-line if() block to multi-line and with curly braces
- "imported" SPL classes to have unified code style
- always initialize your variables ... :-/
- added some empty lines/spaces for better readability

Signed-off-by: Roland Häder <roland@mxchange.org>
 2019-02-19 01:56:41 +01:00
Hypolite Petovan 3b646644c0
Merge pull request #6692 from softmetz/softmetz-patch-1 
Some documentation changes
 2019-02-18 19:26:08 -05:00
softmetz 6170936d5d
add --no-dev parameter to composer 2019-02-18 22:38:48 +01:00
softmetz fd4e8a430c
correct information about changing domain name 2019-02-18 22:36:16 +01:00
softmetz 23c8d7e302
add --no-dev parameter to composer 2019-02-18 22:34:05 +01:00
Michael Vogel e32ef66f68
Merge pull request #6688 from nupplaphil/preload_adapter_fix 
Preload adapter fix
 2019-02-18 15:47:26 +01:00
Philipp Holzer 6c22f70b62
revert style.php changes 2019-02-18 14:48:26 +01:00
Philipp Holzer c2176aad36
bugfix 2019-02-18 14:45:24 +01:00
Philipp Holzer 5127a113aa
set config_loaded with uid 2019-02-18 14:40:35 +01:00
rabuzarus fe40c6379c
Merge pull request #6686 from MrPetovan/task/frio-change-comment-expand-icon 
[frio] Change comment expand icons to carets
 2019-02-18 14:39:56 +01:00
Philipp Holzer 1194e9b41e
set config_loaded with uid 2019-02-18 14:34:30 +01:00
Hypolite Petovan 44b556aaa6 [frio] Change comment expand icons to carets 2019-02-18 08:23:05 -05:00
Philipp Holzer f825fa1d1c
tmp alert 2019-02-18 14:21:13 +01:00
Philipp Holzer 5157084969
negative set 2019-02-18 14:10:04 +01:00
Philipp Holzer 2fc81898da
Preload Adapter Fix 2019-02-18 14:02:09 +01:00
Hypolite Petovan d6944eb894
Merge pull request #6683 from rabuzarus/20190217_-_fix_magicLinks_mentions 
directory - own function for processing data of directory entries
 2019-02-18 08:01:20 -05:00
rabuzarus 3ba7907b57 forumdirectory: type is array 2019-02-18 13:27:26 +01:00
rabuzarus 2b7c331afb forumdirectory: some polishing 2019-02-18 13:03:21 +01:00
Michael Vogel a3152a96c2
Merge pull request #6685 from nupplaphil/basepath_fix 
Basepath fix
 2019-02-18 12:00:35 +01:00
Philipp Holzer f536107911
Fixing value check for configuration 2019-02-18 11:29:51 +01:00
Philipp Holzer 86aaa6565e
Fixing saveLog() 2019-02-18 11:29:51 +01:00
Philipp Holzer a3d6062476
check if value is set 
get basepath with config instead cache
 2019-02-18 11:29:42 +01:00
Hypolite Petovan 74edf9994f
Merge pull request #6678 from rabuzarus/20190217_-_fix_magicLinks_mentions 
fix magic links for item mentions
 2019-02-17 21:24:01 -05:00
rabuzarus 85f0508494 own function for processing data of directory entries 2019-02-18 03:00:10 +01:00