diminator
430ac59f7b
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields
2015-09-15 13:56:11 +02:00
Tim Daubenschütz
891b2eee9e
Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra
2015-09-15 13:53:29 +02:00
Cevo
6a57a69e29
main.scss edited
2015-09-15 13:53:09 +02:00
diminator
d4799318a8
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields
2015-09-15 13:49:18 +02:00
diminator
4ae137ee9e
Merged in AD-924-apply-contractagreements-to-loan- (pull request #57 )
...
Ad 924 apply contractagreements to loan
2015-09-15 13:43:21 +02:00
Tim Daubenschütz
ab1cab2091
Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra
...
Clear some merge conflicts and also some wrong merges.
BAD GIT!!!
Conflicts:
js/components/ascribe_forms/property.js
js/components/ascribe_uploader/react_s3_fine_uploader_utils.js
sass/ascribe_uploader.scss
2015-09-15 13:30:24 +02:00
diminator
b29bf38f13
ikono slides
2015-09-15 13:15:29 +02:00
diminator
9085a2bafe
cyland loanform
2015-09-15 09:12:30 +02:00
diminator
7fd5516b79
contract, contractagreement migration
...
contractagreement added to loanpiece
2015-09-14 14:16:53 +02:00
Tim Daubenschütz
f42f4a02f8
Merge remote-tracking branch 'origin/master' into AD-917-show-progress-when-uploading
...
Resolve merge conflicts with master for easier PR.
Conflicts:
js/components/ascribe_uploader/react_s3_fine_uploader.js
2015-09-14 11:14:02 +02:00
diminator
b45c68b2dc
Merge remote-tracking branch 'remotes/origin/AD-885-convert-roles-to-acls' into AD-924-apply-contractagreements-to-loan-
...
Conflicts:
ownership/serializers.py
2015-09-10 18:54:25 +02:00
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
Tim Daubenschütz
3307e282e4
remove header title
2015-09-09 17:27:23 +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
Tim Daubenschütz
8e98a7bff7
show overall progress
2015-09-04 14:54:39 +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
