1
0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 09:35:10 +01:00
Commit Graph

125 Commits

Author SHA1 Message Date
diminator
b2fed6426f loan request up till accept 2015-08-26 09:50:38 +02:00
diminator
5fcee39ed3 shortlisting enabled up till loan request 2015-08-25 15:19:10 +02:00
diminator
a07b4cc35c reset cyland register form
"no votes yet" for judge
2015-08-25 11:11:22 +02:00
diminator
2d10887e1b reset cyland additional data form 2015-08-25 10:49:49 +02:00
diminator
15bcd4ba14 average rating
cyland bug fix
2015-08-25 10:47:38 +02:00
diminator
1b335e31a4 Merge remote-tracking branch 'remotes/origin/master' into AD-661-due-1208-implement-jury-rating-an 2015-08-24 16:45:03 +02:00
diminator
70c39794b4 sluice judge + average WIP 2015-08-24 15:33:36 +02:00
Tim Daubenschütz
18634ffe50 fix additional files button bug 2015-08-24 14:16:13 +02:00
diminator
440dcd9785 Merge branch 'AD-846-loan-request-action-panel-on-piec' into AD-613-cyland-white-label-page 2015-08-24 11:36:30 +02:00
diminator
54ec829588 notes in cyland 2015-08-24 11:35:35 +02:00
Tim Daubenschütz
d05662b879 fix PR issues 2015-08-24 11:22:44 +02:00
Tim Daubenschütz
116cb9c2fc fix disappearing fineuploader in additional data 2015-08-21 14:07:10 +02:00
Tim Daubenschütz
5acce27df2 Merge branch 'AD-613-cyland-white-label-page' of bitbucket.org:ascribe/onion into AD-613-cyland-white-label-page 2015-08-21 11:35:00 +02:00
Tim Daubenschütz
09c0451c86 Merge branch 'AD-835-make-form-fields-lockable' into AD-613-cyland-white-label-page
Conflicts:
	js/components/ascribe_detail/further_details_fileuploader.js
2015-08-21 11:34:47 +02:00
Tim Daubenschütz
3b46dbb9f5 add upload busy function to fineuploader 2015-08-21 11:11:31 +02:00
Tim Daubenschütz
30d57a943f fix lock form 2015-08-21 11:01:13 +02:00
diminator
433703a470 moved terms 2015-08-21 10:54:57 +02:00
diminator
5c6b753acb piece loan history 2015-08-20 15:50:30 +02:00
diminator
60db83c626 cyland detail subheader 2015-08-20 14:18:01 +02:00
diminator
ffdb4847db piece bitcoin id 2015-08-20 14:01:02 +02:00
diminator
7afb3d68b8 Merge remote-tracking branch 'remotes/origin/AD-835-make-form-fields-lockable' into AD-613-cyland-white-label-page 2015-08-20 11:32:27 +02:00
diminator
5b2ab6c1e2 bug fix acls
otherdata frontend

MIGRATE + loaddate whitelabel
2015-08-20 11:32:11 +02:00
diminator
1f1a8b7761 bug fix piece loan acl
bug fix piece edit acl

DOUBLE MIGRATE
2015-08-19 19:12:30 +02:00
Tim Daubenschütz
689796b115 slidecontainer: display lock on progress 2015-08-19 18:23:04 +02:00
Tim Daubenschütz
495f5600af implement form locking for cyland 2015-08-19 17:39:25 +02:00
diminator
7e9e187c18 bug fix breadcrumbs
bug fix sluice landing page
bug fix sluice register_piece
bug fix ownershiphistory pending
2015-08-19 17:18:32 +02:00
diminator
b66fdc332d Merge branch 'tmp2' into AD-613-cyland-white-label-page 2015-08-19 16:46:07 +02:00
Tim Daubenschütz
d5e8181855 make cyland submission stateful 2015-08-19 16:02:10 +02:00
Tim Daubenschütz
0b4b3fa727 fix slideContainer broken functionality 2015-08-19 15:54:13 +02:00
Tim Daubenschütz
8a88f978c6 add start_from parameter to slide container 2015-08-19 15:30:48 +02:00
diminator
b1703b6284 cyland landing 2015-08-19 14:48:22 +02:00
Tim Daubenschütz
406cee5bd3 refactor breadcrumbs to attributes 2015-08-19 14:11:03 +02:00
diminator
6d8d318e8d Merge branch 'tmp2' into AD-456-ikonotv-branded-page-for-registra 2015-08-19 13:58:55 +02:00
Tim Daubenschütz
6dab66ec61 restructure cyland submit button 2015-08-19 13:56:43 +02:00
diminator
b7e81fb0dd cyland landing 2015-08-19 13:54:45 +02:00
diminator
188cca4834 ikono register 2015-08-19 09:31:36 +02:00
diminator
e933b334c2 loan contract form 2015-08-18 16:24:36 +02:00
Tim Daubenschütz
e88612704f cyland loan form for accordion list 2015-08-18 13:39:06 +02:00
Tim Daubenschütz
ad8be7e34a separate pre-sending form submission functionality 2015-08-18 13:15:22 +02:00
diminator
e862fa39a9 Merge remote-tracking branch 'remotes/origin/AD-803-refactor-acls' into AD-456-ikonotv-branded-page-for-registra
Conflicts:
	web/settings.py
2015-08-18 12:36:38 +02:00
diminator
8ae7edaa1c ikonotv initial setup 2015-08-18 12:08:01 +02:00
Tim Daubenschütz
eb54e6fff6 refresh piece list after loan 2015-08-18 10:53:50 +02:00
diminator
f77f1d1d5d cyland submit button and form WIP
cyland footers
2015-08-18 09:42:28 +02:00
diminator
fc82c866fb cyland refactor
whitelabel + cyland app
2015-08-17 20:52:36 +02:00
diminator
0be3e249bb breadcrumb style fix 2015-08-17 13:46:04 +02:00
diminator
cf86e352e4 slide breadcrumbs 2015-08-17 12:18:40 +02:00
diminator
12dde0458c Merge remote-tracking branch 'remotes/origin/master' into AD-613-cyland-white-label-page 2015-08-17 09:56:55 +02:00
diminator
5b2e90a03c sorting acl and styling 2015-08-14 15:38:30 +02:00
diminator
e843e2fa52 order by rating 2015-08-14 14:58:23 +02:00
diminator
247cca3ee2 piece rating + navigation OK
close prize
2015-08-13 13:28:09 +02:00