Tim Daubenschütz
2c8f262826
Add isRequired to aim prop
2015-10-15 10:21:21 +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 097e158e5064fbe58e73bc561a492ec961740cfb, reversing
changes made to 617577550309d3190a85f99bbbbd364feec5af46.
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
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
Tim Daubenschütz
ea40181805
add 'clear search' dialog to AccordionList and implement functionality in SearchBar
2015-10-13 17:28:10 +02:00
vrde
84d2dd7701
Add document title for prize
2015-10-13 17:02:03 +02:00
vrde
66dbf3da71
Add document title management for the ascribe app
2015-10-13 16:42:40 +02:00
TimDaubenschuetz
7af4e0912e
Merged in AD-972-remove-50mb-limit-in-additional-f (pull request #98 )
...
Ad 972 remove 50mb limit in additional f
2015-10-13 16:42:04 +02:00
Tim Daubenschütz
4627381c16
add getLangText
2015-10-13 16:41:35 +02:00
Tim Daubenschütz
984761a386
Remove stopPropagation for event in FileDragAndDrop
2015-10-13 16:12:05 +02:00
vrde
7c231a4c5e
Restore baseUrl in router
2015-10-13 14:19:08 +02:00
diminator
0a07106ae8
ikonotv styling
2015-10-13 13:32:48 +02:00
diminator
24011b773b
merge header - form error
2015-10-13 11:39:42 +02:00
Tim Daubenschütz
2121c6af3d
Rename whitelabel component director to ikonotv specific prefix
2015-10-13 11:39:33 +02:00
diminator
097e158e50
Merge remote-tracking branch 'remotes/origin/AD-756-branding-for-sluiceascribeio-brow' into AD-1080-restyle-webapp-with-new-corporate-identity
...
Conflicts:
js/components/header.js
2015-10-13 11:39:20 +02:00
Tim Daubenschütz
e4c7f9e071
Rename whitelabel component director to cyland specific prefix
2015-10-13 11:23:21 +02:00
Tim Daubenschütz
8ac69bab5d
Change additional files label
2015-10-13 10:20:23 +02:00
Tim Daubenschütz
002bab8e79
Increase additional data file size
2015-10-13 10:13:53 +02:00
diminator
6175775503
property blur refactor
2015-10-12 17:59:45 +02:00
vrde
dc97517d65
Refactor AuthProxyHandler
2015-10-12 17:57:23 +02:00
diminator
8d970a65c4
spinners in forms
...
button wide
2015-10-12 17:55:02 +02:00
Tim Daubenschütz
f57125184d
Merge remote-tracking branch 'origin/master' into AD-744-search-filter-not-working-i-type-
2015-10-12 17:35:48 +02:00
Tim Daubenschütz
c48c7dc4bd
Simplify SearchBar timing functionality
2015-10-12 17:33:07 +02:00
Tim Daubenschütz
cc089fe92b
Add parenthesis
2015-10-12 17:12:10 +02:00
Tim Daubenschütz
6d36be5311
Add documentation for SearchBar and put threshold into AppConstants
2015-10-12 17:10:04 +02:00
vrde
12d3fb289e
Rename RedirectProxyHandler to AuthProxyHandler
2015-10-12 17:00:53 +02:00
vrde
04abf31354
Remove ProxyRoute
2015-10-12 16:51:18 +02:00
Tim Daubenschütz
c59f5267ce
add threshold functionality to SearchBar
2015-10-12 16:38:00 +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
356e0e368a
Fix some spelling errors in documentation
2015-10-12 14:29:31 +02:00
Tim Daubenschütz
a7683a44be
fix wrong redirect in header_notification
2015-10-12 14:24:21 +02:00
Tim Daubenschütz
d760fe13d0
Merge remote-tracking branch 'origin/master' into AD-727-missing-redirects-to-login-page
...
Conflicts:
js/components/whitelabel/wallet/components/cyland/ascribe_detail/cyland_piece_container.js
2015-10-12 14:18:53 +02:00
Tim Daubenschütz
02eafaa80c
Isolate SearchBar from PieceListToolbar and start implement threshold logic
2015-10-12 13:57:37 +02:00