ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 09:35:10 +01:00
Code Issues Releases Wiki Activity
1,735 Commits 115 Branches 0 Tags 13 MiB
b78bc66fe9
Commit Graph

1480 Commits

Author SHA1 Message Date
Tim Daubenschütz
8d0e9a42fc Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh 
Conflicts:
	package.json
 2015-10-20 18:11:41 +02:00
Tim Daubenschütz
ddc2e7b919 Rename intersectAcls to intersectList and do some clean up 2015-10-20 18:10:48 +02:00
Tim Daubenschütz
8417c2781e Making AclInformation more robust by adding checks for if the information to display is available 2015-10-20 18:00:59 +02:00
Tim Daubenschütz
738e94a43d Change helper texts 2015-10-20 17:22:40 +02:00
Tim Daubenschütz
beee069d3f Minor layouting fixes 2015-10-20 15:51:22 +02:00
Tim Daubenschütz
ca03fca14a Insert new information constants 2015-10-20 15:13:34 +02:00
Tim Daubenschütz
22a95f07fd Further cleanup 2015-10-20 15:10:18 +02:00
vrde
e220ee6fbb Merge branch 'AD-697-update-title-in-the-browser' 2015-10-20 15:06:41 +02:00
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
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
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
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
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
d6b7060f39 Unify code to single quotes 2015-10-13 15:29:41 +02:00
vrde
d8e2d0e216 Remove useless vars and imports 2015-10-13 15:21:29 +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
diminator
c7122d9435 plus submit button on piecelist 2015-10-12 12:08:53 +02:00
Tim Daubenschütz
1c48b8b828 Merge branch 'master' into AD-744-search-filter-not-working-i-type- 2015-10-12 11:06:47 +02:00
Tim Daubenschütz
f38ce126b7 Correct handleSuccess of AclButtonList 2015-10-12 10:37:08 +02:00
Tim Daubenschütz
6c34cb0377 Add last bit of documentation 2015-10-12 09:24:18 +02:00
diminator
790bf595d9 glyphs, spinner, piece list/edition table 2015-10-09 16:21:26 +02:00
Tim Daubenschütz
d86668e759 Document RedirectProxyHandler 2015-10-09 15:51:03 +02:00
Tim Daubenschütz
211e253fb8 Add documentation for ProxyRoute 2015-10-09 15:39:00 +02:00
Tim Daubenschütz
69afc6165a Incorporate new RedirectProxyRoute into whitelabel pages 2015-10-09 15:19:24 +02:00
Cevo
434d852666 bug in the collection list handled 2015-10-09 14:38:18 +02:00
Cevo
b8f7527a0b console.logs removed 2015-10-09 14:32:45 +02:00
Cevo
6fd8152d22 instrange badge removed, eslint gives an error for a necessary line of code so not modified, tested 2015-10-09 14:30:22 +02:00
Tim Daubenschütz
cee8d7cae7 fix bug in FileDragAndDropDialog 2015-10-09 14:22:48 +02:00
Cevo
03680bd830 information button gets the active buttons and shows i only relevant info (Tim I didn't set the arrays as props because it would require more work and fills the memory and are not going to be reused, gc should delete them) 2015-10-09 14:19:43 +02:00
Tim Daubenschütz
299007baab Refactor redirect and redirectAuthenticated 2015-10-09 13:51:21 +02:00
diminator
dc8599830b updated glyphs, accordion pieces ok 2015-10-09 13:14:29 +02:00
Tim Daubenschütz
5e2240dbd3 remove TransactionManager boilerplate code again 2015-10-09 11:20:22 +02:00