vrde
|
a1827b329c
|
Merge branch 'AD-1195-window-videojs-is-not-a-func'
|
2015-10-20 15:04:47 +02:00 |
|
diminator
|
3a503db396
|
Merged in AD-1174-collecting-society-info-is-showi (pull request #102)
Put CopyrightAssociationForm in AclProxy
|
2015-10-20 14:41:45 +02:00 |
|
vrde
|
1a6ddf67ac
|
Add fall back if client cannot load 3rd party libs
|
2015-10-20 14:16:49 +02:00 |
|
vrde
|
5f0329ccf6
|
Remove useless code
|
2015-10-20 11:35:32 +02:00 |
|
vrde
|
4ee26d7259
|
Update PR with fixes
|
2015-10-20 11:25:27 +02:00 |
|
vrde
|
7ce98d0433
|
Fix comments on PR
|
2015-10-19 17:24:49 +02:00 |
|
TimDaubenschuetz
|
5a35e40a76
|
Merged in AD-947-fileuploader-button-does-not-work (pull request #100)
Remove stopPropagation for event in FileDragAndDrop
|
2015-10-19 14:53:02 +02:00 |
|
Tim Daubenschütz
|
019ff6c7ed
|
Fix simulate click for Opera
|
2015-10-19 14:22:20 +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 |
|
TimDaubenschuetz
|
d66c201a98
|
Merged in AD-727-missing-redirects-to-login-page (pull request #95)
Ad 727 missing redirects to login page
|
2015-10-19 10:13:54 +02:00 |
|
diminator
|
54333c4ebe
|
Merge branch 'AD-1080-restyle-webapp-with-new-corporate-identity' of bitbucket.org:ascribe/onion into AD-1080-restyle-webapp-with-new-corporate-identity
|
2015-10-16 13:31:42 +02:00 |
|
diminator
|
74eb1ce3a2
|
spinner and some colors
***FML***
|
2015-10-16 13:30:36 +02:00 |
|
Tim Daubenschütz
|
b964bde281
|
Merge branch 'AD-1080-restyle-webapp-with-new-corporate-identity' of bitbucket.org:ascribe/onion into AD-1080-restyle-webapp-with-new-corporate-identity
|
2015-10-16 13:10:44 +02:00 |
|
Tim Daubenschütz
|
69e75f5ce0
|
Add AscribeSpinner to LogoutContainer
|
2015-10-16 13:10:18 +02:00 |
|
Tim Daubenschütz
|
5e6e2e8cb0
|
Redirect directly to /login on loggout
|
2015-10-16 13:01:54 +02:00 |
|
diminator
|
f8d2d39b2d
|
thumbnails, header, footer, pager
|
2015-10-16 13:00:19 +02:00 |
|
TimDaubenschuetz
|
127145e333
|
Merged in AD-1181-add-download-button-for-contract (pull request #105)
add download button to loan form
|
2015-10-16 12:10:49 +02:00 |
|
Tim Daubenschütz
|
712ec74247
|
add getLangText
|
2015-10-16 12:10:28 +02:00 |
|
Cevo
|
0b716cfa19
|
warn added
|
2015-10-16 11:30:45 +02:00 |
|
Tim Daubenschütz
|
32d317cdef
|
add download button to loan form
|
2015-10-16 11:29:08 +02:00 |
|
diminator
|
ed24ec194e
|
added PR comments
|
2015-10-15 15:24:40 +02:00 |
|
TimDaubenschuetz
|
e804722c71
|
Merged in AD-679-concept-of-drag-is-nonsensical-fo (pull request #103)
Introduce draganddrop feature detection and add it to FileDragAndDropDialog
|
2015-10-15 15:16:51 +02:00 |
|
TimDaubenschuetz
|
9dec5eab1d
|
Merged in AD-744-search-filter-not-working-i-type- (pull request #97)
Ad 744 search filter not working i type
|
2015-10-15 15:16:33 +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 |
|
Tim Daubenschütz
|
702f1d29f3
|
Styling
|
2015-10-15 11:41:46 +02:00 |
|
Tim Daubenschütz
|
c7c83083d3
|
change layout of AclButtonList
|
2015-10-15 11:32:34 +02:00 |
|
Tim Daubenschütz
|
d77bdb25a5
|
Cleanup code
|
2015-10-15 11:17:16 +02:00 |
|
Tim Daubenschütz
|
2c8f262826
|
Add isRequired to aim prop
|
2015-10-15 10:21:21 +02:00 |
|
diminator
|
d7cd92eb52
|
email styles
|
2015-10-15 10:08:22 +02:00 |
|
Tim Daubenschütz
|
a1f159fc2d
|
Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh
Conflicts:
js/components/ascribe_detail/edition.js
js/utils/general_utils.js
sass/main.scss
|
2015-10-15 10:06:39 +02:00 |
|
Tim Daubenschütz
|
2b00bfeb4f
|
Revert "Merge remote-tracking branch 'remotes/origin/AD-756-branding-for-sluiceascribeio-brow' into AD-1080-restyle-webapp-with-new-corporate-identity"
Remove AD-756 from PR
This reverts commit 097e158e50 , reversing
changes made to 6175775503 .
Conflicts:
js/components/header.js
|
2015-10-14 17:41:44 +02:00 |
|
Cevo
|
602675ccb4
|
set title pull req comment handled
|
2015-10-14 17:29:14 +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 |
|
Tim Daubenschütz
|
8b23a9c74f
|
Introduce draganddrop feature detection and add it to FileDragAndDropDialog
|
2015-10-14 17:19:01 +02:00 |
|
diminator
|
b54beae322
|
cyland
cc
|
2015-10-14 17:13:16 +02:00 |
|
Tim Daubenschütz
|
1b21bc49ab
|
Put CopyrightAssociationForm in AclProxy
|
2015-10-14 16:56:16 +02:00 |
|
Tim Daubenschütz
|
713eea03cc
|
Better robustness for slides container and register form for cyland
|
2015-10-14 16:20:51 +02:00 |
|
diminator
|
317d2611ba
|
spinners part2
scrollbar
uploader styles
property blur
|
2015-10-14 16:17:10 +02:00 |
|
Alberto Granzotto
|
27010aa2b0
|
Merged in AD-xxx-fix-property-name-propagation (pull request #101)
Property component now propagate its name to its input child
|
2015-10-14 16:14:57 +02:00 |
|
vrde
|
2869cbc125
|
Disable eslint check on specific proptype
|
2015-10-14 15:49:04 +02:00 |
|
vrde
|
01cea9ad3d
|
Property component now propagate its name to its input child
|
2015-10-14 15:30:10 +02:00 |
|
Tim Daubenschütz
|
dab7503601
|
Refactor SlidesContainer to only use queryParams to keep slidepage state
|
2015-10-14 14:22:53 +02:00 |
|
Cevo
|
a0ab076943
|
acl information render refactored
|
2015-10-14 13:30:51 +02:00 |
|
Cevo
|
f0761ec36b
|
acl information render refactored
|
2015-10-14 12:16:49 +02:00 |
|
diminator
|
a457439347
|
sluice styling
|
2015-10-14 12:12:06 +02:00 |
|
Cevo
|
2d87533009
|
prop types added
|
2015-10-14 11:41:16 +02:00 |
|
Cevo
|
b4b05b3161
|
information added to forms and delete form title changed, acl information component created, information text is added to the constants
|
2015-10-13 18:33:08 +02:00 |
|
vrde
|
2967a29f2e
|
Set title to edition/piece containers
|
2015-10-13 17:52:45 +02:00 |
|
Tim Daubenschütz
|
3321379a8f
|
bug fix for going to a piece when in a search
|
2015-10-13 17:30:49 +02:00 |
|
vrde
|
21c84774c8
|
Add document title for wallets
|
2015-10-13 17:29:53 +02:00 |
|