9538 Commits

Author SHA1 Message Date
2826f970fb
Merge branch 'master' into frontend_decay_start_block_as_static 2022-04-07 13:02:06 +02:00
5361cc9eb9
corrected correspondign pages 2022-04-07 12:56:01 +02:00
ab3ff9cf4a
removed community from store 2022-04-07 12:55:47 +02:00
751387ee3d
removed frontend community mixin & community query 2022-04-07 12:55:32 +02:00
eaa8858bd3
deployment .env.dist 2022-04-07 12:54:58 +02:00
e400784957
frontend config 2022-04-07 12:54:38 +02:00
Moriz Wahl
01b615d9c1
Merge branch 'master' into fix-elopage-status 2022-04-07 12:27:40 +02:00
ogerly
5883c93549 add locales for ForgotPassword.vue 2022-04-07 11:36:41 +02:00
ogerly
0e84f60841 change locales signin 2022-04-07 11:36:41 +02:00
ogerly
984f6f12c2 add locales for Login.vue 2022-04-07 11:36:41 +02:00
ogerly
85dc2e2fc5 add locales for Auth/Header.vue 2022-04-07 11:36:41 +02:00
ogerly
0d20880d13 add locales for AuthLayout_gdd.vue 2022-04-07 11:36:41 +02:00
Hannes Heine
58093e32b9
Merge branch 'master' into 1637-generate-link-backend 2022-04-07 11:06:39 +02:00
elweyn
f6b9b7664c Add link to mocked return value. 2022-04-07 11:00:29 +02:00
Alexander Friedland
2cdad1b894
Merge branch 'master' into 1633-Display-QR-Code-on-link-in-transaction-list 2022-04-07 10:28:39 +02:00
Alexander Friedland
98ae532d44
Merge branch 'master' into 1668-Admin-make-User-Details-tabbed 2022-04-07 10:27:44 +02:00
Alexander Friedland
865d54043e
Merge branch 'master' into 1682-new-design-for-the-login-and-registration-area 2022-04-07 10:27:28 +02:00
ogerly
cf831ecae5 change scss, remove unused method, change sorting images 2022-04-07 10:23:33 +02:00
ogerly
06892f535f change min width 2022-04-07 10:23:33 +02:00
ogerly
9f39ac883f change images for mobil and remove unused text 2022-04-07 10:23:33 +02:00
ogerly
10bcb93ba3 change style for mobil and middle 2022-04-07 10:23:33 +02:00
ogerly
e0a5d01074 add image background for navbar 2022-04-07 10:23:33 +02:00
ogerly
f3522d250b add font color and gradient-gradido 2022-04-07 10:23:33 +02:00
ogerly
3a95257096 add images for template 2022-04-07 10:23:33 +02:00
ogerly
6e1a86b191 style endphase for logic und function 2022-04-07 10:23:33 +02:00
ogerly
9791f380fa add carousel for desktop version, add images for template style 2022-04-07 10:23:33 +02:00
a5e10c2ed9
Merge pull request #1747 from gradido/jwt_duration_30m
Feature: JWT duration is now 30min by default
2022-04-06 23:02:08 +02:00
97b7ba9db0
Merge branch 'master' into jwt_duration_30m 2022-04-06 19:29:25 +02:00
elweyn
2cc7a6dee6 Fixing tests since we now use link and code. 2022-04-06 19:16:30 +02:00
elweyn
41b35f2c5e Add link to the TransactionLink and change code by link in frontend. 2022-04-06 18:45:27 +02:00
elweyn
d984ff2582 Add COMMUNITY_REDEEM_LINK to the config. 2022-04-06 18:44:19 +02:00
d5d90c7050
remove decayStartBlock from all component interfaces 2022-04-06 15:24:17 +02:00
3582805098
reference config decay start time when figuring out if its the decay start block 2022-04-06 15:23:47 +02:00
ebb6c926d8
define decay start block in config statically 2022-04-06 15:22:57 +02:00
bccc5d1ddb
backend remove startblock from balance object 2022-04-06 15:22:32 +02:00
b15d0b8a61
Merge pull request #1746 from gradido/docu_scope_of_gradido
Docu: Scope of Gradido
2022-04-06 15:06:15 +02:00
aacc5716b0
Merge branch 'master' into docu_scope_of_gradido 2022-04-06 14:55:45 +02:00
Moriz Wahl
37122ee604
Merge branch 'master' into fix-elopage-status 2022-04-06 14:08:51 +02:00
Moriz Wahl
4cca429f89
Merge pull request #1743 from gradido/fix-sending-to-inactivated-user
fix: Check That Recipient User Has Activated Account to Receive Coins
2022-04-06 14:08:35 +02:00
Moriz Wahl
04774300d5
Merge branch 'master' into fix-sending-to-inactivated-user 2022-04-06 13:56:27 +02:00
423aac93a9
new backend config version
corrected backend config field order to match the actual config
2022-04-06 13:56:19 +02:00
Moriz Wahl
39e40f68ae
Merge branch 'master' into fix-elopage-status 2022-04-06 13:56:16 +02:00
0565c0c255
default value for JWT expire is 30m instead of 10m
Read value for JWT expire in `.env.template`
new config version v4
2022-04-06 13:55:49 +02:00
5880df2de0
Merge pull request #1737 from gradido/fix_config_default_reset_password
Fix: Fixed config dist version to properly reflect new password reset url
2022-04-06 12:58:50 +02:00
2b0b5e6e5c
gradido as platform drawio 2022-04-06 12:57:26 +02:00
3d6e236bfe
scope of gradido presentation 2022-04-06 12:57:03 +02:00
elweyn
ff24798767 Add free line after import. 2022-04-06 11:10:09 +02:00
elweyn
54f5a0123f Remove the base url from the frontend. 2022-04-06 11:03:22 +02:00
elweyn
e49892d69c Changed the value of code so that it get's the configured COMMUNITY_URL and redeem/ from the backend. 2022-04-06 10:56:27 +02:00
ogerly
0e988b1491 add tab system from bootstrap 2022-04-06 10:43:10 +02:00