ogerly
|
5c6804aea7
|
fix locales
|
2021-10-15 10:38:06 +02:00 |
|
Moriz Wahl
|
dcbb5839ca
|
Merge pull request #985 from gradido/982-transaction-id
fix: Use TransactionId as Collapse Identifier
|
2021-10-15 10:37:35 +02:00 |
|
Moriz Wahl
|
bc698f8bd0
|
fix: Use TransactionId as Collapse Identifier
|
2021-10-15 10:08:54 +02:00 |
|
ogerly
|
c182b71358
|
ink to the funding contributions of gradido.net memberships
|
2021-10-15 09:41:52 +02:00 |
|
Alexander Friedland
|
9a183e0712
|
Merge pull request #979 from gradido/977-icon-nicht-auf-einer-hoehe-transactionslist
icon in one row - fix
|
2021-10-14 18:25:47 +02:00 |
|
ogerly
|
70ea239267
|
fix: summe-gdd-schoepfun
|
2021-10-14 18:10:28 +02:00 |
|
ogerly
|
5db8afde1a
|
icon in one row - fix
|
2021-10-14 17:20:02 +02:00 |
|
Moriz Wahl
|
f8ddb53dba
|
refactor: Activate Registration
|
2021-10-14 17:19:41 +02:00 |
|
Alexander Friedland
|
ab684c22b8
|
Merge pull request #974 from gradido/901-Total-of-Transaction-Calculcation-not-properly-rounded
error rounding in transactions list fixed
|
2021-10-14 16:23:58 +02:00 |
|
Alexander Friedland
|
8aecbd72f1
|
aa
|
2021-10-14 16:14:05 +02:00 |
|
ogerly
|
180c3de11c
|
error rounding in transactions list fixed
|
2021-10-14 16:06:05 +02:00 |
|
|
|
2968421b7e
|
Merge pull request #973 from gradido/fix_publisher_id_config
fix publisherId config
|
2021-10-14 15:58:24 +02:00 |
|
|
|
5baf5e26c6
|
fix publisherId config
|
2021-10-14 15:49:23 +02:00 |
|
ogerly
|
3728b4ff0c
|
apexchats step work
|
2021-10-14 15:38:34 +02:00 |
|
Moriz Wahl
|
e58c5726cb
|
Merge pull request #968 from gradido/community-production
refactor: In Production only Show one Community
|
2021-10-14 14:56:48 +02:00 |
|
Hannes Heine
|
5725e9c999
|
Merge pull request #959 from gradido/804-elopage-registration
804 elopage registration
|
2021-10-14 12:37:44 +02:00 |
|
Alexander Friedland
|
1c57473d4a
|
Update frontend/src/views/Layout/DashboardLayout_gdd.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2021-10-14 10:09:47 +02:00 |
|
Alexander Friedland
|
d64055a78f
|
Update frontend/src/views/Layout/DashboardLayout_gdd.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2021-10-14 10:09:40 +02:00 |
|
Alexander Friedland
|
35af053f19
|
Update frontend/src/views/Layout/DashboardLayout_gdd.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2021-10-14 10:09:24 +02:00 |
|
Alexander Friedland
|
d103da4054
|
Update frontend/src/views/Layout/DashboardLayout_gdd.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2021-10-14 10:09:00 +02:00 |
|
Moriz Wahl
|
96564394d8
|
Update backend/src/graphql/resolver/UserResolver.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
|
2021-10-13 20:02:25 +02:00 |
|
Moriz Wahl
|
0e75826b28
|
Update backend/src/graphql/resolver/UserResolver.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
|
2021-10-13 20:02:13 +02:00 |
|
ogerly
|
b2363198c2
|
router.test.js fix SendOverview
|
2021-10-13 16:47:37 +02:00 |
|
Hannes Heine
|
8bfec7dcf8
|
Update frontend/src/views/Pages/Register.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2021-10-13 16:37:47 +02:00 |
|
Hannes Heine
|
a7134cd33b
|
Update frontend/src/views/Pages/Login.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2021-10-13 16:37:35 +02:00 |
|
Hannes Heine
|
40961fe7d3
|
Update frontend/src/store/store.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2021-10-13 16:37:22 +02:00 |
|
ogerly
|
907a9fe696
|
merge master, merge conflict fixed
|
2021-10-13 16:34:29 +02:00 |
|
ogerly
|
709888df55
|
Merge branch 'master' into 707-Separate-Account-Overview-from-Send-Form
|
2021-10-13 16:28:26 +02:00 |
|
ogerly
|
db1124da3f
|
separate pages: overview and send.
apexcharts library inserted.
example charts created: lienen and bar charts.
example charts inserted
|
2021-10-13 16:13:28 +02:00 |
|
Moriz Wahl
|
56b5e03578
|
st coverage backend to 3%
|
2021-10-13 16:02:22 +02:00 |
|
elweyn
|
fff9361fe7
|
Withdrew the change to backend workflow since I don't have permission for it.
|
2021-10-13 13:38:46 +02:00 |
|
elweyn
|
ad11d482e0
|
Missing files..
|
2021-10-13 13:35:58 +02:00 |
|
elweyn
|
58182d73c6
|
Added the publisherId to the login & createUser calls, adjusted the tests to the new code.
|
2021-10-13 13:26:46 +02:00 |
|
Moriz Wahl
|
481bd63794
|
production from NODE_ENV, please test
|
2021-10-13 12:08:22 +02:00 |
|
elweyn
|
5a14161284
|
Adding the publisherId to the login call and that it stores it to the user profile.
|
2021-10-13 12:07:23 +02:00 |
|
elweyn
|
f039f8a714
|
Merge branch '804-elopage-registration' of https://github.com/gradido/gradido into 804-elopage-registration
|
2021-10-13 11:32:58 +02:00 |
|
elweyn
|
a1b54e592e
|
Changed the logic to catch error send by Klicktipp.
|
2021-10-13 11:32:00 +02:00 |
|
Hannes Heine
|
861fc21766
|
Update frontend/src/components/SidebarPlugin/SideBar.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2021-10-13 05:35:48 +02:00 |
|
Hannes Heine
|
2506480a52
|
Update frontend/src/components/SidebarPlugin/SideBar.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2021-10-13 05:35:06 +02:00 |
|
Hannes Heine
|
efed348a94
|
Change the Test name so that we see if their is a publisher ID or not
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2021-10-13 05:34:14 +02:00 |
|
Moriz Wahl
|
f2ec81e2b2
|
feat: In Production only Show one Community
|
2021-10-12 21:28:29 +02:00 |
|
elweyn
|
3fdb503ea6
|
Merge branch 'master' into 804-elopage-registration
|
2021-10-12 17:08:06 +02:00 |
|
elweyn
|
8f2289ebf2
|
Changed the test for the members area & it's link.
|
2021-10-12 17:07:27 +02:00 |
|
einhornimmond
|
29de8e224f
|
Merge pull request #960 from gradido/add_autocorrect_keys
Add autocorrect keys
|
2021-10-12 17:00:36 +02:00 |
|
elweyn
|
2d218e86ce
|
Asking for hasElopage in login.
|
2021-10-12 16:50:26 +02:00 |
|
elweyn
|
d3198b037e
|
Fixe model for User and adding hasElopage to User Object.
|
2021-10-12 16:50:07 +02:00 |
|
elweyn
|
36e6a459a4
|
Fixe small error.
|
2021-10-12 16:49:14 +02:00 |
|
elweyn
|
74ac8b7fcc
|
Merge branch 'master' into 804-elopage-registration
|
2021-10-12 16:25:23 +02:00 |
|
einhornimmond
|
4464611759
|
Merge pull request #949 from gradido/login_checkForElopage
check for elopage account
|
2021-10-12 16:25:03 +02:00 |
|
einhorn_b
|
3b487ab2cb
|
fix field name
|
2021-10-12 16:17:19 +02:00 |
|
