joseji
|
ac6b8e666f
|
encryption interface
|
2022-11-09 10:46:01 +01:00 |
|
joseji
|
73ced2291e
|
database migration added
|
2022-11-08 13:41:33 +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 |
|
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 |
|
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 |
|
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 |
|
|
|
070c58987c
|
remove github from scope list
|
2022-11-04 13:01:28 +01:00 |
|
|
|
ece96e1933
|
include all prs
|
2022-11-04 12:57:15 +01:00 |
|
|
|
5027f2030e
|
fix
|
2022-11-04 12:54:55 +01:00 |
|
|
|
882e8b5304
|
lint_pr workflow
|
2022-11-04 12:53:29 +01:00 |
|
mahula
|
668546e49f
|
github workflow: remove branch specific trigger
|
2022-11-04 12:19:36 +01:00 |
|
mahula
|
dbdb0f4221
|
github workflow: set nginx building job after jobs for frontend, backend, and admin interface
|
2022-11-04 11:19:49 +01:00 |
|
mahula
|
958b681e94
|
github workflow: reuse system images build in previuos jobs
|
2022-11-04 11:12:44 +01:00 |
|
mahula
|
ece9e21aaf
|
github workflow: restructure system boot uo steps and reduce wait time
|
2022-11-04 11:10:50 +01:00 |
|
mahula
|
0a02a96885
|
github workflow: set reqiured image names in docker-compose.test.yml
|
2022-11-04 11:01:20 +01:00 |
|
Moriz Wahl
|
2e070cef7b
|
remove stupid comments
|
2022-11-03 20:05:57 +01:00 |
|
Moriz Wahl
|
2746c4718a
|
test apollo client with apollo client mock library
|
2022-11-03 19:53:24 +01:00 |
|
clauspeterhuebner
|
70c5104e0c
|
Merge branch 'master' into 2274-feature-concept-manuel-user-registration-for-admins
|
2022-11-03 14:49:55 +01:00 |
|
Moriz Wahl
|
a8247da3d4
|
use apollo correctly
|
2022-11-03 14:24:09 +01:00 |
|
Moriz Wahl
|
0ba82d66fe
|
fix: Update Contribution List after Admin Updates Contribution
|
2022-11-03 13:01:02 +01:00 |
|
Hannes Heine
|
fb92cf9ed6
|
Merge branch 'master' into 2140-add-updated-at-to-contributions
|
2022-11-03 09:45:09 +01:00 |
|
elweyn
|
b3fd53ab7a
|
Change the display of the history message.
|
2022-11-03 08:35:26 +01:00 |
|
clauspeterhuebner
|
1bdb41f3a2
|
Merge pull request #2252 from gradido/1574-Concept_to_introduce_Gradido-ID
1574 concept to introduce gradidoID and change password encryption
|
2022-11-02 22:52:24 +01:00 |
|
clauspeterhuebner
|
64fb98de4a
|
Merge branch 'master' into 1574-Concept_to_introduce_Gradido-ID
|
2022-11-02 22:39:18 +01:00 |
|
Claus-Peter Hübner
|
c4ccc02828
|
finished
|
2022-11-02 22:24:27 +01:00 |
|
Claus-Peter Hübner
|
0a70a1f047
|
Merge branch '2274-feature-concept-manuel-user-registration-for-admins' of github.com:gradido/gradido into 2274-feature-concept-manuel-user-registration-for-admins
|
2022-11-02 18:47:07 +01:00 |
|
Claus-Peter Hübner
|
dba98e316d
|
Merge remote-tracking branch 'origin/master' into 2274-feature-concept-manuel-user-registration-for-admins
|
2022-11-02 18:45:38 +01:00 |
|
mahula
|
d2f80e27c4
|
github workflow: restructure e2e steps for runtime reduction
|
2022-11-02 17:36:40 +01:00 |
|
clauspeterhuebner
|
694963c2e1
|
Merge pull request #2241 from gradido/2224-feature-concept-extend-contributionlink-rules-and-logic-abraham
contributionlink stage-2 and stage-3 of capturing and activation
|
2022-11-02 16:36:02 +01:00 |
|
clauspeterhuebner
|
3e530dc2ef
|
Merge branch 'master' into 2224-feature-concept-extend-contributionlink-rules-and-logic-abraham
|
2022-11-02 14:45:02 +01:00 |
|
