1313 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tim Daubenschütz	9d7b5cbe2a	advance create contract form	2015-09-01 16:57:12 +02:00
vrde	e2b2c91f8e	Merge branch 'exp-styleguide' into AD-884-refactor-styles-for-buttons	2015-09-01 15:48:48 +02:00
diminator	bfaf4886a4	notifications unoptimized	2015-09-01 14:45:14 +02:00
Tim Daubenschütz	b4abe7a245	generic form submission determination for fineuploader	2015-09-01 14:42:09 +02:00
vrde	287cf09ada	Merge branch 'master' into AD-901-add-lint-for-scss	2015-09-01 14:41:52 +02:00
Tim Daubenschütz	b5b1e36109	nested collapsible paragraphs	2015-09-01 14:00:06 +02:00
Tim Daubenschütz	56cdcdb5c6	Merge branch 'AD-901-add-lint-for-scss' into AD-456-ikonotv-branded-page-for-registra	2015-09-01 13:30:04 +02:00
TimDaubenschuetz	c33976ad37	Merged in AD-875-slidecontainer-add-vendor-prefixe (pull request #41) ... add vendor prefixes for slide container	2015-09-01 09:49:57 +02:00
Tim Daubenschütz	f83300e597	incorporate pr feedback	2015-09-01 09:34:29 +02:00
Tim Daubenschütz	af7938dbc7	Merge branch 'master' into AD-456-ikonotv-branded-page-for-registra	2015-09-01 09:29:58 +02:00
vrde	b6fc0e931d	Update readme with doc on how to install the linter	2015-08-31 19:13:09 +02:00
vrde	d2adc7a388	Merge remote-tracking branch 'origin/master' into AD-901-add-lint-for-scss ... Conflicts: sass/main.scss	2015-08-31 19:09:09 +02:00
vrde	99af814492	Lint scss	2015-08-31 19:04:47 +02:00
Tim Daubenschütz	abbaa80bac	disable browsersync ghostmode by default	2015-08-31 18:05:14 +02:00
Tim Daubenschütz	9aa47a5de4	open localhost.com:3000 instead of localhost:3000	2015-08-31 17:55:27 +02:00
TimDaubenschuetz	f318b6bb3e	Merged in AD-788-upon-filter-that-has-no-match-a-r (pull request #43) ... integrate unfilteredPieceListCount into piece list store and list	2015-08-31 17:41:15 +02:00
Tim Daubenschütz	96fdb598f7	change api endpoints to contractblobs	2015-08-31 17:29:43 +02:00
Tim Daubenschütz	55948bc9ba	integrate unfilteredPieceListCount into piece list store and list	2015-08-31 16:57:16 +02:00
Tim Daubenschütz	7e1815bb1f	refactor account settings into multiple files	2015-08-31 16:36:24 +02:00
Tim Daubenschütz	ea52927eec	rename uploading routes	2015-08-31 11:33:44 +02:00
Tim Daubenschütz	90f89e4498	other loan contract to contract renaming	2015-08-31 11:05:33 +02:00
vrde	3f34fc680e	Get rid of ascribe-btn-gray	2015-08-28 16:40:54 +02:00
diminator	9dddf0bf21	Merge remote-tracking branch 'remotes/origin/master' into AD-883-show-notificationsrequests-on-col	2015-08-28 16:25:57 +02:00
Tim Daubenschütz	dd20afff90	rename LoanContract to Contract	2015-08-28 16:18:10 +02:00
Tim Daubenschütz	d9f3f2a9d7	rename contract_form to form_contract	2015-08-28 15:55:39 +02:00
Tim Daubenschütz	02ed21fef5	fix nav links on logged out user	2015-08-28 15:31:12 +02:00
Tim Daubenschütz	848321a3f3	fix nav links on logged out user	2015-08-28 15:29:30 +02:00
diminator	762c3f89b9	Merge remote-tracking branch 'remotes/origin/master' into AD-883-show-notificationsrequests-on-col	2015-08-28 15:25:43 +02:00
diminator	d3cc6a5007	request actions first cut	2015-08-28 15:24:32 +02:00
diminator	02ca36682e	Merged in AD-456-ikonotv-branded-page-for-registra (pull request #42) ... Ad 456 ikonotv branded page for registra	2015-08-28 14:35:21 +02:00
Tim Daubenschütz	ddfc8b9621	minor fixes	2015-08-28 14:27:02 +02:00
Tim Daubenschütz	8e7aeab3a6	Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra	2015-08-28 14:08:45 +02:00
Tim Daubenschütz	52ae348e57	dynamic acl for acl_submit	2015-08-28 14:07:29 +02:00
diminator	02e105d2b8	text refactor	2015-08-28 14:00:50 +02:00
diminator	1b730573c7	ikonotv acl_submitted + refactor	2015-08-28 13:58:24 +02:00
diminator	680cc8572f	ikonotv acl_submit	2015-08-28 13:52:58 +02:00
Tim Daubenschütz	d40b671b45	remove ikonotv boilerplate landing page	2015-08-28 12:48:48 +02:00
Tim Daubenschütz	8eec5d8f38	Merge branch 'AD-863-acl-forms-prefil-email-address-an' into AD-456-ikonotv-branded-page-for-registra	2015-08-28 12:44:02 +02:00
Tim Daubenschütz	5219dd5cf7	fix bug + enable contract	2015-08-28 12:40:00 +02:00
Tim Daubenschütz	e9d0311f58	custom ikonotv piece page	2015-08-28 12:33:00 +02:00
Tim Daubenschütz	2c26aab8cc	add exception for loaning a piece for ikonotv	2015-08-28 12:20:36 +02:00
Tim Daubenschütz	89f68abcec	add: Loan form for Ikonotv	2015-08-28 12:11:29 +02:00
Tim Daubenschütz	9a9aa68ca9	fix lazy evalutaion of loan form	2015-08-28 11:13:28 +02:00
vrde	73c5ab56c3	playing around with the styleguide app	2015-08-28 11:06:25 +02:00
Tim Daubenschütz	8e5c04140f	add vendor prefixes for slide container	2015-08-27 18:11:47 +02:00
Tim Daubenschütz	86efb66663	add collapsible appendix to send contract form	2015-08-27 17:33:51 +02:00
Tim Daubenschütz	65148e24de	remove contract form from ikonotv codebase and integrate it into ascribe-core	2015-08-27 14:56:49 +02:00
Tim Daubenschütz	64d23f82df	refactoring of the general architecture	2015-08-27 14:47:33 +02:00
Tim Daubenschütz	9d7a9bd028	add router/navigation integration into whole project	2015-08-27 14:34:15 +02:00
Tim Daubenschütz	b67466d196	Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra	2015-08-27 14:05:21 +02:00