1170 Commits

Author	SHA1	Message	Date
Cevo	03680bd830	information button gets the active buttons and shows i only relevant info (Tim I didn't set the arrays as props because it would require more work and fills the memory and are not going to be reused, gc should delete them)	2015-10-09 14:19:43 +02:00
Cevo	f2d02179a1	pullrequest changes	2015-10-08 13:19:59 +02:00
Cevo	087884ef3c	sharare button moved to the right	2015-10-08 10:14:50 +02:00
Cevo	924b462cc1	sharare button moved to the right	2015-10-08 10:14:06 +02:00
Cevo	bb3670ef4d	padding and border added	2015-10-07 13:52:30 +02:00
Cevo	70eedbabaf	line spacing in info text edited	2015-10-06 10:20:57 +02:00
Cevo	28ab655505	merged again with master	2015-09-30 10:53:52 +02:00
Cevo	23f10d4d7f	qMerge branch 'master' into AD-538-users-and-even-devs-are-unsure-wh	2015-09-30 10:53:16 +02:00
Tim Daubenschütz	e356570bc8	remove console log	2015-09-29 17:56:18 +02:00
diminator	08c3bfe7fb	acl for powered_by	2015-09-29 16:48:46 +02:00
diminator	f64fb73aa6	cc fixes in licenses, collection and details	2015-09-29 15:58:24 +02:00
diminator	ec0a458189	removed console log	2015-09-29 14:14:59 +02:00
diminator	33ba4ce07f	li instead of menuitem	2015-09-29 14:13:15 +02:00
diminator	c4fc6ab97f	debug console log	2015-09-29 13:22:24 +02:00
Cevo	7b9424ca68	merging from master and resolving the conflicts in main.scss, master overrides	2015-09-29 11:59:18 +02:00
Tim Daubenschütz	df338ac746	Fix alignment for AclInformationButton	2015-09-29 10:31:13 +02:00
Cevo	661cb44b94	reached the spec with dirty tricks	2015-09-28 22:09:25 +02:00
Tim Daubenschütz	e1ac3ca4c6	Add multi level ACLs for loan piece detail loan button	2015-09-28 17:39:58 +02:00
Tim Daubenschütz	52fc19444a	Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra	2015-09-28 17:22:02 +02:00
Tim Daubenschütz	4be3040396	Instead of transition from logout to login, we replace the state	2015-09-28 17:21:34 +02:00
diminator	9bb5a51fed	bug fix show public note for anonymous	2015-09-28 17:11:15 +02:00
diminator	2dda22d848	fix: ikonotv redirect to collection if logged in	2015-09-28 16:57:46 +02:00
diminator	19f94110b7	fix: ikonotv redirect to collection if logged in	2015-09-28 16:57:35 +02:00
diminator	0a0a34b0e3	Merge remote-tracking branch 'origin/AD-456-ikonotv-branded-page-for-registra' into AD-456-ikonotv-branded-page-for-registra	2015-09-28 16:44:37 +02:00
Tim Daubenschütz	9045b9ec01	refresh piece list on every major acl action	2015-09-28 16:32:59 +02:00
diminator	db1ef91965	bug fix filterParams=null on sluice	2015-09-28 16:29:50 +02:00
Tim Daubenschütz	3ae362ac15	Fix queryParams glitch for slide show in register_piece	2015-09-28 15:59:36 +02:00
Tim Daubenschütz	5b9d7eae65	Corrections on loan form	2015-09-28 15:14:45 +02:00
Tim Daubenschütz	5b41e368ac	Implement AclProxy for hash work in account settings	2015-09-28 12:00:13 +02:00
Tim Daubenschütz	62e85c66ac	Rename 'Send loan request' to 'send contract' for ikonoTv	2015-09-28 11:51:02 +02:00
Tim Daubenschütz	afef5db150	Add proper button to create editions form	2015-09-28 10:19:12 +02:00
Tim Daubenschütz	2e6acff56d	Make user email uneditable	2015-09-28 10:02:07 +02:00
Tim Daubenschütz	cfab59c027	Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra	2015-09-25 16:23:22 +02:00
Tim Daubenschütz	f2b4c23bd7	Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra ... Conflicts: js/routes.js	2015-09-25 16:23:01 +02:00
diminator	5ddf89e020	forward to collection after contract sent	2015-09-25 15:39:36 +02:00
diminator	b2cbe2c674	merged	2015-09-25 15:35:36 +02:00
diminator	e6a6c2c2a3	set collapsible default show=true	2015-09-25 15:33:01 +02:00
TimDaubenschuetz	a4975e8137	Merged in AD-1036-put-contracts-in-his-own-menu (pull request #79) ... Ad 1036 put contracts in his own menu	2015-09-25 15:29:21 +02:00
Tim Daubenschütz	cb452ce7bf	PR Feedback: rename wrapTextAtCharIndex to truncateTextAtCharIndex	2015-09-25 15:22:16 +02:00
Cevo	48f43ac01c	the real dropdown version second iteration	2015-09-25 14:36:27 +02:00
Tim Daubenschütz	e20e378533	Remove PrizeDashboard from codebase, add coa_verify to prize app	2015-09-25 11:54:12 +02:00
Tim Daubenschütz	16e7a54b27	add coa_verify route to wallet_routes to avoid crash	2015-09-25 11:51:03 +02:00
Tim Daubenschütz	9080c84fa9	Implement word wrap for ContractSettings	2015-09-25 11:20:12 +02:00
Tim Daubenschütz	7d3c14d1cc	Conditional header for + NEW WORK	2015-09-25 10:10:27 +02:00
Tim Daubenschütz	81aa052a8a	Fix load piece method in WalletPieceContainer	2015-09-25 09:53:52 +02:00
Cevo	4ae73871d3	initial push for version controlling, will be edited	2015-09-24 16:06:53 +02:00
Tim Daubenschütz	a6f09c8f35	add acl for update button in ContractSettings	2015-09-23 16:09:12 +02:00
Tim Daubenschütz	74e7c9a3d9	Integrate new ACLOptions into settings	2015-09-23 15:41:12 +02:00
Tim Daubenschütz	2a4bc2af89	separate contract settings from account settings	2015-09-23 15:16:46 +02:00
Tim Daubenschütz	4302da2f81	Merge branch 'master' into AD-456-ikonotv-branded-page-for-registra	2015-09-23 14:22:09 +02:00