3404 Commits

Author SHA1 Message Date
Dario Rekowski on RockPI
f08416fe8a fix test 3 2021-09-21 11:00:56 +00:00
Einhornimmond
3102082dbe fix merge conflict 2021-09-21 12:37:27 +02:00
einhornimmond
ce725b1032
Merge pull request #864 from gradido/docker_skeema_without_rebuild
docker skeema: mount sql files folder dynamic
2021-09-21 11:19:29 +02:00
einhornimmond
4d6964cf4e
Merge pull request #865 from gradido/login_disable_auto_resend_failed_transactions_restart
disable auto-resend of not finished transactions on login-server restart
2021-09-21 10:45:08 +02:00
cebf92c451
fixed migrations directory to default to the production version.
This is the downside of this patch - the .env file has to be different in dev and production version
2021-09-21 10:34:56 +02:00
94424f17a2
Fixed database tool to read .env config when built. 2021-09-21 10:24:43 +02:00
Einhornimmond
88b66a0274 fix test 2 2021-09-20 19:24:52 +02:00
einhorn_b
39ef88d8e7 update skeema for working also in test and production 2021-09-20 19:21:33 +02:00
Einhornimmond
52055778b3 fix community server tests 2021-09-20 18:57:12 +02:00
einhornimmond
102fc586e9 change variable name according to name in config 2021-09-20 18:51:05 +02:00
Einhornimmond
8b3653016b get balance working with apollo 2021-09-20 18:42:04 +02:00
eda971a09c
add release plan image 2021-09-20 13:57:02 +02:00
einhornimmond
ec1b01d5d3
Merge pull request #794 from gradido/frontend_commit_hash
add commit hash with link to github into frontend
2021-09-20 13:54:16 +02:00
Moriz Wahl
62142710f8 send coins as Mutations 2021-09-20 12:25:04 +02:00
einhornimmond
f0cbed81f3 disable auto-resend of not finished transactions on login-server restart 2021-09-20 12:22:56 +02:00
Moriz Wahl
5ded9f60be createUser as Mutation 2021-09-20 12:02:17 +02:00
Moriz Wahl
c401344193 fix: language can be changed in profile 2021-09-20 11:50:26 +02:00
einhorn_b
b196ef78b8 Merge branch 'master' into frontend_commit_hash 2021-09-20 11:40:49 +02:00
einhorn_b
3286835f44 mount sql files folder dynamic 2021-09-20 11:36:01 +02:00
Moriz Wahl
e6d386c598 refactor: Queries to Mutations 2021-09-20 11:22:00 +02:00
ogerly
cdbd5f59b5 after remove conflicts, fix lint 2021-09-20 08:58:58 +02:00
Alexander Friedland
e8e0eb4d8d
Merge branch 'master' into 636-Display-of-Decay-in-Transaction-Details 2021-09-20 08:29:04 +02:00
db15433cc2
Merge pull request #844 from gradido/mock_choose_community
mock_choose_community
2021-09-18 23:43:59 +02:00
8f07f9121a
Merge pull request #845 from gradido/issue_templates_remove_discord
Remove discord link for issue templates
2021-09-18 21:51:10 +02:00
c0b23623c1
- remove discord links from templates
- make the templates project agnostic
- link to the new repo https://github.com/ulfgebhardt/issue-templates to have it compatible
- rename refactor tickets into .. ticket
2021-09-18 20:30:04 +02:00
cde63bc5eb
mock_choose_community 2021-09-18 20:27:54 +02:00
einhornimmond
90d43555d6
Merge pull request #830 from gradido/docker_update
update docker files
2021-09-18 14:19:55 +02:00
Einhornimmond
8d668aebdc fix test 2021-09-17 21:49:23 +02:00
Einhornimmond
95cb6a5bb8 fix linting and community server test 2021-09-17 21:34:04 +02:00
Einhornimmond
0c7bb13b4e change state_users table to user and rename colums in camelCase, adapt 2021-09-17 21:13:14 +02:00
einhornimmond
bd83cb4a76 update docker files 2021-09-17 20:33:58 +02:00
einhornimmond
675917a8c0 split test in two 2021-09-17 16:37:39 +02:00
einhornimmond
bde7b28571
Merge pull request #245 from gradido/login_add_publisher_id
added publisher_id field to user
2021-09-17 14:07:16 +02:00
einhornimmond
c8386e588b fix linting 2021-09-17 13:46:45 +02:00
einhornimmond
8ecd7a634b add publisher id to backend 2021-09-17 13:36:13 +02:00
einhornimmond
6a9a362578 fix missing lines 2021-09-17 13:28:09 +02:00
einhornimmond
5c60aa2c40 Merge branch 'master' into login_add_publisher_id 2021-09-17 13:22:57 +02:00
einhornimmond
db15a5da4e add tests for commit hash 2021-09-17 13:19:10 +02:00
ogerly
e7d925b794 transmit and receive, calculation of the decay as text: 'total' 2021-09-17 09:07:01 +02:00
5038cff0bf
Merge pull request #811 from gradido/webpack_update
webpack update
2021-09-16 18:19:40 +02:00
Moriz Wahl
a11383a370
Merge pull request #814 from gradido/release-1.4.0
feat: Release 1.4.0
2021-09-16 16:05:51 +02:00
ogerly
00219c049e decay calculation is calculated and displayed at the transaction in a more user-friendly way 2021-09-16 15:54:35 +02:00
Moriz Wahl
4cdbea7f99 feat: Release 1.4.0 2021-09-16 15:53:25 +02:00
Hannes Heine
af8a722bd0
Merge pull request #753 from gradido/apollo-clicktipp-connector
Integration of the KlicktippAPI to the User management
2021-09-16 15:51:48 +02:00
elweyn
29bd6620d0 Default KlickTipp configuration empty, possibility to set a develop mode on klickTipp so that we get a correct user even without response. 2021-09-16 15:42:47 +02:00
elweyn
7084bcb9c0 Changed the error handling when klicktipp not accessible. 2021-09-16 14:10:57 +02:00
Moriz Wahl
7b11c2212f test coverage frontend 67% 2021-09-16 13:47:57 +02:00
Moriz Wahl
ecdeb94fc0 fix test 2021-09-16 13:37:38 +02:00
Moriz Wahl
f438012099 linting 2021-09-16 13:26:14 +02:00
Moriz Wahl
eca81883a0 Merge branch 'master' into apollo-clicktipp-connector 2021-09-16 13:21:38 +02:00