einhornimmond
9d3ebb1a75
removed submodule
2021-04-07 17:21:08 +02:00
einhornimmond
d5e60af3a1
add auto_sign parameter and bring into live
...
if set to true, transaction will be directly signed and if get enough signes, sended afterwards (but asynchron)
2021-04-07 17:16:42 +02:00
Dario Rekowski on RockPI
65471ddc35
Merge branch 'stage2' of github.com:gradido/gradido into stage2
2021-04-07 14:54:20 +00:00
Dario Rekowski on RockPI
7b8c5ff883
point frontend to new api route
2021-04-07 14:54:08 +00:00
Dario Rekowski on RockPI
d4145cf5c1
fix error with empty state_user_transactions
2021-04-07 14:53:33 +00:00
einhornimmond
ad147cd8da
add parameter json string to pending task for saving additional infos like blockchain type in db
...
- add set and getter functions for param in controller::PendingTask and model::table::PendingTask
- call it inside transactions to save blockchainType as param and in load Transaction from db
2021-04-07 12:37:02 +02:00
einhornimmond
d659dfb886
forward blockchain type to TransactionBody
2021-04-06 13:10:50 +02:00
einhornimmond
9ea97bfb4d
Merge branch 'stage2' of github.com:gradido/gradido into stage2
2021-04-06 13:09:44 +02: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
einhornimmond
42b9849a58
add comment
2021-04-01 11:59:52 +02: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
Dario Rekowski on RockPI
3a10d1f429
update parameters to use with different blockchain-types
2021-03-31 18:02:23 +00:00
einhornimmond
fa48de44af
fix bugs which came with merging into master
2021-03-31 19:04:36 +02:00
einhornimmond
910e33deff
Merge branch 'master' into stage2
2021-03-31 18:06:57 +02:00
einhornimmond
436499458b
fix login server that it can build again (after Ulfs rebase action)
2021-03-31 17:49:02 +02:00
einhornimmond
55334799cb
replace \r\n with \n
2021-03-31 17:08:37 +02:00
einhornimmond
9946cc0e13
update stage2 docker build orientated on stage1 docker-build
2021-03-31 15:29:17 +02:00
einhornimmond
663c11e3c2
Merge pull request #82 from gradido/api_password_reset
...
Api password reset
2021-03-31 12:54:08 +02:00
einhornimmond
d1667e0ba9
Merge branch 'master' into api_password_reset
2021-03-31 12:38:52 +02:00
einhornimmond
7f3d146351
Merge pull request #101 from gradido/optimize_login_server_build
...
Optimize login server build
2021-03-31 12:29:09 +02:00
einhornimmond
ab53188659
Merge pull request #111 from gradido/update_markdown
...
markdown of login server api
2021-03-31 12:28:35 +02:00
einhornimmond
242dfa7154
Merge pull request #112 from gradido/fix_lineendings
...
Fix lineendings
2021-03-31 12:28:17 +02:00
einhornimmond
0e76f5a8a8
remove \r from config
2021-03-31 12:25:24 +02:00
Alexander Friedland
d891994885
Merge pull request #117 from gradido/background-color-change
...
Background color change
2021-03-31 12:21:49 +02:00
Alexander Friedland
855d1180c1
Merge pull request #116 from gradido/delete-unused-files
...
Delete unused files
2021-03-31 12:21:34 +02:00
Alexander Friedland
2a493332b7
Merge pull request #115 from gradido/work-components-tests
...
store aufräumen teil 1
2021-03-31 12:20:54 +02:00
ogerly
e6067b0b38
background color entfernt
2021-03-31 08:54:40 +02:00
ogerly
363de9b3c2
nicht verwendete files gelöscht
2021-03-31 08:35:18 +02:00
ogerly
2630809d67
yarn lint
2021-03-31 08:13:54 +02:00
ogerly
d4f850d200
elender murks
2021-03-31 08:08:02 +02:00
einhornimmond
363e04fbe5
put back depracted email tasks because I don't exactly know if I broke something if I remove it completly (especially model/session.cpp)
2021-03-30 18:42:07 +02:00
einhornimmond
f8d174049c
Merge branch 'master' into fix_lineendings
2021-03-30 18:29:04 +02:00
einhornimmond
5337543be1
Merge branch 'fix_lineendings' of github.com:gradido/gradido into fix_lineendings
2021-03-30 18:27:18 +02:00
einhornimmond
3339ce9d38
change fileformat back to utf-8 with BOM, for visual studio source files which contain ä,Ä,ö,Ö,ü,Ü or ß in strings must be in format utf-8-BOM
2021-03-30 18:26:48 +02:00
einhornimmond
41b1a18072
change fileformat back to utf-8 with BOM, for visual studio source files which contain ä,Ä,ö,Ö,ü,Ü or ß in strings must be in format utf-8-BOM
2021-03-30 17:52:03 +02:00
f09a0017f9
lineendings login_server
2021-03-30 17:06:41 +02:00
d4d9a22164
lineendings community server
2021-03-30 17:05:16 +02:00
45557a55c0
lineendings misc
2021-03-30 17:03:21 +02:00
8d530caf9a
lineendings nginx
2021-03-30 17:02:39 +02:00
b64f4748da
lineendings config
2021-03-30 17:01:27 +02:00
d2ca4fc42e
Merge pull request #84 from gradido/vue_with_nginx
...
Vue with nginx
2021-03-30 16:58:01 +02:00
62c34430e1
v0.9.4
2021-03-30 16:48:01 +02:00
einhornimmond
3358a25d4a
Merge branch 'master' into vue_with_nginx
2021-03-30 16:34:16 +02:00
einhornimmond
02d087a52b
Merge branch 'master' into vue_with_nginx
2021-03-30 16:32:02 +02:00
einhornimmond
2e178360f1
Merge pull request #103 from gradido/build_on_run
...
Build on run
2021-03-30 16:10:28 +02:00
einhornimmond
ce4aa2438c
fix linting errors
2021-03-30 16:04:09 +02:00
ogerly
1c7a689621
fix lint
2021-03-30 15:13:47 +02:00
ogerly
d18be8bcd2
store aufgeräumt
2021-03-30 15:13:12 +02:00
einhornimmond
7822b63c23
change protoc to version from gradido
2021-03-30 14:04:08 +02:00
