Brett Sun
d2529bf015
Merge with master
2015-11-03 10:39:01 +01:00
Brett Sun
784098f225
Fix PropType warnings for components in ascribe_detail
2015-10-28 18:37:09 +01:00
Brett Sun
c72a5aa308
Add Lumenus specific data forms to edition and piece details
2015-10-28 11:26:54 +01:00
Brett Sun
82b49fc653
Add additional required properties for Lumenus
...
Currently uses the FurtherDetailsFileuploader, just relabeled, to
handle the marketplace image. For now, this allows us to avoid creating
another property in the backend to handle the image, but could be
replaced or modified in the future if we do want to create another
property.
2015-10-27 17:54:35 +01:00
Tim Daubenschütz
ef14fc9b2e
Fix edition deletion redirect
2015-10-22 13:21:07 +02:00
Tim Daubenschütz
7f97ce9828
Handle deletion method for WalletPieceContainer
2015-10-21 23:45:53 +02:00
Tim Daubenschütz
fad6caca63
Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity
...
Conflicts:
js/components/ascribe_detail/edition_container.js
js/components/logout_container.js
2015-10-21 09:47:14 +02:00
vrde
e220ee6fbb
Merge branch 'AD-697-update-title-in-the-browser'
2015-10-20 15:06:41 +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
Tim Daubenschütz
8bb971d9df
Merge remote-tracking branch 'origin/master' into AD-727-missing-redirects-to-login-page
...
Conflicts:
js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
js/components/whitelabel/wallet/components/cyland/cyland_landing.js
2015-10-15 11:55:44 +02:00
diminator
c24021302f
Merge remote-tracking branch 'remotes/origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity
...
Conflicts:
js/components/whitelabel/wallet/components/cyland/cyland_hero.js
2015-10-14 17:25:53 +02:00
vrde
2967a29f2e
Set title to edition/piece containers
2015-10-13 17:52:45 +02:00
Tim Daubenschütz
8ac69bab5d
Change additional files label
2015-10-13 10:20:23 +02:00
diminator
8d970a65c4
spinners in forms
...
button wide
2015-10-12 17:55:02 +02:00
diminator
aaa1a9a000
replaced fonts
...
replaced spinners WIP
renamed settings-property to property
2015-10-12 15:25:21 +02:00
Tim Daubenschütz
28dfcfa75a
Merge remote-tracking branch 'origin/master' into AD-727-missing-redirects-to-login-page
...
Conflicts:
js/components/ascribe_detail/edition.js
js/components/ascribe_forms/form_login.js
js/components/ascribe_forms/form_signup.js
2015-10-06 16:40:02 +02:00
Tim Daubenschütz
8ba6f11dfe
Fix AccordionListTable item links and missing location propagation
2015-10-01 14:54:56 +02:00
Tim Daubenschütz
83c652a4f0
Rename pieces routes back to collection
2015-10-01 14:30:11 +02:00
Tim Daubenschütz
829f2c592b
Switch all usages of Router.Navigation and Router.State
2015-10-01 11:16:38 +02:00
diminator
b233dbb937
PR fixes
2015-10-01 09:49:01 +02:00
Tim Daubenschütz
8cd4377a58
Change links in app to new react-router@1.0rc1 syntax
2015-09-30 18:30:50 +02:00
diminator
44cf707e34
refactoring out edition_actions
2015-09-30 12:12:14 +02:00
diminator
009d12ee53
Merge remote-tracking branch 'remotes/origin/AD-772-coa-doesnt-render' into AD-806-webapp-users-cannot-withdraw-a-pe
2015-09-30 11:45:56 +02:00
diminator
b773ac829a
Merge remote-tracking branch 'remotes/origin/master' into AD-806-webapp-users-cannot-withdraw-a-pe
2015-09-30 11:45:37 +02:00
diminator
55f5d959ff
PR fixes
2015-09-30 11:26:31 +02:00
diminator
4f6e39699f
PR getlangtext
2015-09-30 09:46:11 +02:00
diminator
ea4805caa0
create CoA when not found
2015-09-30 09:14:57 +02:00
diminator
cda81b6f5b
withdraw consign
...
and acl buttonlist in detail refactor
2015-09-29 18:09:34 +02:00
Tim Daubenschütz
e356570bc8
remove console log
2015-09-29 17:56:18 +02:00
diminator
f64fb73aa6
cc fixes in licenses, collection and details
2015-09-29 15:58:24 +02:00
diminator
9bb5a51fed
bug fix show public note for anonymous
2015-09-28 17:11:15 +02:00
Tim Daubenschütz
9045b9ec01
refresh piece list on every major acl action
2015-09-28 16:32:59 +02:00
Tim Daubenschütz
c00e003aeb
refactor input textarea to use disabled instead of editable
2015-09-21 12:05:42 +02:00
diminator
ff163df61e
PR update
2015-09-17 14:20:46 +02:00
diminator
63fffc2132
PR comments fix
2015-09-17 11:39:55 +02:00
Tim Daubenschütz
7c376b7229
PR Feedback: add getLangText and move itemLimit and sizeLimit to app constants
2015-09-16 15:14:08 +02:00
Tim Daubenschütz
497a330e1a
Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-957-custom-upload-button-for-contract
2015-09-15 13:56:31 +02:00
Cevo
6a57a69e29
main.scss edited
2015-09-15 13:53:09 +02:00
Tim Daubenschütz
73c2a7c544
rename fineuploader's submitKey method to submitFile
2015-09-14 14:46:03 +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
b5e5102ea4
replace in keyword with dot notation checking
2015-09-10 14:00:59 +02:00
Tim Daubenschütz
c3b71b5398
WIP: make fineuploader an input
2015-09-10 10:51:47 +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
diminator
edcd8e57a4
notification app
...
notification refactor in onion - split by piece/edition
2015-09-03 14:15:00 +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
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
bfaf4886a4
notifications unoptimized
2015-09-01 14:45:14 +02:00
Tim Daubenschütz
b4abe7a245
generic form submission determination for fineuploader
2015-09-01 14:42:09 +02:00