1256 Commits

Author	SHA1	Message	Date
Cevo	15460ebc2a	some more cleaning	2015-10-08 12:04:40 +02:00
Cevo	8b13a21f9c	put lets instead of vars	2015-10-08 11:28:41 +02:00
Cevo	34d4b0ccb9	try catch put in for loop it is just for checking and logging errors, the program should go on even wrong cinfig type comes from the backend(worng config type will be skipped)	2015-10-08 11:25:14 +02:00
Cevo	f5a37ab4a9	browser title added, setTitle method added to head_setter module in utils	2015-10-07 15:47:54 +02:00
Cevo	ef9bbb548d	comments in head_setter corrected	2015-10-06 17:26:30 +02:00
Cevo	f2b277821d	construct header file in utils	2015-10-06 17:24:53 +02:00
Cevo	ae2578a57c	construct header method added to utils	2015-10-06 17:19:47 +02:00
Cevo	c69767c10b	real logo of ikono added , backend settings changed we get everything from whitelabel logo	2015-10-05 17:21:51 +02:00
Cevo	d66d80e229	real logo of ikono added	2015-10-05 14:02:02 +02:00
Cevo	526bed6029	favicons working, ikonotv has to be modified to original ikonotv	2015-10-05 11:32:57 +02:00
Cevo	f033a878d0	started using favicon setter package browser icons there, ikono icon will change	2015-10-05 11:09:45 +02:00
Cevo	244c59d8e5	trying favico.js package	2015-10-05 10:16:48 +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
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	5e98787288	Minor renaming fix	2015-09-25 15:25:34 +02:00
Tim Daubenschütz	cb452ce7bf	PR Feedback: rename wrapTextAtCharIndex to truncateTextAtCharIndex	2015-09-25 15:22:16 +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
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