Brett Sun
f7259a8ab3
Merge with AD-1255
2015-11-03 11:13:32 +01:00
Brett Sun
d2529bf015
Merge with master
2015-11-03 10:39:01 +01:00
Brett Sun
633939b7fa
Use AclButton in LumenusSubmitButton
...
Instead of copying functionality from AclButton to add a default email,
LumenusSubmitButton just returns one with preset settings.
2015-10-27 17:01:50 +01:00
Brett Sun
ac1b43d24b
Set the consignee email by using the server's white label settings
...
Consignee email is available through the white label settings we get
from the server, so we don’t need to hardcode them into the constants.
Separated out AclButtonList from PieceListbulkModal to make the modal
more flexible and separated in concerns.
2015-10-26 19:17:06 +01:00
Brett Sun
3dedc93d2e
Force consignee to be submissions@lumenus.co
...
Special white label form settings only defined for consign form for
now, but could be added to others as needed.
2015-10-23 14:19:44 +02:00
Tim Daubenschütz
a9fa60eaf2
Fix buttons for cc
2015-10-21 14:52:25 +02:00
Tim Daubenschütz
f0d8e32ecf
Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity
...
Conflicts:
js/components/ascribe_accordion_list/accordion_list_item_piece.js
js/components/ascribe_app.js
js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js
js/components/logout_container.js
js/components/whitelabel/wallet/wallet_app.js
2015-10-19 10:30:14 +02:00
diminator
790bf595d9
glyphs, spinner, piece list/edition table
2015-10-09 16:21:26 +02:00
Tim Daubenschütz
f9393c5bb3
Remove all unneccessary react-router imports
2015-10-01 14:36:56 +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
vrde
2f5c70eceb
Remove unused ButtonSubmitOrClose and styles
2015-09-02 17:36:01 +02:00
diminator
79106dd106
loan request + answer complete
2015-08-27 11:38:21 +02:00
diminator
b2fed6426f
loan request up till accept
2015-08-26 09:50:38 +02:00
Tim Daubenschütz
8ff2dea4df
refactor: acl buttons message functionality
2015-08-10 15:57:20 +02:00
Tim Daubenschütz
3afb036f24
rename apiUrls to ApiUrls
2015-08-07 15:08:02 +02:00
Tim Daubenschütz
8f9c699b69
Merge branch 'master' into AD-716-aclbutton-doesnt-respect-modals-r
...
Conflicts:
js/components/ascribe_buttons/submit_to_prize_button.js
js/components/ascribe_forms/form.js
js/components/ascribe_forms/form_loan.js
2015-08-07 14:10:05 +02:00
Tim Daubenschütz
e227db1b3b
fix create editions for filter widget
2015-08-06 13:43:53 +02:00
Tim Daubenschütz
ee97e600ef
fix bug in piece list filter widget
2015-08-06 13:15:52 +02:00
Tim Daubenschütz
d66549478f
WIP: Refactor delete editions form
2015-08-05 18:14:49 +02:00
Tim Daubenschütz
4c88f88d56
first cut porting and using new react-bootstrap version
2015-08-05 17:32:35 +02:00
Tim Daubenschütz
f3e378f221
update react-bootstrap first cut
2015-08-05 16:49:25 +02:00
diminator
792325f71d
acl_create_editions
2015-08-05 16:02:48 +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
fc0bccbff3
add filterBy to edition list action|store
2015-08-04 15:06:02 +02:00
diminator
5ce549e533
disable submit prize with ACL
2015-08-04 13:15:38 +02:00
Tim Daubenschütz
13e151e83b
add logging and responsive user navigation
2015-07-16 19:12:18 +02:00
diminator
a0e6e0c5a4
Merge branch 'AD-419-decouple-piece-registration-from-'
2015-07-15 18:01:38 +02:00
diminator
58294687f9
fix acl and editions
2015-07-15 17:51:09 +02:00
Tim Daubenschütz
f3ea3460bb
reload piece list after clicking on create editions
2015-07-15 17:22:28 +02:00
Tim Daubenschütz
1509c520a4
finalizing loan form
2015-07-15 14:48:51 +02:00
Tim Daubenschütz
795a268184
loan form styling and loan contract store
2015-07-15 14:03:23 +02:00
Tim Daubenschütz
07dce25fe7
add functionality for submit to prize button and fix delete button
2015-07-14 23:53:49 +02:00
Tim Daubenschütz
8f386dc0cf
adjust acl proxy
2015-07-14 22:34:34 +02:00
diminator
982b701a5c
Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-419-decouple-piece-registration-from-
...
Conflicts:
js/components/ascribe_detail/edition.js
2015-07-14 17:45:39 +02:00
diminator
9fa9db8352
consign/unconsign
2015-07-14 17:42:15 +02:00
Tim Daubenschütz
5a0663ea14
unshare and delete functionality + store updates for all views
2015-07-14 16:29:01 +02:00
Tim Daubenschütz
adf4630efd
Merge branch 'AD-419-decouple-piece-registration-from-' of bitbucket.org:ascribe/onion into AD-419-decouple-piece-registration-from-
...
Conflicts:
js/components/ascribe_table/table_item_acl_filtered.js
2015-07-14 14:46:30 +02:00
Tim Daubenschütz
cc89475d0c
add routine to refresh specific edition list
2015-07-14 14:45:33 +02:00
diminator
f6be4a2922
consign WIP
2015-07-14 14:16:51 +02:00
diminator
e0eb31d1de
transfer + withdraw
2015-07-14 11:42:09 +02:00
diminator
3cc95cf7d5
acl WIP
2015-07-14 00:56:23 +02:00
diminator
9a7bf46675
acl WIP
2015-07-13 23:57:16 +02:00
diminator
a985fb855e
acl WIP
2015-07-13 23:56:55 +02:00
Tim Daubenschütz
60600a72d4
refactor bulk acls for backend adjustment
2015-07-13 21:19:45 +02:00
diminator
fd2f99f1b0
acl indexof
2015-07-13 20:16:08 +02:00
Tim Daubenschütz
463f205a6e
finalized: separation of edition creation and edition form
2015-07-13 18:52:55 +02:00
Tim Daubenschütz
85ba816a53
separate polling-success functionality
2015-07-13 18:13:16 +02:00
Tim Daubenschütz
e71c2f9fe0
separate create edition form logic
2015-07-13 17:09:44 +02:00
diminator
a07bc9e0e2
piece + share
...
acl first cut
2015-07-13 14:10:46 +02:00
diminator
88ff4b55d6
acl buttons and share forms for pieces/editions
2015-07-10 20:00:35 +02:00
