3313 Commits

Author SHA1 Message Date
mahula
f0189819de
Merge branch 'master' into 2473-feature-emails-further-design-of-html-emails 2023-06-08 08:26:29 +02:00
8545b2b9c5
fix import properly 2023-06-06 13:06:24 +02:00
c2a3208849
import random-biginto properly 2023-06-06 12:50:33 +02:00
Claus-Peter Huebner
fbb7238aba Merge remote-tracking branch 'origin/master' into 2946-feature-x-com-3-introduce-business-communities 2023-05-25 11:54:10 +02:00
Moriz Wahl
b67fbaea3c
Merge branch 'master' into remove-issued-to-do 2023-05-25 10:19:11 +02:00
Claus-Peter Huebner
7d5b8b9b62 additional test with matching pubKey 2023-05-25 01:52:42 +02:00
Claus-Peter Huebner
fc822332dc shift query in 1_0-directory 2023-05-25 01:52:07 +02:00
Claus-Peter Huebner
afce40bd7f remove file based versioning clients 2023-05-25 00:27:45 +02:00
Claus-Peter Huebner
a6e9678b39 Merge remote-tracking branch 'origin/master' into
2946-feature-x-com-3-introduce-business-communities
2023-05-24 23:58:48 +02:00
0ce4042864
more camelcase exceptions 2023-05-23 11:30:49 +02:00
ade05101e2
configure camelcase exceptions 2023-05-23 11:30:18 +02:00
6d405c43c5
rename Client to FederationClient and remove camelcase eslint exceptions 2023-05-23 11:25:44 +02:00
Claus-Peter Huebner
4458ce952b increase testings 2023-05-22 23:45:34 +02:00
Claus-Peter Huebner
b752012749 rename versioned client 2023-05-22 22:46:29 +02:00
Moriz Wahl
d417bb41e8 refactor(backend): remove to do after creating issue 2023-05-22 12:27:02 +02:00
Claus-Peter Huebner
529a7018ba Merge remote-tracking branch 'origin/master' into 2946-feature-x-com-3-introduce-business-communities 2023-05-19 17:20:02 +02:00
elweyn
cfb0d7a61a Remove jsonstringify. 2023-05-19 16:09:17 +02:00
elweyn
5de921f4f3 Update logging. 2023-05-19 16:06:23 +02:00
elweyn
81754449e9 Removed commented code, implemented Singleton. 2023-05-19 15:55:29 +02:00
Claus-Peter Huebner
2439663ea4 revert client versioning back to directory based as decided with moritz
and hannes
2023-05-19 15:53:26 +02:00
Hannes Heine
471a746005
Merge branch 'master' into 2878-trigger-export-klicktipp 2023-05-19 15:32:57 +02:00
elweyn
39fde59e59 Fix tests to previous changes. 2023-05-19 15:32:15 +02:00
elweyn
b4a50dbcda Fix tests to the changes that were made. 2023-05-19 15:20:19 +02:00
elweyn
c1a086ea57 Fix content type. 2023-05-19 14:56:50 +02:00
elweyn
7727eec05f Fix header logo, and social media icons. 2023-05-19 14:38:01 +02:00
elweyn
5abc03baf1 Change font size of the body. 2023-05-19 12:03:41 +02:00
elweyn
54100c6245 Correct some layouting, and some textes. 2023-05-19 11:44:29 +02:00
elweyn
5d4d424ef1 Remove unused variable. 2023-05-19 09:34:32 +02:00
elweyn
e77385e27d Merge branch '2473-feature-emails-further-design-of-html-emails' of https://github.com/gradido/gradido into 2473-feature-emails-further-design-of-html-emails 2023-05-19 09:20:18 +02:00
elweyn
f4c19117b4 Change test from string tests to snapshots. 2023-05-19 09:20:09 +02:00
Hannes Heine
8978e73392
Merge branch 'master' into 2473-feature-emails-further-design-of-html-emails 2023-05-19 09:18:58 +02:00
elweyn
ca25be61da Add 15px bottom of p-content. 2023-05-17 18:01:36 +02:00
elweyn
89d72de59d Change display table to block. 2023-05-17 17:57:24 +02:00
Moriz Wahl
ee93c5e2b1
Merge branch 'master' into send-coins-via-alias 2023-05-17 16:25:00 +02:00
Moriz Wahl
85bfcd9df3 constants to upper case 2023-05-17 16:24:05 +02:00
elweyn
02e271ac5a Change content display to block margin and padding 2023-05-17 16:16:01 +02:00
elweyn
b82bad3a1f Correct margin of content. 2023-05-17 15:54:00 +02:00
elweyn
5cf067de7d Change on css 2023-05-17 15:42:00 +02:00
elweyn
6796c1a6b9 Merge branch 'master' into 2473-feature-emails-further-design-of-html-emails 2023-05-17 15:18:28 +02:00
97ed8df148
Merge branch 'master' into replace-jasonwebtoken-with-jose 2023-05-17 13:56:03 +02:00
ogerly
6e55acef7f superfluous code removed, code optimised 2023-05-17 08:36:02 +02:00
elweyn
76290e5c81 Correct linting. 2023-05-16 18:53:50 +02:00
Moriz Wahl
b2a5f09df7 get things working, hurray 2023-05-16 18:09:14 +02:00
Moriz Wahl
9959a69693 Merge branch '2878-trigger-export-klicktipp' of github.com:gradido/gradido into 2878-trigger-export-klicktipp 2023-05-16 16:47:46 +02:00
Moriz Wahl
2ce14d1a89 refactor connection logic 2023-05-16 16:38:59 +02:00
elweyn
fb0f106948 Merge branch '2878-trigger-export-klicktipp' of https://github.com/gradido/gradido into 2878-trigger-export-klicktipp 2023-05-16 16:18:17 +02:00
Hannes Heine
013ea81614
Merge branch 'master' into 2878-trigger-export-klicktipp 2023-05-16 14:15:29 +02:00
Moriz Wahl
1fbebddd71 more tests for transactions and finding users by different identifiers 2023-05-16 05:00:06 +02:00
Moriz Wahl
2e865c6744 test send coins via alias 2023-05-16 04:38:19 +02:00
Moriz Wahl
6aa8ae9bf4 feat(backend): send coins via alias 2023-05-16 04:02:26 +02:00