IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-01-20 20:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,079 Commits 1 Branch 0 Tags
Commit Graph

143 Commits

Author SHA1 Message Date
Alexander Friedland
6328500de4
Merge pull request #1048 from gradido/1047-Please-correct-spelling-mistakes 
Spelling error fixed 'Berechnungsformel'
 2021-11-01 16:47:59 +01:00
ogerly
a5c936a491 Spelling error fixed 'Berechnungsformel' 2021-10-27 08:31:45 +02:00
elweyn
4974cfd79a Text changes for german and english. 2021-10-25 09:32:34 +02:00
Alexander Friedland
55c8173223
Merge pull request #970 from gradido/707-Separate-Account-Overview-from-Send-Form 
707 separate account overview and send
 2021-10-22 09:08:55 +02:00
Alexander Friedland
e046926866
Merge pull request #984 from gradido/983-hinweis-auf-gradido-unterstuetzen 
Link to the funding contributions of gradido.net memberships
 2021-10-22 09:07:45 +02:00
ogerly
5a931d62b0 test When no transactions are loaded, fix lint, fix locales 2021-10-21 09:48:03 +02:00
Moriz Wahl
7bc7940b5e Merge branch 'master' into 707-Separate-Account-Overview-from-Send-Form 2021-10-21 02:01:03 +02:00
ogerly
6be4348174 change text 'eingetraten' to 'eingetragen' 2021-10-19 11:56:11 +02:00
Ulf Gebhardt
d05590aa70
fix language registriert 2021-10-15 13:28:24 +02:00
ogerly
5c6804aea7 fix locales 2021-10-15 10:38:06 +02:00
ogerly
c182b71358 ink to the funding contributions of gradido.net memberships 2021-10-15 09:41:52 +02:00
ogerly
907a9fe696 merge master, merge conflict fixed 2021-10-13 16:34:29 +02:00
ogerly
db1124da3f separate pages: overview and send. 
apexcharts library inserted.
example charts created: lienen and bar charts.
example charts inserted
 2021-10-13 16:13:28 +02:00
ogerly
8f42aa60d7 repair branch 707-Separate-Account-Overview-from-Send-Form from 937-Frontend-style-documentation 2021-10-06 09:19:51 +02:00
elweyn
5462e8b606 Merge master in this and resolve merge conflicts. 2021-10-05 08:06:09 +02:00
einhorn_b
fccb5a7715
fix sorting 2021-10-02 13:57:01 +02:00
einhorn_b
2277cc497b
fix locales 2021-10-02 13:57:01 +02:00
ogerly
4ce456d459 changes review, fix lint, fix locales, fix test 2021-09-30 22:57:20 +02:00
ogerly
2065bcbfb7 tests register fix 2021-09-30 09:03:11 +02:00
ogerly
defabccf86 Registration in different communities II 2021-09-29 18:11:03 +02:00
ogerly
173dac51b1 merge master in 803-community-selection-page-of-registration-process-2 2021-09-28 18:41:16 +02:00
Alexander Friedland
3220548ae7
Merge pull request #905 from gradido/902-arranging-the-settings-translations 
Cleaned up locales for settings and adjusted texts in files
 2021-09-28 13:50:21 +02:00
ogerly
f5915d0ada setting changed to settings, remove delete rows 2021-09-28 09:41:07 +02:00
einhornimmond
5eb40c4819
Merge pull request #890 from gradido/login_update_password 
update password check, allow every special char
 2021-09-27 18:02:06 +02:00
ogerly
4dec84321a Cleaned up locales for settings and adjusted texts in files 2021-09-27 15:35:17 +02:00
Moriz Wahl
342649ae1e no white space rule in password 2021-09-27 13:34:58 +02:00
Moriz Wahl
77b5f9939e fix wrong German translation 2021-09-27 12:30:32 +02:00
Moriz Wahl
decf4d5013 implement at least one special char rule for password in frontend 2021-09-27 12:24:19 +02:00
Alexander Friedland
d5ee9c96fb
Merge pull request #815 from gradido/636-Display-of-Decay-in-Transaction-Details 
decay calculation is calculated
 2021-09-24 13:23:18 +02:00
Alexander Friedland
c1f5a425b4
Update en.json 2021-09-24 13:14:51 +02:00
ogerly
05bab6e757 remove formal totale sum 2021-09-24 13:10:04 +02:00
ogerly
4c574c1081 add lacales, fix locales, fix lint 2021-09-24 12:27:39 +02:00
Moriz Wahl
0e61662119 feat: Redirect to Login when JWT has expired 2021-09-23 14:49:30 +02:00
ogerly
57a8a4a117 fix lint and locales 2021-09-23 14:05:37 +02:00
ogerly
ab16f6f16b fix locales 2021-09-23 14:01:04 +02:00
ogerly
691a8c4dad Decay better explained in transactional info 2021-09-23 08:55:45 +02:00
elweyn
3ca200bb96 Added a success message in case where language has been switched. 2021-09-22 12:12:28 +02:00
ogerly
c5c97c0e67 Registration in different communities 2021-09-22 09:51:27 +02:00
Moriz Wahl
ec12a28f81 sort locales 2021-09-16 13:19:49 +02:00
elweyn
123f45c853 Merge branch '531-Newsletter-subscribe-status-change-in-user-profile' into apollo-clicktipp-connector 2021-09-16 12:18:06 +02:00
elweyn
ad1aa402f4 KlickTipp subscribe and unsubscribe, merge master. 2021-09-16 10:38:08 +02:00
ogerly
11384e4060 style fix, locale fix, all settings fix 2021-09-15 15:01:14 +02:00
ogerly
f619a3d1dc add BFormCheckbox switch for edit, fix test for BFormCheckbox switch 2021-09-15 07:28:44 +02:00
ogerly
8e508b7f84 add newsletter UserCard_Newsletter.vue and UserCard_Newsletter.spec.js 2021-09-15 06:22:02 +02:00
ogerly
5dd8444ca2 add newsletter settings 2021-09-14 21:35:52 +02:00
Moriz Wahl
0427a31790 Merge branch 'master' into 557-Switch-language-only-in-user-profile 2021-09-14 14:03:31 +02:00
ogerly
f3fbab8c6b rechtschreibfehler behoben collapse 2021-09-14 10:43:38 +02:00
elweyn
c5a65da94c Implementation of signup to Klicktipp. 2021-09-10 11:45:41 +02:00
ogerly
ebaf9b7a87 add new components selectLanguage and Usercard_Language 2021-09-09 17:28:42 +02:00
elweyn
3c17b7cd60 Added a query to the backend that calls the checkEmail service, added a spinner, and the routes for the new CheckEmail vue. 2021-09-09 11:46:02 +02:00