diminator
|
1106cebf98
|
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-885-convert-roles-to-acls
|
2015-09-10 18:10:06 +02:00 |
|
diminator
|
6013303bd6
|
Merge remote-tracking branch 'remotes/origin/master' into AD-456-ikonotv-branded-page-for-registra
Conflicts:
js/components/ascribe_buttons/button_submit_close.js
js/components/ascribe_forms/form_loan.js
js/components/ascribe_forms/form_register_piece.js
sass/ascribe_media_player.scss
sass/main.scss
|
2015-09-10 17:45:51 +02:00 |
|
Tim Daubenschütz
|
82b9b68338
|
Merge branch 'master' of bitbucket.org:ascribe/onion
|
2015-09-10 16:14:02 +02:00 |
|
Tim Daubenschütz
|
b5e5102ea4
|
replace in keyword with dot notation checking
|
2015-09-10 14:00:59 +02:00 |
|
diminator
|
1c5b0c7172
|
only one agreement pending
agreement notifications per subdomain (only by whitelabel owner)
|
2015-09-09 19:29:58 +02:00 |
|
diminator
|
ecb51ca5e7
|
added appendix
|
2015-09-09 14:15:00 +02:00 |
|
diminator
|
ec2ae39e15
|
contractagreement with PUT instead of PATCH
|
2015-09-09 13:53:03 +02:00 |
|
Tim Daubenschütz
|
cb6c4aaf0e
|
integrate acl into navrouteslist + little refactor on those components
|
2015-09-08 14:20:06 +02:00 |
|
diminator
|
9409af4e1e
|
acls on user level for ikonotv
|
2015-09-08 11:35:34 +02:00 |
|
diminator
|
22aa0139ae
|
terms and conditions page with accept/deny
Needed: copyright societies in backend
|
2015-09-07 12:03:59 +02:00 |
|
diminator
|
1611a75036
|
Merge remote-tracking branch 'remotes/origin/AD-858-contract-history' into AD-883-show-notificationsrequests-on-col
Conflicts:
ownership/serializers.py
|
2015-09-04 16:48:00 +02:00 |
|
diminator
|
4bdab3410e
|
contractagreementserializer with contract fully expanded
|
2015-09-04 14:48:10 +02:00 |
|
diminator
|
9b7a69bc20
|
contract agreement notifications
|
2015-09-04 11:49:55 +02:00 |
|
diminator
|
73ee0753c1
|
refactored notifications per detail
|
2015-09-03 17:25:22 +02:00 |
|
diminator
|
9334251fd3
|
notifications on piece details (www, ikono, cyland) and edition details
|
2015-09-03 15:17:12 +02:00 |
|
Tim Daubenschütz
|
a8610fa108
|
change ikono contract
|
2015-09-02 15:56:27 +02:00 |
|
diminator
|
19726560ba
|
bitbucket test
|
2015-09-02 14:39:32 +02:00 |
|
Tim Daubenschütz
|
b4abe7a245
|
generic form submission determination for fineuploader
|
2015-09-01 14:42:09 +02:00 |
|
Tim Daubenschütz
|
7e1815bb1f
|
refactor account settings into multiple files
|
2015-08-31 16:36:24 +02:00 |
|
Tim Daubenschütz
|
d9f3f2a9d7
|
rename contract_form to form_contract
|
2015-08-28 15:55:39 +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
|
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
|
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 |
|
Tim Daubenschütz
|
cd49a9c402
|
Create generic links in nav using routes
|
2015-08-25 16:33:26 +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 |
|
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 |
|