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
2,526 Commits 1 Branch 0 Tags
Commit Graph

2526 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dario Rekowski on RockPI
ac3677e9ad update tests 2021-06-29 08:58:36 +00:00
Dario Rekowski on RockPI
08f1aefcf5 return also start_date and end_date timestamp for decay calculation 2021-06-29 08:58:24 +00:00
Dario Rekowski on RockPI
ee67f60652 fix test again 2021-06-28 09:34:44 +00:00
Dario Rekowski on RockPI
257b1af23f update tests to contain decay 2021-06-28 09:27:34 +00:00
Dario Rekowski on RockPI
8b466fea2d fix bug with decay 2021-06-28 09:10:48 +00:00
einhornimmond
bdf1638e79
Merge pull request #483 from gradido/community_decay_inside 
move decay between transactions into the transactions
 2021-06-25 11:42:39 +02:00
Dario Rekowski on RockPI
9a6a3adf76 fix test 2021-06-23 11:14:29 +00:00
Dario Rekowski on RockPI
f9ee57a858 remove second decay by creation transaction, update old data set 2021-06-23 11:00:50 +00:00
Dario Rekowski on RockPI
aa459580b9 Merge branch 'master' into community_decay_inside 2021-06-23 09:36:45 +00:00
einhornimmond
a8fc2f6fb3
Merge pull request #581 from gradido/release_1.1.1 
release
 2021-06-22 14:03:40 +02:00
einhorn_b
75483f0db6 release 2021-06-22 12:48:40 +02:00
einhornimmond
83b67fc16b
Merge pull request #580 from gradido/auto_deploy 
Auto deploy
 2021-06-22 12:42:05 +02:00
einhornimmond
82293132d2
Merge pull request #574 from gradido/community_update_transfer_email 
update transfer email text
 2021-06-22 12:41:52 +02:00
einhornimmond
8561265083 again 2021-06-22 12:08:08 +02:00
einhornimmond
dacd3b10c9 fix warnings again 2021-06-22 11:58:01 +02:00
einhornimmond
0caf10ec33
Merge pull request #576 from gradido/login_fix_user_search_bug 
update mysql because tuple has changed
 2021-06-22 11:33:37 +02:00
einhornimmond
265ff8c63b
Merge pull request #578 from gradido/login_fix_pending_transactions 
Login fix pending transactions
 2021-06-22 11:31:53 +02:00
einhornimmond
7a20ebcd9d fix warnings 2021-06-22 11:23:36 +02:00
einhornimmond
7b07088a6a fix test 2021-06-22 11:22:04 +02:00
Dario Rekowski on RockPI
80d8ea5041 update test, fields change order 2021-06-22 08:58:18 +00:00
staging new
ac249b4683 use standard path. add nginx example 2021-06-22 10:46:04 +02:00
staging new
f49cf4d7f8 add autodeploy bash scripts 2021-06-22 10:35:47 +02:00
Dario Rekowski on RockPI
6756419855 Merge branch 'master' into community_decay_inside 2021-06-22 07:07:59 +00:00
einhornimmond
66acf96a7e remove transaction also from pending task manager if aborted through old interface 2021-06-21 13:24:11 +02:00
einhornimmond
0d4b1cb1c6 remove transaction after sending not only form Pending Task Manager, but also from pending_tasks table 2021-06-21 13:16:30 +02:00
einhornimmond
630d667e99 add test to prevent bug in future 2021-06-21 12:41:02 +02:00
einhornimmond
730f6541c7 update mysql because tuple has changed 2021-06-21 11:58:36 +02:00
Dario Rekowski on RockPI
44a353398e update email transfer text 2021-06-21 09:31:28 +00:00
Moriz Wahl
bade847619
Merge pull request #573 from gradido/login_msg_update_user_info 
add first error additional as msg
 2021-06-17 15:21:37 +02:00
Moriz Wahl
1b6e4138ef v1.1.0 2021-06-17 15:13:18 +02:00
Moriz Wahl
0d356e1120
Merge pull request #572 from gradido/no-k-divider 
fix: Remove Grouping for Max Error
 2021-06-17 15:03:22 +02:00
einhornimmond
60f24f9e18 add first error additional as msg 2021-06-17 14:51:14 +02:00
Moriz Wahl
6754b999ef fix: Remove Grouping for Max Error 2021-06-17 14:41:21 +02:00
Moriz Wahl
6872f1cf01
Merge pull request #571 from gradido/fix-API-call-reset-password 
fix: API Call for Reset Password
 2021-06-17 14:14:44 +02:00
Moriz Wahl
55a8ac20ee fix: API Call for Reset Password 2021-06-17 13:47:27 +02:00
einhornimmond
b16af1799b
Merge pull request #570 from gradido/login_reset_password 
Login reset password
 2021-06-17 13:31:00 +02:00
Moriz Wahl
d9720dcd05 Merge branch 'login_reset_password' of github.com:gradido/gradido into login_reset_password 2021-06-17 13:17:35 +02:00
Moriz Wahl
56153893e8 change frorntend for new API call 2021-06-17 13:17:04 +02:00
einhornimmond
024f38fa5f remove ip check for reset password 2021-06-17 13:09:29 +02:00
einhornimmond
5078d80862 fix test 2021-06-17 12:40:04 +02:00
einhornimmond
551111e7a1 try again removed test 2021-06-17 12:21:41 +02:00
einhornimmond
2c29c20d8f adjust test for allow all password setting 2021-06-17 12:11:20 +02:00
einhornimmond
2a3677f767 little things 2021-06-17 11:59:31 +02:00
einhornimmond
53ebc4be4c Merge branch 'master' into login_reset_password 2021-06-17 11:48:37 +02:00
einhornimmond
cba03dba09 add test, fix errors 2021-06-17 11:48:05 +02:00
Alexander Friedland
03dab64566
Merge pull request #566 from gradido/hide-unuse-components-in-profil 
Hide unuse components in profil
 2021-06-17 09:07:53 +02:00
Moriz Wahl
e33f342beb
Merge pull request #567 from gradido/fix-amount-bug 
fix: Thousend Dividers on GDD Send Amount Field
 2021-06-16 20:47:14 +02:00
einhornimmond
fdf70505f6 add docu 2021-06-16 17:58:17 +02:00
einhornimmond
8190dcc6af ddd password reset as separat json function 2021-06-16 17:55:48 +02:00
Moriz Wahl
a28526b130 do not show thousend dividers on gdd send amount field 2021-06-16 17:17:04 +02:00