IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,375 Commits 1 Branch 0 Tags
Commit Graph

7375 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Moriz Wahl
efe8d0c63b
Merge pull request #1624 from gradido/no-float-ids 
refactor: No Float Ids
 2022-03-21 14:32:50 +01:00
Moriz Wahl
62384b1056
Merge branch 'master' into no-float-ids 2022-03-21 14:05:51 +01:00
Hannes Heine
5dc903bfb1
Merge pull request #1336 from gradido/1319-email-optin 
Change the text if the account is not activated yet and changed the b…
 2022-03-21 12:54:20 +01:00
elweyn
ed1c3bf137 Withdrew else block after throwing an error. 2022-03-21 12:44:03 +01:00
Ulf Gebhardt
c83959fc58
Merge branch 'master' into 1319-email-optin 2022-03-21 12:30:57 +01:00
Moriz Wahl
7dfa0e37ee fix: id parameter to Int in seed 2022-03-19 13:08:37 +01:00
Moriz Wahl
612b8ca69c Merge branch 'master' into no-float-ids 2022-03-19 13:07:53 +01:00
Ulf Gebhardt
5963251085
Merge pull request #1628 from gradido/rename_transaction_type_link_summary 
Refactor: Corrected name of transaction link summary
 2022-03-19 12:25:35 +01:00
Ulf Gebhardt
761de3f636
corrected name of transaction link summary to differentiate between a link and the summary transaction 2022-03-19 10:43:17 +01:00
Moriz Wahl
e215901432
Merge pull request #1623 from gradido/user-entity-in-context 
fix: Query for Only Creations Transaction List
 2022-03-18 15:32:14 +01:00
Moriz Wahl
550a55a4f0
Merge branch 'master' into user-entity-in-context 2022-03-18 15:23:48 +01:00
Ulf Gebhardt
320846fa1a
Merge pull request #1626 from gradido/resolve_external_paths 
Fix: build for development and production links external modules properly
 2022-03-18 15:23:40 +01:00
Ulf Gebhardt
4c0996aefb
Merge branch 'master' into resolve_external_paths 2022-03-18 15:15:51 +01:00
Ulf Gebhardt
21a257a901
exclude build folder from jest & jest coverage collection 2022-03-18 15:15:01 +01:00
Moriz Wahl
303ab94ba3
Merge branch 'master' into user-entity-in-context 2022-03-18 15:13:11 +01:00
Moriz Wahl
153b39c65d
Merge pull request #1622 from gradido/seed-transaction-links 
feat: Seed Transaction Links
 2022-03-18 15:12:09 +01:00
Moriz Wahl
8040da7a66
Merge branch 'master' into seed-transaction-links 2022-03-18 15:01:42 +01:00
Ulf Gebhardt
d4ec4ab080
reverted unnecessary change 2022-03-18 01:45:28 +01:00
Ulf Gebhardt
5fe1e05ca4
use tsconfig-paths package to resolve paths 
link build and src paths for the external database package
 2022-03-18 01:35:01 +01:00
Alexander Friedland
c6cd6f37e6
Merge pull request #1620 from gradido/1588-frontend-expendable-paginated-link-list 
1588 frontend expendable paginated link list
 2022-03-17 22:51:09 +01:00
ogerly
39832bbcf3 remove tests 2022-03-17 22:42:31 +01:00
ogerly
a0c6aeb3a5 change memo texte in tests for Gdd transaction list 2022-03-17 21:58:38 +01:00
ogerly
78a1459971 change props in tests for transaction links + zaubersprüche 2022-03-17 21:47:11 +01:00
ogerly
f5b0ef2265 resolve conflict 2022-03-17 21:28:40 +01:00
Moriz Wahl
5cf930841c remove comment 2022-03-17 20:13:11 +01:00
Moriz Wahl
b8d4366e46 src/components/Transactions/TransactionLinksSummary.spec.js 2022-03-17 20:06:24 +01:00
ogerly
b75330c142 test transaction links four to eight 2022-03-17 18:08:15 +01:00
ogerly
4a7a4f28cf change object variables, pending extra, chnage text in tests 2022-03-17 17:58:17 +01:00
Alexander Friedland
6b2cd9716d
Update frontend/src/locales/en.json 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-03-17 16:48:49 +01:00
Alexander Friedland
e396aa52fb
Update frontend/src/components/Transactions/TransactionLinksSummary.spec.js 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-03-17 16:48:39 +01:00
Alexander Friedland
85513f40f1
Update frontend/src/locales/en.json 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-03-17 16:48:14 +01:00
Alexander Friedland
a84c91cbb7
Update frontend/src/locales/de.json 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-03-17 16:48:05 +01:00
Alexander Friedland
5e0864520a
Update frontend/src/locales/de.json 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-03-17 16:47:44 +01:00
Alexander Friedland
6af0d51628
Update frontend/src/components/DecayInformations/CollapseLinksList.spec.js 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-03-17 16:47:35 +01:00
Alexander Friedland
b905235c74
Update frontend/src/components/TransactionLinks/TransactionLink.spec.js 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-03-17 16:46:50 +01:00
Alexander Friedland
7347ed78fb
Update frontend/src/components/TransactionLinks/TransactionLink.vue 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-03-17 16:46:14 +01:00
Alexander Friedland
691ea91eb7
Update frontend/src/components/DecayInformations/CollapseLinksList.spec.js 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-03-17 16:45:36 +01:00
ogerly
06705366ad change decay Object to String 2022-03-17 16:44:06 +01:00
Moriz Wahl
36ea3bf170 test bvModal, fix duplicate Id warning 2022-03-17 13:52:49 +01:00
Moriz Wahl
b84b4e27b4 undo changes in plugin 2022-03-17 13:07:47 +01:00
Moriz Wahl
4c396d7581 define Int as type for args of Ids 2022-03-17 13:03:41 +01:00
Moriz Wahl
6124e0764f datatype Int for Ids 2022-03-17 13:02:50 +01:00
ogerly
97590373cb change modal test 2022-03-17 11:56:11 +01:00
ogerly
05cd05094b test for TransactionLink.vue 2022-03-17 11:33:18 +01:00
ogerly
e9879cf40c test for TransactionLinksSummary.vue 2022-03-17 11:33:18 +01:00
ogerly
8a786d9fb4 remove itemsShown to transactionLinks.length in TransactionLinksSummary 2022-03-17 11:33:18 +01:00
ogerly
4eec006a49 add once data on transactionLink, remove valua.itemsShown 2022-03-17 11:33:18 +01:00
ogerly
96a4413144 remove itemsShown to transactionLinks.length 2022-03-17 11:33:18 +01:00
Moriz Wahl
e8625cb5af remove console log 2022-03-17 11:32:52 +01:00
Moriz Wahl
46389ca2e4 fix test after changing query 2022-03-17 11:22:55 +01:00