1964 Commits

Author SHA1 Message Date
Dario Rekowski on RockPI
2417cfa6ee add Ulfs suggestion 2021-05-11 09:42:51 +00:00
Dario Rekowski on RockPI
4733944f2f fix bug in merged code 2021-05-10 18:57:10 +00:00
einhornimmond
f8e8b6e56e ignore netbeans project files 2021-05-10 20:17:10 +02:00
einhornimmond
cbf96299ce Merge branch 'master' into community_start_decay 2021-05-10 20:16:37 +02:00
einhornimmond
2dff5bdf31 update docu 2021-05-10 20:14:14 +02:00
Dario Rekowski on RockPI
be26bf2758 tested and fixed bugs, update api docu 2021-05-10 17:59:34 +00:00
Alexander Friedland
98655a2703
Merge pull request #383 from gradido/350-6-Login
350 6 login
2021-05-10 18:01:45 +02:00
Dario Rekowski on RockPI
394bfb71ef add missing template updates 2021-05-10 15:38:14 +00:00
Dario Rekowski on RockPI
a22593925a more migrations 2021-05-10 15:37:39 +00:00
Dario Rekowski on RockPI
d9d78d1539 fill migration controller, update some other functions to using same result format 2021-05-10 15:21:02 +00:00
ogerly
44856c7f3a Fix: Error message must disappear when retrying (for a moment if unsuccessful again) 2021-05-10 17:05:52 +02:00
ogerly
52ee6a1891 Fix: Login: Error message cannot be closed 2021-05-10 17:01:43 +02:00
Dario Rekowski on RockPI
40a9a8c2b5 add migrations table for automatic table data migration 2021-05-10 14:14:48 +00:00
Dario Rekowski on RockPI
b29c391626 ignore skeema local config files from now on 2021-05-10 14:13:21 +00:00
Dario Rekowski on RockPI
5ed7b3e416 implement decay from start decay block
;
2021-05-10 14:12:03 +00:00
Alexander Friedland
11621e7f16
Merge pull request #375 from gradido/350-2-No-message-breaks-the-layout
fix: breakout error
2021-05-10 16:11:50 +02:00
Alexander Friedland
91fe6985b8
Merge pull request #343 from gradido/233-Support-Button
233-Support-Button fix, and col error fix
2021-05-10 16:10:37 +02:00
Alexander Friedland
ac1c50a10b
Merge pull request #370 from gradido/350-1-Menu-Member-areas-should-be-opened-in-a-new-tab
fix: membersarea open in a new tap
2021-05-10 15:27:25 +02:00
Alexander Friedland
4565f5d1af
Update frontend/src/views/Pages/AccountOverview/GddSend.vue
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2021-05-10 14:49:20 +02:00
ogerly
e609d1f0a7 fix: breakout error 2021-05-10 13:35:57 +02:00
ogerly
5e03625e71 fix: membersarea open in a new tap 2021-05-10 13:03:34 +02:00
Alexander Friedland
bb7febc938
Merge pull request #345 from gradido/00x-table-footer-componente
00x table footer componente
2021-05-10 12:42:08 +02:00
Alexander Friedland
fec6006a75
Merge pull request #364 from gradido/351-Show-Passwort-only-clickable-on-icon
clickevent from icon to button
2021-05-10 12:41:08 +02:00
Alexander Friedland
b49b5b3577
Merge pull request #366 from gradido/01x-404-link-to-login
404 link to login page fix
2021-05-10 12:40:52 +02:00
ogerly
8be81b19ec tests from support link en and de 2021-05-10 12:39:04 +02:00
Moriz Wahl
359af723eb
Merge pull request #365 from gradido/fix-session-id-name
bug: session_id vs sessionId
2021-05-10 12:18:55 +02:00
ogerly
bdbdad6c69 404 link to login page fix 2021-05-10 12:18:12 +02:00
Moriz Wahl
d70241e4d2 all session_id are sessionId now 2021-05-10 11:57:45 +02:00
ogerly
2d5ee2ffd1 clickevent from icon to button 2021-05-10 11:43:13 +02:00
ogerly
7bd8c5f7e5 fix lint 2021-05-10 11:25:56 +02:00
ogerly
6ca0ca7047 fix lint 2021-05-10 10:58:46 +02:00
ogerly
b19b870930 fix extra table-transactions footer merge 2021-05-10 10:56:21 +02:00
ogerly
4f62216d59 Merge branch 'master' of https://github.com/gradido/gradido into 00x-table-footer-componente 2021-05-10 10:51:10 +02:00
ogerly
a21e5676bc fix extra table-transactions footer 2021-05-10 10:49:49 +02:00
d427ddfd8e
Merge pull request #344 from gradido/eslint_standard
eslint rule standard
2021-05-07 16:54:41 +02:00
einhornimmond
15c742e622
Merge pull request #329 from gradido/community_0_decay_transaction
don't show decays smaller than 0,01 GDD
2021-05-07 13:31:42 +02:00
einhornimmond
a5a8a30955 remove unneccessary intval 2021-05-07 13:06:03 +02:00
einhornimmond
d3c4c4e7aa add lost update, prevent also showing negative decay 2021-05-07 13:04:26 +02:00
Moriz Wahl
308fec9d90 Merge branch 'master' into eslint_standard 2021-05-07 13:01:55 +02:00
Moriz Wahl
5c862bbb16 fix test of store 2021-05-07 12:39:46 +02:00
einhornimmond
5dd0d473db Merge branch 'master' into community_0_decay_transaction 2021-05-07 12:33:00 +02:00
Alexander Friedland
c9604135c1
change 2021-05-07 12:13:30 +02:00
Moriz Wahl
bfb652864c eslint standard rules implemented 2021-05-07 11:59:43 +02:00
Alexander Friedland
8d345657ed
Merge pull request #341 from gradido/338-Layout-Broken
338 - mt-5 margin top 5 eingebunden
2021-05-07 11:44:13 +02:00
Alexander Friedland
4fe1826f2a
change nav-link 2021-05-07 11:41:37 +02:00
ogerly
8260d844fb Merge remote-tracking branch 'origin/master' into 00x-table-footer-componente 2021-05-07 11:19:12 +02:00
ogerly
7f24bc0673 befor merge master 2021-05-07 11:18:02 +02:00
Moriz Wahl
7f38c80121 update yarn.lock after running yarn install 2021-05-07 11:12:54 +02:00
264c1a6f59
eslint rule standard 2021-05-07 11:06:16 +02:00
Moriz Wahl
aefbbeaab1
Merge pull request #339 from gradido/update-transactions
feat: Update Transactions When GddTable Is Rendered
2021-05-07 10:58:56 +02:00