Cevo
|
1dba9196e7
|
tabs inserted in jsx
|
2015-09-07 14:30:45 +02:00 |
|
diminator
|
22aa0139ae
|
terms and conditions page with accept/deny
Needed: copyright societies in backend
|
2015-09-07 12:03:59 +02:00 |
|
Tim Daubenschütz
|
1c4bf9915c
|
refactor setState actions to fix overriding values bug
|
2015-09-07 12:02:01 +02:00 |
|
vrde
|
436ffabffb
|
Add custom buttons
|
2015-09-07 11:40:05 +02:00 |
|
Cevo
|
501d7ac7c0
|
now committing the remove contract
|
2015-09-07 11:38:23 +02:00 |
|
Cevo
|
ae21686f26
|
slash added to route
|
2015-09-07 10:23:39 +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
|
bf6b5e00a6
|
update fineuploader
|
2015-09-04 16:39:57 +02:00 |
|
Tim Daubenschütz
|
bb6deb3f68
|
refactor setStatus method of fineuploader
|
2015-09-04 15:13:38 +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
|
8a49006592
|
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-883-show-notificationsrequests-on-col
|
2015-09-04 11:51:17 +02:00 |
|
diminator
|
9b7a69bc20
|
contract agreement notifications
|
2015-09-04 11:49:55 +02:00 |
|
Cevo
|
f312c94eeb
|
if there is anything else
|
2015-09-04 11:31:53 +02:00 |
|
Cevo
|
eb4994b05e
|
add more
|
2015-09-03 18:25:12 +02:00 |
|
TimDaubenschuetz
|
2b5339a3c0
|
Merged in AD-914-fix-sentry-logging (pull request #50)
Ad 914 fix sentry logging
|
2015-09-03 18:22:50 +02:00 |
|
Tim Daubenschütz
|
ac28ef4ee0
|
remove raven
|
2015-09-04 18:15:42 +02:00 |
|
Tim Daubenschütz
|
c1a5790bfe
|
activate mangling
|
2015-09-04 18:04:03 +02:00 |
|
Tim Daubenschütz
|
4374235c1b
|
use log global again
|
2015-09-03 17:55:15 +02:00 |
|
Tim Daubenschütz
|
3b61ac5c6a
|
remove mangle and fix bug in react-fineuploader
|
2015-09-04 17:31:58 +02:00 |
|
Tim Daubenschütz
|
ec1def31fb
|
Merge branch 'AD-425-took-45-min-to-upload-an-11-s-vid' into AD-914-fix-sentry-logging
|
2015-09-04 17:16:54 +02:00 |
|
Tim Daubenschütz
|
7dae23a265
|
remove fastly
|
2015-09-04 17:05:17 +02:00 |
|
Tim Daubenschütz
|
bc0ac05d2d
|
Merge branch 'master' of bitbucket.org:ascribe/onion
|
2015-09-04 16:25:47 +02:00 |
|
diminator
|
6a1f58fdb4
|
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-883-show-notificationsrequests-on-col
|
2015-09-03 17:37:40 +02:00 |
|
diminator
|
73ee0753c1
|
refactored notifications per detail
|
2015-09-03 17:25:22 +02:00 |
|
Cevo
|
57c4076c1e
|
pushing the contract u[pdate on client side
|
2015-09-03 17:19:29 +02:00 |
|
Tim Daubenschütz
|
8a75e94413
|
fix bug
|
2015-09-04 16:24:29 +02:00 |
|
Tim Daubenschütz
|
85efa4b416
|
Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra
|
2015-09-04 15:55:07 +02:00 |
|
Tim Daubenschütz
|
a6de57e19c
|
Merge branch 'AD-425-took-45-min-to-upload-an-11-s-vid' of bitbucket.org:ascribe/onion into AD-425-took-45-min-to-upload-an-11-s-vid
Conflicts:
js/components/ascribe_uploader/react_s3_fine_uploader.js
|
2015-09-03 17:09:52 +02:00 |
|
Tim Daubenschütz
|
a4a0e9d149
|
catch error in onComplete for fineuploader
|
2015-09-04 15:54:49 +02:00 |
|
vrde
|
345904d86a
|
Merge branch 'AD-913-add-support-long-file-names-in-mediaplayer'
|
2015-09-03 16:24:20 +02:00 |
|
vrde
|
4a4d4ac737
|
Add support for long file names
|
2015-09-03 16:19:02 +02:00 |
|
vrde
|
281822b928
|
Merge branch 'AD-911-cleanup-dead-code'
|
2015-09-03 16:18:14 +02:00 |
|
Cevo
|
5265332901
|
Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra
|
2015-09-03 15:53:22 +02:00 |
|
Cevo
|
d2f8b658af
|
contract listing being done
|
2015-09-03 15:53:02 +02:00 |
|
diminator
|
9334251fd3
|
notifications on piece details (www, ikono, cyland) and edition details
|
2015-09-03 15:17:12 +02:00 |
|
vrde
|
24d5275c1a
|
Move styleguide to actual app
|
2015-09-03 14:26:25 +02:00 |
|
diminator
|
edcd8e57a4
|
notification app
notification refactor in onion - split by piece/edition
|
2015-09-03 14:15:00 +02:00 |
|
vrde
|
50eeafba16
|
Merge branch 'master' into AD-884-refactor-styles-for-buttons
Conflicts:
sass/main.scss
|
2015-09-03 10:40:33 +02:00 |
|
vrde
|
2f5c70eceb
|
Remove unused ButtonSubmitOrClose and styles
|
2015-09-02 17:36:01 +02:00 |
|
diminator
|
7f39c62130
|
create contract and agreement
|
2015-09-02 16:34:43 +02:00 |
|
diminator
|
2450dce642
|
Merge remote-tracking branch 'origin/AD-456-ikonotv-branded-page-for-registra' into AD-456-ikonotv-branded-page-for-registra
|
2015-09-02 16:34:28 +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 |
|
Cevo
|
6555c02f23
|
Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra
|
2015-09-02 14:03:02 +02:00 |
|
Cevo
|
aa3c188509
|
contract list add
|
2015-09-02 14:02:23 +02:00 |
|
diminator
|
07ce180ff7
|
contract form POST
|
2015-09-02 13:57:41 +02:00 |
|
diminator
|
92971a9f62
|
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-883-show-notificationsrequests-on-col
Conflicts:
sass/ascribe_accordion_list.scss
|
2015-09-02 10:50:33 +02:00 |
|
diminator
|
bf5d1de635
|
update notification on request action
|
2015-09-01 19:14:48 +02:00 |
|
diminator
|
71c438ee59
|
close notifications dropdown after click
|
2015-09-01 18:38:24 +02:00 |
|