13260 Commits

Author SHA1 Message Date
4d19ce06b5
fix test 2023-03-09 15:18:51 +01:00
Claus-Peter Hübner
57008e3355 Merge branch '2630-feature-federation-implement-a-graphql-endpoint-for-request-getpublickey' of github.com:gradido/gradido into 2630-feature-federation-implement-a-graphql-endpoint-for-request-getpublickey 2023-03-09 14:41:19 +01:00
Claus-Peter Hübner
a1e8a4aab2 linting 2023-03-09 14:40:28 +01:00
clauspeterhuebner
aef858d30a
Merge branch 'master' into 2630-feature-federation-implement-a-graphql-endpoint-for-request-getpublickey 2023-03-09 14:26:55 +01:00
Hannes Heine
15e092b428
Merge pull request #2798 from gradido/fix-info-svg
fix(frontend): info.svg
2023-03-09 13:43:55 +01:00
Hannes Heine
e6aecefc26
Merge branch 'master' into fix-info-svg 2023-03-09 13:25:32 +01:00
Hannes Heine
2b6a5829b4
Merge pull request #2795 from gradido/2741-messageCount-listAllContributions
fix(backend): add relation messages to database query
2023-03-09 12:51:28 +01:00
elweyn
34def5fdbf Change info.svg to path 2023-03-09 12:49:12 +01:00
49c83eb768
Merge branch 'master' into 2741-messageCount-listAllContributions 2023-03-09 10:43:38 +01:00
Hannes Heine
364742762f
Merge pull request #2793 from gradido/2787-fix-ui-for-release
fix(admin): header and menu
2023-03-09 07:58:09 +01:00
Hannes Heine
b23aafb507
Merge branch 'master' into 2787-fix-ui-for-release 2023-03-09 07:41:58 +01:00
elweyn
775d29fb68 Add messageCount value to the contributions that got messages, order the objects in the same order as they are found. 2023-03-08 14:29:25 +01:00
elweyn
747c146bbf Add to database query relation messages 2023-03-08 12:33:15 +01:00
elweyn
f8e59352ec Change css style hack to bootstrap 2023-03-08 12:31:17 +01:00
Alexander Friedland
5ea527f6a0
Merge pull request #2774 from gradido/2772-Send-Gradidos-via-linkfirst-Button-must-be-Check-now
fix(frontend): send gdd - change first submit button text to 'Check Now'
2023-03-08 10:57:08 +01:00
Hannes Heine
428f38456c
Merge branch 'master' into 2772-Send-Gradidos-via-linkfirst-Button-must-be-Check-now 2023-03-08 10:19:38 +01:00
Hannes Heine
79f72d923d
Merge pull request #2771 from gradido/BerndHueckstaedt-patch-3
refactor(frontend): creations generated by link NL
2023-03-08 10:18:15 +01:00
Hannes Heine
0f9f559364
Merge branch 'master' into BerndHueckstaedt-patch-3 2023-03-08 09:28:00 +01:00
Hannes Heine
2997536aff
Merge pull request #2770 from gradido/BerndHueckstaedt-patch-2
refactor(frontend): creations generated by link (FR) + (NL)
2023-03-08 09:26:40 +01:00
Hannes Heine
fce74dfeb7
Merge branch 'master' into BerndHueckstaedt-patch-2 2023-03-08 09:12:42 +01:00
Hannes Heine
f3f1a84b9d
Merge pull request #2765 from gradido/BerndHueckstaedt-patch-1
refactor(frontend): update German locales
2023-03-08 09:12:06 +01:00
Hannes Heine
eefae95368
Merge branch 'master' into BerndHueckstaedt-patch-1 2023-03-08 08:44:10 +01:00
Hannes Heine
15626efd31
Update frontend/src/locales/es.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-03-08 08:43:29 +01:00
elweyn
9084f4b11d Remove p-1 from creation tab. 2023-03-08 07:46:20 +01:00
elweyn
2cb179a175 Remove p-3 from navbar. 2023-03-08 07:45:25 +01:00
elweyn
992eb6e89b Add margin-top -7px to navbar brand. 2023-03-08 07:44:43 +01:00
Hannes Heine
e4c9080930
Merge branch 'master' into 2772-Send-Gradidos-via-linkfirst-Button-must-be-Check-now 2023-03-08 06:50:34 +01:00
Claus-Peter Hübner
f442c289c2 next try, but doesn't work 2023-03-07 22:55:23 +01:00
Claus-Peter Hübner
5f04efb86f Merge remote-tracking branch 'origin/master' into 2630-feature-federation-implement-a-graphql-endpoint-for-request-getpublickey 2023-03-07 21:37:50 +01:00
Moriz Wahl
4927147ab9
Merge pull request #2762 from gradido/use-find-contributions-for-list-contributions
refactor(backend): use find contributions helper for list contributions
2023-03-07 17:18:50 +01:00
Moriz Wahl
bb1f247126
Merge branch 'master' into use-find-contributions-for-list-contributions 2023-03-07 17:03:22 +01:00
Hannes Heine
3451f04f9b
Merge pull request #2786 from gradido/v_1_19_0
chore(release): version 1.19.0
2023-03-07 14:33:47 +01:00
elweyn
d00bfec5a6 Set new release version. 2023-03-07 14:15:17 +01:00
Claus-Peter Hübner
c71e293e67 next try for test 2023-03-07 03:48:43 +01:00
Claus-Peter Hübner
46831167bc new testclass 2023-03-07 01:14:18 +01:00
Claus-Peter Hübner
abcad503b0 optimize log-output 2023-03-06 22:40:41 +01:00
Claus-Peter Hübner
e42f42c034 Merge remote-tracking branch 'origin/2730-devops-add-federation-modul-to-deployment-scripts' into 2630-feature-federation-implement-a-graphql-endpoint-for-request-getpublickey 2023-03-06 22:05:33 +01:00
Claus-Peter Hübner
1b265bd99e Merge remote-tracking branch 'origin/master' into 2630-feature-federation-implement-a-graphql-endpoint-for-request-getpublickey 2023-03-06 22:04:42 +01:00
Claus-Peter Hübner
dc864b964f Merge remote-tracking branch 'origin/master' into 2730-devops-add-federation-modul-to-deployment-scripts 2023-03-06 21:57:29 +01:00
Claus-Peter Hübner
8b64fb810a rework PR-comments 2023-03-06 21:56:40 +01:00
Moriz Wahl
cdadb332e2
Merge branch 'master' into use-find-contributions-for-list-contributions 2023-03-06 18:52:38 +01:00
mahula
3d9909b98e
Merge pull request #2731 from gradido/2709-the-bell-symbol-must-appear-text
fix(frontend): change contribution design
2023-03-06 17:19:51 +01:00
mahula
6f0f4e41a3
Merge branch 'master' into 2709-the-bell-symbol-must-appear-text 2023-03-06 16:59:38 +01:00
Moriz Wahl
12f4e9fda1
Merge branch 'master' into use-find-contributions-for-list-contributions 2023-03-06 16:47:18 +01:00
Claus-Peter Hübner
569b3e0d7d rework PR-comments 2023-03-06 16:08:59 +01:00
Claus-Peter Hübner
0c69fb9891 Merge branch '2730-devops-add-federation-modul-to-deployment-scripts' of github.com:gradido/gradido into 2730-devops-add-federation-modul-to-deployment-scripts 2023-03-06 15:11:03 +01:00
Claus-Peter Hübner
f3367825e1 Merge remote-tracking branch 'origin/master' into 2730-devops-add-federation-modul-to-deployment-scripts 2023-03-06 15:09:57 +01:00
Claus-Peter Hübner
ee728ffd79 remove 'hex' at comparing the publicKey 2023-03-06 15:08:00 +01:00
clauspeterhuebner
53566cc8c5
Update deployment/bare_metal/start.sh
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2023-03-06 14:46:32 +01:00
clauspeterhuebner
5fbf8613c5
Update deployment/bare_metal/start.sh
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2023-03-06 14:45:47 +01:00