15 Commits

Author SHA1 Message Date
einhornimmond
910e33deff Merge branch 'master' into stage2 2021-03-31 18:06:57 +02:00
einhornimmond
55334799cb replace \r\n with \n 2021-03-31 17:08:37 +02:00
einhornimmond
f8d174049c
Merge branch 'master' into fix_lineendings 2021-03-30 18:29:04 +02:00
d4d9a22164
lineendings community server 2021-03-30 17:05:16 +02:00
staging new
55ebd2ce96 Merge branch 'backport_balance_recalculation' into vue_with_nginx 2021-03-26 12:49:46 +01:00
Dario Rekowski on RockPI
9ed48da44c fix temporaer calculating error 2021-03-26 11:46:35 +00:00
root
fdb46d5545 fix merge conflict 2021-03-26 12:27:55 +01:00
Dario Rekowski on RockPI
6ea10e2572 remove calls to removed DRMakeStringHash function 2021-03-26 10:49:00 +00:00
Dario Rekowski on RockPI
0bcc782388 remove make string hash function which is not working in php 2021-03-26 10:36:05 +00:00
Dario Rekowski on RockPI
61b15beaf5 insert updateBalance method from stage2, ignore decay for the time beeing 2021-03-26 10:00:07 +00:00
root
7f294ef28d remove error by notification email send failure 2021-03-25 14:07:40 +01:00
Dario Rekowski on RockPI
1949260452 fix bugs with begin of decay implementation 2021-03-18 12:55:04 +00:00
741255c715
Merge commit 'cfddb27b48e7c7d018cfb5bd7feb8362ab2a25a3' into stage2_community_server 2021-03-17 00:41:12 +01:00
cc95d22989
Merge commit 'd87850db8c2ed6bdbb15aef4e6c51eb0b6054b19' into stage0_community_server 2021-03-17 00:39:35 +01:00
6fe5fd6d7e Add 'community_server/' from commit 'b6544b9e69fb85d4da100934675323c3e8c8ef67'
git-subtree-dir: community_server
git-subtree-mainline: ff11f6efe35bba180260fe84077bcd94298895c1
git-subtree-split: b6544b9e69fb85d4da100934675323c3e8c8ef67
2021-03-17 00:39:06 +01:00