254 Commits

Author SHA1 Message Date
Dario Rekowski on RockPI
d4145cf5c1 fix error with empty state_user_transactions 2021-04-07 14:53:33 +00:00
Dario Rekowski on RockPI
feb66dc670 transfer blockchain type to login server 2021-04-06 11:09:16 +00:00
Dario Rekowski on RockPI
6ca4fa7931 add blockchain types table and connect it with transactions table 2021-04-06 10:17:13 +00:00
Dario Rekowski on RockPI
6ba6bd7180 add send coins transactions how uses login-server endpoint from stage2 2021-03-31 18:02:54 +00:00
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
eda1b2ad7b fix bug in user search (wrong action) 2021-03-26 11:04:21 +00: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
ogerly
15bb6f4448 merge master 2021-03-24 06:17:00 +01:00
ogerly
a99de7f5d1 dev meeting, bernd 2021-03-24 06:05:05 +01:00
0886979d09
Merge pull request #63 from gradido/update_doc
Update doc
2021-03-23 17:48:38 +01:00
Dario Rekowski on RockPI
31a462ca9e update last cases of wrong Transaction session variable 2021-03-23 08:11:05 +00:00
Dario Rekowski on RockPI
d8e9dfbf4c update oversized size, from 23 to 25, but subtract additonal 3 char for the points 2021-03-22 20:03:43 +01:00
Dario Rekowski on RockPI
84bfd8ab06 update oversized size, from 23 to 22 2021-03-22 20:03:43 +01:00
Dario Rekowski on RockPI
edce8753cf update oversized size, from 25 to 23 2021-03-22 20:03:43 +01:00
Dario Rekowski on RockPI
d27f2009af shorten oversize emails and show them in modal dialog 2021-03-22 20:03:38 +01:00
Dario Rekowski on RockPI
34248ba830 update oversized size, from 23 to 25, but subtract additonal 3 char for the points 2021-03-22 19:55:35 +01:00
Dario Rekowski on RockPI
83344b87ed update oversized size, from 23 to 22 2021-03-22 19:55:35 +01:00
Dario Rekowski on RockPI
6b7a56b4dd update oversized size, from 25 to 23 2021-03-22 19:55:35 +01:00
Dario Rekowski on RockPI
e2574e36e6 shorten oversize emails and show them in modal dialog 2021-03-22 19:55:35 +01:00
Dario Rekowski on RockPI
a50858c2c7 update user search js, add order functionality 2021-03-22 19:55:35 +01:00
Dario Rekowski on RockPI
660ac324b8 add account state as parameter for user search, transmit to login-server and update handling by selecting from community server 2021-03-22 19:55:34 +01:00
7ec9fcf9ea
remove mithril client reference 2021-03-19 18:27:16 +01:00
Dario Rekowski on RockPI
1949260452 fix bugs with begin of decay implementation 2021-03-18 12:55:04 +00:00
Dario Rekowski on RockPI
1dd063433e fix transaction field name 2021-03-18 11:55:06 +00:00
einhornimmond
db02002680 adding missing submodules from integrated subprojects 2021-03-18 12:25:28 +01: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
0031f74342
deleted community_server reference 2021-03-17 00:38:40 +01:00
einhornimmond
823ca015df use updated and cleared login-server and community-server versions 2021-03-13 15:22:54 +01:00
einhornimmond
8d4ca9b797 update community 2021-03-10 15:55:09 +01:00
einhornimmond
5d24b054c1 update login-server branch, add option to community-server to get transactions in reversed order 2021-03-09 14:05:37 +01:00
ogerly
a9627ce19c translations for login, register clean 2021-03-04 15:23:28 +01:00
einhornimmond
61abb94e48 ignore logs 2021-03-04 14:35:07 +01:00
einhornimmond
de8f78c263 updates until now creation and transfer transactions with old frontend work in docker 2021-02-24 19:15:39 +01:00
einhornimmond
8c928a4568 update because of bugs in community server (setup) 2021-02-24 14:43:33 +01:00
einhornimmond
16af5409fd add option in ajax request in send coins transaction for auto-sign enable/disable 2021-02-23 13:50:23 +01:00
einhornimmond
5c77a9871b add ajax transfer function to community server and api doc md 2021-02-23 13:32:10 +01:00
einhornimmond
918a6ec7a4 make http://localhost/state-balances/ajaxListTransactions wokring and add it to doc 2021-02-22 18:53:24 +01:00
einhornimmond
f8f82a24c6 add community server api md, update community server 2021-02-22 15:28:39 +01:00
einhornimmond
6c648b3f99 remove \ from nginx.conf there where wrong copied from my setup scripts 2021-02-17 20:28:02 +01:00