jjimenezgarcia
|
4323b438c7
|
Merge branch 'master' into amount-is-negative-sending-gdd
|
2022-11-09 10:20:25 +01:00 |
|
Alexander Friedland
|
339d3f1714
|
Merge pull request #2309 from gradido/2303-Allow-the-admin-to-edit-automatic-contribution-link
feat(admin): edit automatic contribution link
|
2022-11-09 09:49:05 +01:00 |
|
Hannes Heine
|
e57e8120b7
|
Merge branch 'master' into 2272-send-email-for-rejected-contributions
|
2022-11-09 09:28:24 +01:00 |
|
Hannes Heine
|
7d26669f99
|
Update backend/src/graphql/resolver/AdminResolver.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
|
2022-11-09 09:28:07 +01:00 |
|
ogerly
|
b302abf29f
|
+Merge branch 'master' into 2290-New-Design
|
2022-11-09 09:23:07 +01:00 |
|
Alexander Friedland
|
065a01c83a
|
Merge branch 'master' into 2303-Allow-the-admin-to-edit-automatic-contribution-link
|
2022-11-08 14:12:56 +01:00 |
|
Alexander Friedland
|
c6ab14434c
|
Update admin/src/locales/en.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-11-08 14:12:42 +01:00 |
|
Alexander Friedland
|
864a24ee59
|
Update admin/src/locales/de.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-11-08 14:12:15 +01:00 |
|
Alexander Friedland
|
b6e0a13675
|
Update admin/src/locales/en.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-11-08 14:11:59 +01:00 |
|
Alexander Friedland
|
1cdfd33e99
|
Update admin/src/locales/de.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-11-08 14:11:51 +01:00 |
|
Alexander Friedland
|
7f090acdb5
|
Update admin/src/components/ContributionLink/ContributionLinkForm.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-11-08 14:11:42 +01:00 |
|
jjimenezgarcia
|
02413ae0bb
|
Merge pull request #2308 from gradido/logger-error-cleaning-history
refactor(backend): fix logger mocks
|
2022-11-08 13:42:04 +01:00 |
|
joseji
|
73ced2291e
|
database migration added
|
2022-11-08 13:41:33 +01:00 |
|
jjimenezgarcia
|
5606c80057
|
Merge branch 'master' into logger-error-cleaning-history
|
2022-11-08 13:25:16 +01:00 |
|
joseji
|
d11d587989
|
negative sign removed
|
2022-11-08 12:47:17 +01:00 |
|
Hannes Heine
|
1a799f3020
|
Merge branch 'master' into 2272-send-email-for-rejected-contributions
|
2022-11-08 12:05:54 +01:00 |
|
|
|
9633b31735
|
Merge branch 'master' into fix_docker_file_descriptions
|
2022-11-08 00:57:48 +01:00 |
|
Moriz Wahl
|
2e92af26a6
|
Merge pull request #2330 from gradido/fix-update-admin-contribution-updates-list
fix(admin): update contribution list after admin updates contribution
|
2022-11-07 18:02:49 +01:00 |
|
Moriz Wahl
|
80792d830f
|
Merge branch 'master' into fix-update-admin-contribution-updates-list
|
2022-11-07 17:39:29 +01:00 |
|
mahula
|
28f92388b7
|
Merge pull request #2350 from gradido/2344-bug-inconsistent-labeling-on-login-register
fix(frontend): inconsistent labeling on login register
|
2022-11-07 17:38:06 +01:00 |
|
Moriz Wahl
|
88167ec261
|
Merge branch 'master' into fix-update-admin-contribution-updates-list
|
2022-11-07 17:37:27 +01:00 |
|
mahula
|
aa3b575061
|
Locales: change English texts for sign in elements
|
2022-11-07 15:50:46 +01:00 |
|
mahula
|
d04ad9356c
|
Locales: change German text for login button
|
2022-11-07 15:47:10 +01:00 |
|
mahula
|
7f9643c770
|
Merge branch 'master' into 2343-feature-gradido-is-free-worldwide-on-startpage-slider
|
2022-11-07 14:46:47 +01:00 |
|
mahula
|
7e57c7d155
|
move the information about GRadido being free to the auth layout
|
2022-11-07 14:22:07 +01:00 |
|
Moriz Wahl
|
ff5a301a38
|
Merge pull request #1874 from gradido/setup-hyperswarm
feat(backend): setup hyperswarm
|
2022-11-07 13:30:18 +01:00 |
|
Moriz Wahl
|
6d1224d7c5
|
Merge branch 'master' into setup-hyperswarm
|
2022-11-07 13:17:26 +01:00 |
|
Moriz Wahl
|
7efd2ffca3
|
linting, etc.
|
2022-11-07 13:16:22 +01:00 |
|
|
|
3aaa3e9d7c
|
fix dockerfile descriptions
|
2022-11-07 12:47:06 +01:00 |
|
Moriz Wahl
|
8aac319895
|
move DHT connection into main
|
2022-11-07 12:45:44 +01:00 |
|
Moriz Wahl
|
51cc3164b2
|
use logger instead of console
|
2022-11-07 12:27:43 +01:00 |
|
Moriz Wahl
|
9ec586c885
|
correct variable name
|
2022-11-07 12:27:23 +01:00 |
|
|
|
4c6da8f4d4
|
Merge pull request #2338 from gradido/semantic_pullrequests
feat(other): lint pull request workflow
|
2022-11-07 12:23:30 +01:00 |
|
|
|
d1eff049af
|
Merge branch 'master' into semantic_pullrequests
|
2022-11-07 12:03:10 +01:00 |
|
|
|
48285429d4
|
Update .github/workflows/lint_pr.yml
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
|
2022-11-07 12:02:50 +01:00 |
|
Hannes Heine
|
b6ead757a2
|
Merge pull request #2237 from gradido/2140-add-updated-at-to-contributions
Feature: 🍰 add updated at to contributions
|
2022-11-07 12:02:36 +01:00 |
|
Moriz Wahl
|
c3b72f40a0
|
Merge branch 'master' into fix-update-admin-contribution-updates-list
|
2022-11-07 11:44:53 +01:00 |
|
|
|
6ce068c007
|
Merge branch 'master' into semantic_pullrequests
|
2022-11-07 11:38:54 +01:00 |
|
elweyn
|
c79d186a45
|
Log error when contribution is in the wrong state. Write full content in changeMessage.
|
2022-11-07 10:32:26 +01:00 |
|
Hannes Heine
|
b98e8edd42
|
Merge branch 'master' into 2140-add-updated-at-to-contributions
|
2022-11-07 10:21:33 +01:00 |
|
Hannes Heine
|
bb5b5fe739
|
Merge branch 'master' into 2272-send-email-for-rejected-contributions
|
2022-11-07 10:19:18 +01:00 |
|
elweyn
|
c2fc4feb6a
|
Call method to send Email if contribution is rejected.
|
2022-11-07 10:11:14 +01:00 |
|
elweyn
|
225119c8ab
|
Test that the email is build correctly.
|
2022-11-07 10:10:28 +01:00 |
|
elweyn
|
0192a45346
|
Build and send email for rejected contributions.
|
2022-11-07 10:09:49 +01:00 |
|
elweyn
|
d092bd0068
|
German email template for rejected contributions.
|
2022-11-07 10:08:23 +01:00 |
|
ogerly
|
47415e3195
|
refactor grid ride side system
|
2022-11-04 18:13:23 +01:00 |
|
mahula
|
3145571727
|
Merge pull request #2336 from gradido/2321-refactor-github-test-workflow-disable-video-recording-and-reduce-wait-time
Refactor: GitHub test workflow - disable video recording and reduce wait time
|
2022-11-04 14:21:47 +01:00 |
|
mahula
|
5297ffaf40
|
Merge branch 'master' into 2321-refactor-github-test-workflow-disable-video-recording-and-reduce-wait-time
|
2022-11-04 14:08:56 +01:00 |
|
clauspeterhuebner
|
a460bbef20
|
Merge pull request #2289 from gradido/2274-feature-concept-manuel-user-registration-for-admins
2274 feature concept manuel user registration for admins
|
2022-11-04 14:06:14 +01:00 |
|
mahula
|
ceedc49063
|
Merge branch 'master' into 2321-refactor-github-test-workflow-disable-video-recording-and-reduce-wait-time
|
2022-11-04 13:43:47 +01:00 |
|
