ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-06-30 13:41:57 +02:00
Code Issues Releases Wiki Activity
1,316 Commits 115 Branches 0 Tags 13 MiB
2cbf7d0095
Commit Graph

124 Commits

Author SHA1 Message Date
Tim Daubenschütz
2cbf7d0095 Implement PR Feedback 2015-09-18 14:12:50 +02:00
Tim Daubenschütz
780ab9f7f1 Cleanup window.setTimeout 2015-09-17 13:28:59 +02:00
diminator
63fffc2132 PR comments fix 2015-09-17 11:39:55 +02:00
diminator
b24d4608dd Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields 2015-09-16 15:59:07 +02:00
diminator
d6bd4b4ac1 bug fix acl button 
form copyright association + account settings
bug fix dispatch in form loan
ikonotv slides
 2015-09-16 14:07:13 +02:00
Tim Daubenschütz
17cb2223c2 finalize contract update button 2015-09-16 09:47:22 +02:00
diminator
71f94768d9 fix PR comments 2015-09-15 13:22:52 +02:00
diminator
0ce298879b fixed tests 
refactored contractagreement actions
 2015-09-14 17:53:50 +02:00
diminator
ef22707680 create public agreement 2015-09-11 18:23:31 +02:00
diminator
23eb3a7fd9 Fetch contractagreements, order them and filter by accepted or pending 
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 20:20:42 +02:00
diminator
17f7be9257 contract list make public 2015-09-09 11:11:16 +02:00
diminator
2a92b38a9a Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-883-show-notificationsrequests-on-col 2015-09-08 14:43:38 +02:00
diminator
9ad713f781 merge 456 2015-09-08 14:42:51 +02:00
Cevo
3e1b362cc0 remove debugged 204 no response comes as error, handled gracefully 2015-09-08 13:08:49 +02:00
Cevo
5b0cbc92ad create refresh added, conflicts resolved 2015-09-08 11:57:20 +02:00
Cevo
a8fce698a6 createcontract refresh added 2015-09-08 11:53:09 +02:00
Tim Daubenschütz
ba2ebe81fd code restructuring 2015-09-08 11:44:05 +02:00
diminator
06ce603c44 list only is_active 2015-09-08 11:01:43 +02:00
Cevo
632c04149d tabs inserted in jsx 2015-09-07 15:43:44 +02:00
Cevo
6b9bf03941 tabs inserted in jsx 2015-09-07 15:08:01 +02:00
Cevo
501d7ac7c0 now committing the remove contract 2015-09-07 11:38:23 +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
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
Cevo
57c4076c1e pushing the contract u[pdate on client side 2015-09-03 17:19:29 +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
diminator
edcd8e57a4 notification app 
notification refactor in onion - split by piece/edition
 2015-09-03 14:15:00 +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
Tim Daubenschütz
af7938dbc7 Merge branch 'master' into AD-456-ikonotv-branded-page-for-registra 2015-09-01 09:29:58 +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
90f89e4498 other loan contract to contract renaming 2015-08-31 11:05:33 +02:00
Tim Daubenschütz
dd20afff90 rename LoanContract to Contract 2015-08-28 16:18:10 +02:00
diminator
d3cc6a5007 request actions first cut 2015-08-28 15:24:32 +02:00
diminator
ab97fa420c loan request with moment 
shortlist on accordeonlist OK
 2015-08-26 15:46:27 +02:00
diminator
b2fed6426f loan request up till accept 2015-08-26 09:50:38 +02:00
diminator
e933b334c2 loan contract form 2015-08-18 16:24:36 +02:00
diminator
36356dd5c5 Merge remote-tracking branches 'remotes/origin/AD-391-add-filter-functions-to-pieces-an', 'remotes/origin/AD-589-Form-Cancel-doesnt-reset' and 'remotes/origin/AD-619-due-1208-create-jury-dashboard' into AD-686-in-sluice-art-prize-i-can-submit- 2015-08-05 14:52:18 +02:00
Tim Daubenschütz
23bbbb792a pr review: clear: operators precedence 2015-08-04 16:58:36 +02:00
Tim Daubenschütz
fc0bccbff3 add filterBy to edition list action|store 2015-08-04 15:06:02 +02:00
diminator
2258968856 Merge remote-tracking branch 'remotes/origin/AD-619-due-1208-create-jury-dashboard' into AD-686-in-sluice-art-prize-i-can-submit- 
Conflicts:
	.gitignore
 2015-08-04 11:45:20 +02:00
Tim Daubenschütz
e3b46c69a5 implement piece list filter widget functionality 2015-08-04 11:39:33 +02:00
Tim Daubenschütz
c9042a0934 delete password of user when submitting to sentry 2015-08-03 10:41:51 +02:00
Tim Daubenschütz
4f2aa430f2 refactor ascribe table and add prizes dashboard boilerplate code 2015-07-29 18:03:49 +02:00
Tim Daubenschütz
b0d3213816 add flushLoanContract logic 2015-07-29 15:03:15 +02:00
Tim Daubenschütz
76cf9fd74d Merge branch 'AD-435-hash-locally-for-when-a-artist-do' 
Conflicts:
	js/components/ascribe_forms/form_register_piece.js
	js/components/ascribe_slides_container/slides_container.js
	js/components/ascribe_uploader/file_drag_and_drop.js
	js/components/ascribe_uploader/react_s3_fine_uploader.js
 2015-07-29 09:35:14 +02:00
TimDaubenschuetz
78049b448e Merged in AD-598-register-action-switches (pull request #14) 
Ad 598 register action switches
 2015-07-28 16:36:57 +02:00
diminator
3142e00ea5 Merge remote-tracking branch 'remotes/origin/master' into AD-435-hash-locally-for-when-a-artist-do 2015-07-28 12:13:40 +02:00