8111 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alexander Friedland	c28b4eabbb	Merge branch 'master' into 1813-QR-Code-Popup	2022-04-22 12:44:30 +02:00
clauspeterhuebner	7614e768fa	Merge pull request #1822 from gradido/fix_windows_cross-env ... Fix: cross-env for windows	2022-04-22 12:18:44 +02:00
Alexander Friedland	17a96a5c6f	Merge branch 'master' into 1813-QR-Code-Popup	2022-04-22 11:34:04 +02:00
Alexander Friedland	730a6004d7	Merge branch 'master' into fix_windows_cross-env	2022-04-22 11:28:26 +02:00
Moriz Wahl	d7801ba342	Merge pull request #1818 from gradido/fix-double-load-transaction-links ... fix: Double Load Transaction Links	2022-04-22 11:17:39 +02:00
Claus-Peter Hübner	7d1f97ea0b	cross-env for database	2022-04-22 02:34:17 +02:00
Claus-Peter Hübner	993362b77f	missing change	2022-04-22 02:32:57 +02:00
Claus-Peter Hübner	b8ef1cdd04	cross-env for admin	2022-04-22 02:30:23 +02:00
Claus-Peter Hübner	41260a5898	cross-env for frontend	2022-04-22 02:28:36 +02:00
Claus-Peter Hübner	061b27eaa3	fix cross-env for windows	2022-04-22 02:16:44 +02:00
Ulf Gebhardt	df819e91ea	Merge branch 'master' into fix-double-load-transaction-links	2022-04-21 23:24:54 +02:00
Ulf Gebhardt	cbe0b9a8c2	Merge pull request #1745 from gradido/1637-generate-link-backend ... Generated link in backend should also give back the base url	2022-04-21 21:34:34 +02:00
ogerly	0e8ca5b410	fixed yarn lint	2022-04-21 16:40:30 +02:00
ogerly	e154373694	add locales 'qrCode'	2022-04-21 16:39:19 +02:00
ogerly	bbec1306d0	change modal structure	2022-04-21 16:38:14 +02:00
Moriz Wahl	839d52748b	test reopening of transaction link details	2022-04-21 14:08:22 +02:00
Moriz Wahl	eb2b0e951e	reset transaction link arrays after click	2022-04-21 14:04:04 +02:00
Ulf Gebhardt	6da5348764	lint fix	2022-04-21 13:47:17 +02:00
Ulf Gebhardt	74c0e3826b	adjust test	2022-04-21 13:35:57 +02:00
Ulf Gebhardt	c6a4650866	remove code from trasnsactionLinkList query, adjusted test to have full URL in apollo mock	2022-04-21 13:34:47 +02:00
Ulf Gebhardt	d836fb5375	remove code from TransactionLink	2022-04-21 13:30:51 +02:00
Ulf Gebhardt	febe57ce13	remove code from graphql query, just use code	2022-04-21 13:28:21 +02:00
Ulf Gebhardt	f9efc3fa06	use link instead of url, do not use v-model, use value to not allow mutate prop	2022-04-21 13:22:52 +02:00
Ulf Gebhardt	00e03af7f3	increase backend config version v6	2022-04-21 13:19:01 +02:00
Ulf Gebhardt	19f2686b6e	Merge branch 'master' into 1637-generate-link-backend ... # Conflicts: # frontend/src/components/ClipboardCopy.vue # frontend/src/components/GddSend/TransactionResultLink.vue # frontend/src/components/TransactionLinks/TransactionLink.vue # frontend/src/components/Transactions/TransactionLinkSummary.spec.js	2022-04-21 13:14:52 +02:00
Alexander Friedland	1576787e57	Merge pull request #1809 from gradido/1731-Fix-Startblock-Layouting ... 1731 style startDecayStartblock, style Adapted across pages	2022-04-20 15:05:50 +02:00
Alexander Friedland	58d0cf21b5	Merge branch 'master' into 1731-Fix-Startblock-Layouting	2022-04-20 14:44:10 +02:00
Wolgang Huß	3e98657c1f	fixed tests for pagenation	2022-04-20 14:40:37 +02:00
Wolgang Huß	c0b56de91a	remove unused computed code	2022-04-20 14:40:37 +02:00
Ulf Gebhardt	daa07b780a	Merge pull request #1750 from gradido/frontend_community_info_bake_in ... Refactor: Frontend bake in community info	2022-04-20 14:03:18 +02:00
Moriz Wahl	fd509bd216	Merge branch 'master' into frontend_community_info_bake_in	2022-04-20 13:48:01 +02:00
Moriz Wahl	29ec984289	fix test	2022-04-20 13:46:02 +02:00
Ulf Gebhardt	90f0b532e1	remove community to store tests	2022-04-20 13:38:56 +02:00
Moriz Wahl	7a388d5ee6	Merge pull request #1806 from gradido/load-transaction-links-on-click ... fix: Load Transaction Link Details on Click	2022-04-20 13:19:09 +02:00
Moriz Wahl	7af7ee09e5	Merge branch 'master' into load-transaction-links-on-click	2022-04-20 13:11:27 +02:00
Moriz Wahl	efd6bfce51	Merge pull request #1790 from gradido/deploy-seed-in-backend ... devops: Deploy Seed in Backend	2022-04-20 13:08:02 +02:00
Moriz Wahl	3e660fcfa9	Merge branch 'master' into deploy-seed-in-backend	2022-04-20 12:59:45 +02:00
Moriz Wahl	9f950011a4	Merge pull request #1780 from gradido/refactor-balance-model ... refactor: Balance Model and Decay Rounding	2022-04-20 12:59:30 +02:00
Moriz Wahl	28065efd43	update README	2022-04-20 12:54:33 +02:00
Moriz Wahl	324de93814	update/remove comments	2022-04-20 12:51:34 +02:00
Moriz Wahl	0da6cc6298	Merge branch 'master' into refactor-balance-model	2022-04-20 12:48:50 +02:00
Moriz Wahl	6691be813f	decontruct input	2022-04-20 12:44:21 +02:00
Alexander Friedland	8cb6f7265e	Merge branch 'master' into 1731-Fix-Startblock-Layouting	2022-04-20 12:43:36 +02:00
Moriz Wahl	35a6b560da	Merge branch 'master' into load-transaction-links-on-click	2022-04-20 12:35:44 +02:00
Wolgang Huß	d6f25b6f98	all headings centre col 12, all b-row in offset 1 and col 11	2022-04-20 12:34:54 +02:00
Alexander Friedland	808592b5ea	Merge pull request #1807 from gradido/1805-find-startDecayBlock ... change config DECAY_START_TIME in UTC 0000	2022-04-20 12:31:21 +02:00
Moriz Wahl	6f8da4202a	Merge branch 'master' into refactor-balance-model	2022-04-20 12:01:55 +02:00
ogerly	1268b375b7	change config DECAY_START_TIME in UTC Timezone of 0000	2022-04-20 09:31:17 +02:00
Moriz Wahl	0b53cfa044	update test	2022-04-20 09:15:08 +02:00
Moriz Wahl	ff652fa72e	load transaction link on click	2022-04-20 08:48:19 +02:00