3109 Commits

Author SHA1 Message Date
Moriz Wahl
87c54592d3 fix undiefined incons, though I do not know why it happened 2021-08-12 15:08:28 +02:00
Moriz Wahl
f174f93879 Merge branch 'master' into review-bugfixed 2021-08-12 14:45:09 +02:00
ogerly
9e3f4af733 fix review 2 pre release 2021-08-12 14:43:52 +02:00
einhornimmond
3a69e79351
Merge pull request #725 from gradido/community_last_decay_missing
update code for correct transactions listening
2021-08-12 14:25:29 +02:00
einhornimmond
582c848599
Merge pull request #724 from gradido/login_change_passwort_reset_link
bugfix: change to new frontend passwort reset
2021-08-12 13:55:19 +02:00
Dario Rekowski on RockPI
a63716f2a5 update code for correct transactions listening 2021-08-12 11:52:02 +00:00
ogerly
8e7ccf973f change margin bottom from decay icon 2021-08-12 12:28:30 +02:00
ogerly
e7967fe146 change startblock infobox text 2021-08-12 12:20:49 +02:00
einhornimmond
c49a55ece0 change passwort reset link to use new frontend 2021-08-12 12:09:57 +02:00
ogerly
151acea108 gdt transaction header change 2021-08-12 11:38:57 +02:00
ogerly
392271011f change style from starting block decay 2021-08-12 09:44:53 +02:00
ogerly
78b1f85d1a Merge branch 'review-bugfixed' of https://github.com/gradido/gradido into review-bugfixed 2021-08-12 09:16:56 +02:00
ogerly
6b4f709326 fix bug tabs bigger, merge gdd-transactionlist to row and col 2021-08-12 09:11:22 +02:00
ogerly
ca70f20b87 Merge branch 'gdd-transactionlist-row-col-system' of https://github.com/gradido/gradido into gdd-transactionlist-row-col-system 2021-08-12 08:52:36 +02:00
ogerly
5caee9e9fc fix change gddTransactionList.vue to row & col fixed, yarn test fixed 2021-08-12 08:52:04 +02:00
Claus-Peter Hübner
4a6dc733a4 #612 future Modul-, Object- and ER-Model 2021-08-12 02:15:04 +02:00
Alexander Friedland
4f964545f1
Merge branch 'master' into review-bugfixed 2021-08-11 22:33:42 +02:00
Alexander Friedland
c1d360fced
Merge branch 'master' into gdd-transactionlist-row-col-system 2021-08-11 22:32:49 +02:00
ogerly
31b1dfb14e gdd transaction list change to row col system 2021-08-11 22:23:51 +02:00
ogerly
f78b5264ef Merge branch 'review-bugfixed' of https://github.com/gradido/gradido into review-bugfixed 2021-08-11 20:20:57 +02:00
ogerly
f6af2fdee1 gdt transaction lust to ROW and COL 2021-08-11 20:17:59 +02:00
Bernd Hueckstaedt
e354e5beb1
Update README.md 2021-08-11 18:53:11 +02:00
Moriz Wahl
f8b0505833 fix test 2021-08-11 18:06:57 +02:00
ogerly
8e1014af7e step4 2021-08-11 17:54:40 +02:00
Moriz Wahl
92549faba4
Merge pull request #716 from gradido/gdt-list-pagination
feat: Add Pagination Buttons to GDT Transaction List
2021-08-11 17:45:59 +02:00
ogerly
f6006cae35 step3 2021-08-11 17:28:20 +02:00
Hannes Heine
57f8ddf7ce Skipping the password and passwordRepeat reset tests. 2021-08-11 17:21:37 +02:00
ogerly
d3b14273e9 step2 2021-08-11 17:13:40 +02:00
Hannes Heine
8f6ab376d0 Register resetForm resets Password and PasswordRepeat. 2021-08-11 17:11:49 +02:00
ogerly
48be1b6cb6 fixed bugs, step 1 2021-08-11 17:01:36 +02:00
Moriz Wahl
1d61c6bee3 set pageSize to 25 2021-08-11 16:41:19 +02:00
Moriz Wahl
c77d5fcaba feat: Add Pagination Buttons to GDT Transaction List 2021-08-11 16:09:36 +02:00
Hannes Heine
8547c72611 Changes due to review. 2021-08-11 15:44:16 +02:00
Hannes Heine
421aba22ff Implementation of the FormUserMail Tests. And review changes. 2021-08-11 15:31:02 +02:00
Alexander Friedland
9cb03befa2
Merge pull request #712 from gradido/708-Last-Item-Transactionlist-AccountOverview-Show-Not-Details
fix bug, change statment from transaction infbox
2021-08-11 14:41:35 +02:00
Alexander Friedland
e4b36ebc1b
Merge pull request #687 from gradido/650-View-for-the-GDT-Transaction-List
650-display of the gdt transactions
2021-08-11 14:32:45 +02:00
einhornimmond
98b2625936
Merge pull request #714 from gradido/extend_name_validation
Login-Server bug fix, allow names with 2 characters also
2021-08-11 14:05:01 +02:00
Hannes Heine
4c0d222a81 Merge branch 'apollo-client' of https://github.com/gradido/gradido into apollo-client 2021-08-11 13:59:32 +02:00
Hannes Heine
14ff40fb17 Rework after review. And store change so that we don't look at first_name and last_name but firstName and lastName 2021-08-11 13:59:24 +02:00
Einhornimmond
15698459f8 generate updated pot file and update po file 2021-08-11 13:41:06 +02:00
einhornimmond
e4c033cfc0 fix test 2021-08-11 13:16:53 +02:00
einhornimmond
39ce3fcc0a put back gdt sum into listTransactions 2021-08-11 13:14:58 +02:00
Dario via Pythagoras
6a9524ef0a allow also names with only 2 characters 2021-08-11 13:08:06 +02:00
ogerly
01b58d5f6b fixed error handling, change reviews fixed 2021-08-11 08:24:52 +02:00
Moriz Wahl
ae1aaa9741 added mocks for store and i18n to fix test 2021-08-10 19:26:07 +02:00
Moriz Wahl
8e9a95d78c remove communityAPI 2021-08-10 19:17:17 +02:00
Moriz Wahl
0b86820060 set gdtBalance again by transactionList API call 2021-08-10 18:13:09 +02:00
Hannes Heine
8674e34e59 Changed the checkUsername methode of the loginAPI to the checkUsername query from apollo. 2021-08-10 16:50:05 +02:00
Moriz Wahl
b5e06dc681 move API call for Gdt Transactions into GdtTransactionList 2021-08-10 16:50:05 +02:00
Hannes Heine
ef69683cbb Added the checkUsername query. 2021-08-10 16:49:19 +02:00