ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +01:00
Code Issues Releases Wiki Activity
2,372 Commits 115 Branches 0 Tags 13 MiB
574378af98
Commit Graph

2003 Commits

Author SHA1 Message Date
Brett Sun
536ce12aac Remove duplicate sentry logging on errors 2015-11-13 17:33:01 +01:00
Brett Sun
1b4bf58129 Log additional details when chunk signing fails 2015-11-13 17:32:20 +01:00
Tim Daubenschütz
633ebc8fb9 Last minute edits 2015-11-13 17:07:21 +01:00
Tim Daubenschütz
5d7f6bf6ed Fix redirect on email submission 2015-11-13 16:51:31 +01:00
Brett Sun
8db531fb87 Add xhr details to sentry logging 
FineUploader’s s3.XhrUploadHandler was also fixed to pass down the xhr
object when initiating a multipart upload fails.
 2015-11-13 16:16:54 +01:00
Brett Sun
eae22a2e04 Move logging of upload errors to be before cancellation of uploads 
Although logging isn’t affected by the cancelation of uploads, it may
cause confusion for readers if the uploads are cancelled before the
error is logged.
 2015-11-13 16:04:55 +01:00
Brett Sun
cef19f427c Add comment for content registration check 2015-11-13 16:02:34 +01:00
Brett Sun
00d93d912b Move 3rd party api urls to AppConstants 2015-11-13 13:33:27 +01:00
Brett Sun
09812a1881 Forgot to unlisten to UserStore when unmounting 2015-11-13 13:33:12 +01:00
Brett Sun
7bc5492236 Clear previously selected files from input element when ReactS3FineUploader fails 2015-11-13 12:20:52 +01:00
Brett Sun
4336190b5e Fix FineUploader to handle cancellations in the onError() callback 
Calling cancel() in the onError() callback would cause an error as the
upload handler tries to clear the upload’s xhr requests after cancel
already clears them.
 2015-11-13 12:10:51 +01:00
Tim Daubenschütz
c852eaf143 Merge pull request #17 from ascribe/AD-1259-All-dates-showing-up-as-2014 
Replace Javascript's Date object with momentjs
 2015-11-13 09:58:12 +01:00
Tim Daubenschütz
19bdf59f46 Include feedback from PR for destructuring props 2015-11-13 09:57:22 +01:00
Tim Daubenschütz
8b335cfb07 Include feedback from PR 2015-11-13 09:48:22 +01:00
Tim Daubenschütz
f5c76af6cb Complete list of supported image file formats on the web 2015-11-12 14:52:03 +01:00
Tim Daubenschütz
da09bd8649 Add link to ToS to submission form 2015-11-12 14:48:57 +01:00
Tim Daubenschütz
45d5821abb Refactor UploadButton to resemble HTML5 file chooser input 2015-11-12 14:18:08 +01:00
Tim Daubenschütz
d1b931715d Add spinner to submission for and make submittable on default with providing error messages 2015-11-12 13:21:10 +01:00
Tim Daubenschütz
1a67cd66f5 Add labeling functionality to UploadButton 2015-11-12 13:08:23 +01:00
Tim Daubenschütz
3be275aefd Add artist contact information 2015-11-12 11:51:33 +01:00
Tim Daubenschütz
5b594e9d82 left-align uploader buttons 2015-11-12 11:27:55 +01:00
Tim Daubenschütz
e6d839f6a0 Add proper validation for multiple uploaders in submission form 2015-11-12 10:46:08 +01:00
Tim Daubenschütz
62f19467b7 Changing behavior for ReactS3Fineuploader not having access to createBlobRoutine 2015-11-11 18:17:32 +01:00
Tim Daubenschütz
0438f461c2 Implement static feedback for submitted pieces 2015-11-11 16:27:50 +01:00
Tim Daubenschütz
66aef4886f Adjust MediaContainer and MediaPlayer to newly introduced manual-thumbnail functionality 2015-11-11 10:51:45 +01:00
Brett Sun
f3b0b4ffc1 Adjust info text for email 2015-11-10 19:35:42 +01:00
Brett Sun
af58687572 Add twitter text 2015-11-10 19:33:08 +01:00
Brett Sun
e85747144a Add Lumenus landing page 2015-11-10 18:49:08 +01:00
Brett Sun
84e8e4612f Autofocus message field in consignment form and use custom labels 
For now, we’ll let the artist specify their suggested price in the
consignment form’s message field.
 2015-11-10 18:24:46 +01:00
Tim Daubenschütz
ea321a4a77 Finalize submission flow with validation and thumbnail creation 2015-11-10 17:35:57 +01:00
Tim Daubenschütz
447ccabf45 Delete UploadFileButton as logic can also be handled in InputFineuploader 2015-11-10 15:52:21 +01:00
Tim Daubenschütz
aec850a905 Improve validation for non-HTML5 inputs 2015-11-10 15:51:24 +01:00
Tim Daubenschütz
62eb78ae76 Add naive & manual validation to Form 2015-11-10 13:40:34 +01:00
Brett Sun
3cfa65cb82 Change instances of "Share" to be "Email" 2015-11-10 11:53:05 +01:00
Brett Sun
2dba4d5156 Use display:none for CollapsibleButton's hidden panel 
Using visibility:invisible is awkward due to the spacing it leaves when
the panel is invisible. The CollapsibleParagraph behaves similarly,
leaving no spacing behind when the paragraph is collapsed.
 2015-11-10 10:32:08 +01:00
Brett Sun
a9f0a46fbd Move social share buttons to left of download button to accommodate for embed button 2015-11-10 10:29:37 +01:00
Tim Daubenschütz
be7fa0c6eb Add conditional redirect after successful registration 2015-11-10 10:15:38 +01:00
Brett Sun
61cd316a86 Merge branch 'AD-1255-refactor-aclbuttons-form-creatio' into AD-1309-change-share-to-email 2015-11-09 20:08:11 +01:00
Brett Sun
8dc0470007 Add Twitter button 2015-11-09 19:01:27 +01:00
Tim Daubenschütz
31d9b85ddd Merge pull request #19 from ascribe/Remove-deadcode-fineuploader.min.js 
Remove s3.fine-uploader.min.js as we're using s3.fine-uploader.js for shiming anyways
 2015-11-09 17:55:35 +01:00
Tim Daubenschütz
9ae6b10add Finalizing basic submission flow with lazy evaluated form 2015-11-09 17:52:09 +01:00
Brett Sun
d972da935a Add Facebook Share button 2015-11-09 17:46:49 +01:00
Tim Daubenschütz
deceb61c60 Implement lazy blob creation routine and increase robustness of upload button template for react-fineuploader 2015-11-09 16:58:35 +01:00
Brett Sun
7c73b7fac7 Refactor InjectInHeadMixin to be a util class instead 2015-11-09 14:32:14 +01:00
Tim Daubenschütz
3e22ad1d9d Finalize layouting submission form 2015-11-09 10:35:23 +01:00
Tim Daubenschütz
7721d62319 Create boilerplate code for portfolioreview 2015-11-06 16:52:08 +01:00
Brett Sun
b100fdd80a Change default collection filter for lumens admin 2015-11-06 16:13:47 +01:00
Tim Daubenschütz
b78bc66fe9 Fix minor bugs for simple_prize app 2015-11-06 15:47:55 +01:00
Brett Sun
f92fa972bf Merge with AD-1255 2015-11-06 15:26:37 +01:00
Tim Daubenschütz
f5a5e045a6 Finalize boilerplate for portfolioreview subdomain 2015-11-06 15:18:46 +01:00
Tim Daubenschütz
5adc34faeb Move and rename sluice prize app to 'simple_prize' 2015-11-06 15:18:36 +01:00
Brett Sun
56eff0d9ed Improve DRYness of acl buttons 
The React dev tools don’t seem to be able to automatically pick up the
displayName when using createClass from within another function, so
it’s added here to give clarity when debugging.
 2015-11-06 15:10:29 +01:00
Brett Sun
318a0bf4b2 Filter the collection to only show the consignable items by default 2015-11-06 14:10:54 +01:00
Brett Sun
799ccb9b8d Show unconsign button 2015-11-06 14:01:26 +01:00
Brett Sun
fb62d2d2e0 Check for completion of additional data on front end 
In the end, it made more sense to check if all the additional details
have been filled in on the front end than receiving an acl or flag from
the backend.
 2015-11-06 14:00:58 +01:00
Brett Sun
04e453b28c Fix lumenus edition endpoint 2015-11-05 16:05:20 +01:00
Brett Sun
6223248ea0 Fix lumenus whitelabel api endpoints 2015-11-05 13:51:40 +01:00
Brett Sun
4ca8ca8feb Show AdditionalDetailsModal from SubmitButton when details need to be filled in 2015-11-05 11:58:32 +01:00
Brett Sun
adf0d411d6 Fetch piece data in AdditionalDetailForm 
Although this moves state further down the hierarchy, it allows the
AdditionalDataForm to be used more easily. Parent components would
otherwise have to have the piece prop carried down through multiple
levels or create a makeshift object.
 2015-11-05 11:56:17 +01:00
Tim Daubenschütz
8892ac4225 Add additional fields to step two of cyland's loan process 2015-11-05 11:56:09 +01:00
Brett Sun
3fb4ae55bf Merge with AD-1290 2015-11-04 14:04:16 +01:00
Brett Sun
2711c4ddb9 Move onChange() to after componentWillUnmount() for ESLint 2015-11-04 13:57:15 +01:00
Brett Sun
543605aae3 Move store resets to componentDidMount() 2015-11-04 13:56:43 +01:00
Tim Daubenschütz
c17685731a Fix invalidateCache functionality 2015-11-04 11:36:42 +01:00
Brett Sun
85eb45b5cd Add small changes for previous merges that were missed 2015-11-04 00:41:12 +01:00
Tim Daubenschütz
9a54ebdbd7 Merge pull request #15 from ascribe/AD-1256-refactor-modalwrapper-to-not-be- 
Refactor ModalWrapper to not require a trigger component
 2015-11-03 17:21:11 +01:00
Brett Sun
3929712e9d Prune unnecessary divs from some components 2015-11-03 12:10:43 +01:00
Brett Sun
54212627bb Change lumens buttons for AD-1264 changes 2015-11-03 12:10:21 +01:00
Brett Sun
cd6673f255 Merge with AD-1264 2015-11-03 11:34:48 +01:00
Brett Sun
581549870f Merge with AD-1256 2015-11-03 11:13:44 +01:00
Brett Sun
f7259a8ab3 Merge with AD-1255 2015-11-03 11:13:32 +01:00
Brett Sun
f2555aefcc Add email prop to loan and consign button 2015-11-03 11:12:04 +01:00
Tim Daubenschütz
c6f6bb398d Replace all occurrences of with momentjs 2015-11-03 10:57:41 +01:00
Brett Sun
3a8f91e29e Change required prop for AD1251 changes 2015-11-03 10:49:06 +01:00
Brett Sun
68c1dd9407 Merge with AD1251 2015-11-03 10:48:28 +01:00
Brett Sun
d2529bf015 Merge with master 2015-11-03 10:39:01 +01:00
Tim Daubenschütz
4d526a5568 Merge pull request #11 from ascribe/AD-1251-refactor-inputtextareatoggables- 
Refactor InputTextAreaToggable's required property to take a bool instead of a string
 2015-11-03 10:25:46 +01:00
Tim Daubenschütz
cd4157df32 Remove s3.fine-uploader.min.js as we're using s3.fine-uploader.js for shiming anyways 2015-11-03 10:21:43 +01:00
Tim Daubenschütz
ecdcbbc25e Fix minor issue 2015-11-03 10:09:44 +01:00
Tim Daubenschütz
35e9bedf04 Convert WhitelabelFetcher to WhitelabelSource 2015-11-03 10:07:44 +01:00
Tim Daubenschütz
6a0c4b4272 Remove user_fetcher.js 2015-11-03 09:52:54 +01:00
Brett Sun
cb6e94c8f1 Forgot to use our own omit instead of lodash's 2015-11-02 18:57:56 +01:00
Brett Sun
0b4cc3123d Remove lodash dependency 2015-11-02 18:45:06 +01:00
Brett Sun
05e3069240 Add propTypes to acl buttons 2015-11-02 18:44:09 +01:00
Brett Sun
e890cf5bb1 Cherry pick changes to excludePropFromObject() 2015-11-02 18:37:27 +01:00
Brett Sun
1a3dffe8bc Modify excludePropFromObject to be similar to lodash.omit() 2015-11-02 18:31:01 +01:00
Brett Sun
955e20d6b6 Reduce dependency footprint of new includes 
Opted for decamelize instead of snake-case as it’s much smaller and we
don’t need the extra functionality of snake-case.
 2015-11-02 18:29:06 +01:00
Brett Sun
fe4e337690 Use Object.assign() instead of writing own merge function 2015-11-02 18:27:45 +01:00
Tim Daubenschütz
f0325f2473 Specify and applying naming conventions 📃 for source and store methods 2015-11-02 16:32:55 +01:00
Tim Daubenschütz
7ce7f4d17d Completing prototype for using alt.js's sources instead of fetchers 2015-11-02 15:47:57 +01:00
Tim Daubenschütz
0157c048ab Add cache invalidation for signup and login 2015-11-02 15:38:37 +01:00
Brett Sun
8540e3de36 Bring over missed changes for cyland for changes to form utils 2015-11-02 15:36:18 +01:00
Brett Sun
a0ebc7dc58 Use string formatting for RequestActionForm's notification message 2015-11-02 15:21:33 +01:00
Brett Sun
7746241a59 Fix getLangText() when using multiple placeholders 2015-11-02 15:21:27 +01:00
Brett Sun
fe06ea607f Remove unnecessary default props 2015-11-02 15:20:02 +01:00
Brett Sun
6c8016e094 Remove misleading editions prop to pieceOrEditions 2015-11-02 15:19:52 +01:00
Brett Sun
49f20462f1 Check for a new csrf token on componentWillReceiveProps instead of componentWillUpdate 
this.setState() should not be used in componentWillUpdate():
https://facebook.github.io/react/docs/component-specs.html#updating-comp
onentwillupdate
 2015-11-02 12:10:41 +01:00
Tim Daubenschütz
0770a1ed61 Implement cache invalidation functionality for UserStore & UserSources 2015-11-02 11:31:02 +01:00
Brett Sun
5f5461c10d Remove warning for missing prop from FurtherDetailsFileUploader 2015-11-02 10:42:15 +01:00
Brett Sun
a513af984d Update cyland for FineUploader changes 2015-11-02 10:41:59 +01:00
Tim Daubenschütz
147c852b02 Replace getFullYear() with getUTCFullYear() 2015-11-02 10:32:48 +01:00
Tim Daubenschütz
d50aa2913f Remove SessionPersistentStore 2015-11-02 10:00:50 +01:00
Tim Daubenschütz
ff4067e637 Revert "Add first cut on persistent stores" 
This reverts commit bed067f9bc.

Conflicts:
	js/actions/user_actions.js
	js/stores/session_persistent_store.js
	js/stores/user_store.js
	js/utils/feature_detection_utils.js
 2015-11-02 09:59:59 +01:00
Tim Daubenschütz
11f3ab51a3 Revert "Implement functionality for feature-detecting webStorage" 
This reverts commit c7ef23ee40.

Conflicts:
	js/utils/feature_detection_utils.js
 2015-11-02 09:55:53 +01:00
Brett Sun
1e328b722b Sanitize utility should not modify given object 
Mutating arguments and then returning them is redundant and confusing
behaviour (why pass it back if they already have it? Am I getting a new
copy since it returns something?).
 2015-10-30 17:46:51 +01:00
Brett Sun
d23331d9b9 Remove ReactS3FineUploader's dependency on react-router's location 
ReactS3FineUploader used to check the current url’s query params to
determine which method it should use to upload, but this decision means
the component is tightly coupled with react-router and history.js. A
major pain point is having to propagate the location prop all the way
down to this component even when it’s not necessary.

Now, ReactS3FineUploader’s parent elements can either parse the current
query params themselves or, if they have a location from react-router,
simply use the location.

Added a few utils to help parse url params.
 2015-10-30 17:43:20 +01:00
Tim Daubenschütz
469f5108a8 Implement cached source for user endpoint 2015-10-30 16:57:03 +01:00
Brett Sun
67fbfbd470 Update RequestActionForm to use form utils 2015-10-30 11:46:01 +01:00
Brett Sun
7e1f6a382a Remove unnecessary import from form utils 2015-10-30 11:16:44 +01:00
Brett Sun
5bec3c5dc6 Use const for the cloned trigger element 2015-10-30 11:13:32 +01:00
Brett Sun
03e0bbd024 Separate form building concerns from AclButton 
AclButton’s form building is now delegated to AclFormFactory so other
components can use the same forms with ease. Its show/hide behaviour is
also now controlled with AclProxy.
 2015-10-30 11:10:31 +01:00
Tim Daubenschütz
bed067f9bc Add first cut on persistent stores 2015-10-29 17:15:26 +01:00
Brett Sun
c242cffdbd Bring over changes for acl_button from Lumenus 2015-10-29 17:04:31 +01:00
Brett Sun
22234492e6 Refactor ModalWrapper to not require a trigger component 2015-10-29 16:23:02 +01:00
Brett Sun
864e0bd2a6 Remove redundant truth check for required prop 2015-10-29 15:45:00 +01:00
Cevo
3cf59ae2af added public note to piece 2015-10-29 15:31:25 +01:00
Tim Daubenschütz
590818cf0b Merge pull request #10 from ascribe/cleanup-utility-file-declarations 
Move code from head_setter.js to dom_utils.js and adjust function-com…
 2015-10-29 13:25:15 +01:00
Tim Daubenschütz
eba9023efc From dom_utils.js, remove useless 'continue' statement in loop/try-catch 2015-10-29 13:22:10 +01:00
Brett Sun
906ef7c37e Refactor InputTextAreaToggable's required property to take a bool instead 2015-10-28 19:19:14 +01:00
Brett Sun
784098f225 Fix PropType warnings for components in ascribe_detail 2015-10-28 18:37:09 +01:00
Tim Daubenschütz
66b86209bf Add appropriate spaces to import statement in header.js 2015-10-28 17:55:44 +01:00
Tim Daubenschütz
c7ef23ee40 Implement functionality for feature-detecting webStorage 2015-10-28 17:53:52 +01:00
Tim Daubenschütz
ee4c8f624e Move code from head_setter.js to dom_utils.js and adjust function-comments 2015-10-28 17:45:28 +01:00
Tim Daubenschütz
cc8e455a0e Merge pull request #8 from ascribe/AD-1233-delete-button-is-way-to-prominent 
Change delete button back to old styling
 2015-10-28 15:56:02 +01:00
Brett Sun
c72a5aa308 Add Lumenus specific data forms to edition and piece details 2015-10-28 11:26:54 +01:00
Tim Daubenschütz
5788e77501 Merge pull request #9 from ascribe/AD-1219-sort-by-and-filter-drop-down-widget-are-cut-off 
Pull DropdownButtons in collection to the right, to make them work al…
 2015-10-27 18:11:00 +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
6217663fe0 Pull DropdownButtons in collection to the right, to make them work also on mobile 2015-10-27 17:34:31 +01:00
Tim Daubenschütz
d617f7212f Merge pull request #7 from ascribe/AD-1237-navbar-ascribe-logo-doesnt-link 
AD-1237 Navbar Ascribe Logo Doesn't Link
 2015-10-27 17:19:44 +01:00
Tim Daubenschütz
9765ed040b Add tertiary button style 2015-10-27 17:15:23 +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
Tim Daubenschütz
12c7fa7ba4 Change delete button back to old styling 2015-10-27 16:32:26 +01:00
Brett Sun
7e438dcaf5 Add link to /collection to ascribe branding on navbar 2015-10-27 11:44:40 +01:00
Tim Daubenschütz
dc813f2687 Merge pull request #4 from ascribe/AD-1075-year-before-1000-starts-with-0 
Fix correct year extraction from date-string in edition and piece detail
 2015-10-27 10:59:29 +01:00
Tim Daubenschütz
969d2f8b34 Merge pull request #5 from ascribe/AD-1209-Sort-by-widget-is-using-wrong-native-UI-elements 
Change input type in PieceListToolbarOrderWidget from "checkbox" to "…
 2015-10-27 10:56:21 +01:00
Tim Daubenschütz
4dbed67a63 Merge pull request #3 from ascribe/AD-1229-aclinformation-button-on-no-available-buttons-fails 
Login validation for ACL actions in edition and piece detail
 2015-10-27 10:53:49 +01:00
Tim Daubenschütz
576fa39167 Fix wrong pushState invocation 2015-10-27 09:59:46 +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
Tim Daubenschütz
fc4d4dbe17 Change input type in PieceListToolbarOrderWidget from "checkbox" to "radio" 2015-10-26 17:12:24 +01:00
Tim Daubenschütz
384ec0f445 Fix correct year extraction from date-string in 
AccordionListItemWallet
WalletPieceContainer
 2015-10-26 16:20:33 +01:00
Tim Daubenschütz
42733740db Fix correct year extraction from date-string in 
AccordionListItemPrize
PrizePieceContainer
CylandAccordionListItem
IkonotvAccordionListItem
 2015-10-26 16:07:31 +01:00
Tim Daubenschütz
1207522266 Fix correct year extraction from date-string in edition and piece detial view 2015-10-26 15:39:33 +01:00
Tim Daubenschütz
d48da96e3b Add login-validation to actions DetailProperty in Edition and Piece detail view 2015-10-26 11:21:22 +01:00
Brett Sun
84c459c426 Revert changes to allow piece list to filter ACLs 
We can do this with the backend instead.
 2015-10-26 11:09:04 +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
TimDaubenschuetz
d0f6f1571d Merged in AD-538-users-and-even-devs-are-unsure-wh (pull request #94) 
Ad 538 users and even devs are unsure wh
 2015-10-23 11:25:50 +02:00
Tim Daubenschütz
3bf70628c1 Finalizing behavior of AclInformation 2015-10-23 11:24:26 +02:00
Tim Daubenschütz
cd3c8b8f6e Complete visual styling 2015-10-23 10:37:23 +02:00
Tim Daubenschütz
e8a9cd89a4 Add resizing functionality to AclButtonList and AclInformation 2015-10-23 09:29:17 +02:00
Tim Daubenschütz
b77beb0b1e Replace last occurences of ascribe-spool-chunked 2015-10-22 17:17:38 +02:00
Brett Sun
e226477424 Merge with master 2015-10-22 14:18:23 +02:00
Brett Sun
7ba7e26d5b Fix typo in edition api url 2015-10-22 14:14:06 +02:00
Tim Daubenschütz
d4de2434ee Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh 
Conflicts:
	js/components/ascribe_forms/form_share_email.js
	js/components/ascribe_forms/form_transfer.js
	js/utils/general_utils.js
	sass/main.scss
 2015-10-22 13:38:49 +02:00
Tim Daubenschütz
ef14fc9b2e Fix edition deletion redirect 2015-10-22 13:21:07 +02:00
Tim Daubenschütz
68b608763a Merge remote-tracking branch 'origin/master' into AD-756-branding-for-sluiceascribeio-brow 
Conflicts:
	js/components/header.js
	js/utils/head_setter.js
 2015-10-22 12:00:59 +02:00
TimDaubenschuetz
e16198e3ab Merged in AD-1080-restyle-webapp-with-new-corporate-identity (pull request #104) 
Ad 1080 restyle webapp with new corporate identity
 2015-10-22 11:55:34 +02:00
Sylvain Bellemare
ffb699f3f3 Point to apiary-based docs - fixes AD-1218 2015-10-22 11:52:14 +02:00
Brett Sun
ba777781b7 Add sliding piece registration with dummy additional form 2015-10-22 11:13:44 +02:00
Brett Sun
de3c5bca14 Correct misleading comments in utils 2015-10-22 11:12:41 +02:00
Tim Daubenschütz
b2a9eb1c7c Add thumbnail replacement for new logo 2015-10-22 10:39:11 +02:00
Tim Daubenschütz
7f97ce9828 Handle deletion method for WalletPieceContainer 2015-10-21 23:45:53 +02:00
TimDaubenschuetz
bb18676020 Merged master into AD-1080-restyle-webapp-with-new-corporate-identity 2015-10-21 21:25:49 +02:00
Brett Sun
0c51eb374e Add Lumenus specific piece list 2015-10-21 17:37:29 +02:00
Tim Daubenschütz
a9fa60eaf2 Fix buttons for cc 2015-10-21 14:52:25 +02:00
Brett Sun
7116133337 AD-1194 Create front-end host configs 
Default route components to be replaced with Lumenus specific ones.
 2015-10-21 14:10:21 +02:00
Tim Daubenschütz
61cb4c87a9 Replace ascribe-green-color with new ascribe-blue-color 2015-10-21 11:34:12 +02:00
Tim Daubenschütz
cd1cdfeede Change font-weights, remove gibson from local CSS file and fix glitches 2015-10-21 10:35:11 +02:00
Brett Sun
f1e9f4a0c8 Add missing space to accordion list placeholder 2015-10-21 09:57:40 +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
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
Tim Daubenschütz
74e07d5ce5 Fix stupid mistake 2015-10-20 11:33:04 +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
Tim Daubenschütz
f82278070b Log before dispatch in PieceActions 2015-10-19 16:01:05 +02:00
Tim Daubenschütz
757ee40e4e add 404 routine to PieceContainer 2015-10-19 15:58:05 +02:00
Tim Daubenschütz
23b7ebd776 add 404 routine to EditionContainer 2015-10-19 15:29:57 +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
Cevo
d1471d1ec9 new logo 2015-10-09 11:13:28 +02:00
Cevo
38247fe15f iod attribute added to favicons 2015-10-09 10:14:59 +02:00
diminator
85d3184e98 piece list styling 2015-10-09 02:00:02 +02:00
diminator
b7aaa9a4cf collection page + footer 2015-10-08 20:26:29 +02:00
Cevo
3597b5a905 console logs a removed head checking and default in the case of undefined head added 2015-10-08 15:39:09 +02:00
Cevo
b3a9bc2594 new favicons added 2015-10-08 14:42:56 +02:00
Cevo
f2d02179a1 pullrequest changes 2015-10-08 13:19:59 +02:00
Cevo
15460ebc2a some more cleaning 2015-10-08 12:04:40 +02:00
Cevo
8b13a21f9c put lets instead of vars 2015-10-08 11:28:41 +02:00
Cevo
34d4b0ccb9 try catch put in for loop it is just for checking and logging errors, the program should go on even wrong cinfig type comes from the backend(worng config type will be skipped) 2015-10-08 11:25:14 +02:00
diminator
71988d502d ascribe fonts 
first cut layout

spinner
 2015-10-08 11:12:15 +02:00
Cevo
087884ef3c sharare button moved to the right 2015-10-08 10:14:50 +02:00
Cevo
924b462cc1 sharare button moved to the right 2015-10-08 10:14:06 +02:00
Cevo
f5a37ab4a9 browser title added, setTitle method added to head_setter module in utils 2015-10-07 15:47:54 +02:00
Cevo
bb3670ef4d padding and border added 2015-10-07 13:52:30 +02:00
Tim Daubenschütz
b4f9c11c16 Implement loggedOut routings 2015-10-07 09:39:30 +02:00
Tim Daubenschütz
471d95977e Merge branch 'AD-1105-separate-third-party-storesactio' into AD-727-missing-redirects-to-login-page 2015-10-07 09:31:49 +02:00
Tim Daubenschütz
f5c06e070c Separate dispatcher logic of whitelabel and user stores 2015-10-07 09:31:38 +02:00
Tim Daubenschütz
f066971ccc Finalize ProxyRoute and RedirectProxyRoute 2015-10-06 18:28:15 +02:00
Cevo
ef9bbb548d comments in head_setter corrected 2015-10-06 17:26:30 +02:00
Cevo
f2b277821d construct header file in utils 2015-10-06 17:24:53 +02:00
Cevo
ae2578a57c construct header method added to utils 2015-10-06 17:19:47 +02:00
Tim Daubenschütz
fbc9ae1fe7 Merge branch 'AD-1105-separate-third-party-storesactio' into AD-727-missing-redirects-to-login-page 
Conflicts:
	js/third_party/notifications.js
 2015-10-06 16:50:51 +02:00
Tim Daubenschütz
000719e14d Move third party actions/stores to separate dispatcher 2015-10-06 16:47:59 +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
0c6538df2f add redirect to auth_component 2015-10-06 15:38:39 +02:00
Tim Daubenschütz
6877f2c8a7 Minor renaming of ProxyHandler 2015-10-06 15:29:01 +02:00
Cevo
70eedbabaf line spacing in info text edited 2015-10-06 10:20:57 +02:00
Tim Daubenschütz
97fd639c30 Implement ProxyRoute 2015-10-06 10:20:36 +02:00
Cevo
c69767c10b real logo of ikono added , backend settings changed we get everything from whitelabel logo 2015-10-05 17:21:51 +02:00
Cevo
d66d80e229 real logo of ikono added 2015-10-05 14:02:02 +02:00
Tim Daubenschütz
c174b8b56c Tighten lib-dependencies, move history into its own module 2015-10-05 11:52:23 +02:00
Cevo
526bed6029 favicons working, ikonotv has to be modified to original ikonotv 2015-10-05 11:32:57 +02:00
Cevo
f033a878d0 started using favicon setter package browser icons there, ikono icon will change 2015-10-05 11:09:45 +02:00
Cevo
244c59d8e5 trying favico.js package 2015-10-05 10:16:48 +02:00
Tim Daubenschütz
31a83a1d61 Add TransactionManager boilerplate code 2015-10-02 11:03:42 +02:00
Tim Daubenschütz
49f8178f38 Remove IndexRoute from main app 2015-10-02 09:48:51 +02:00
Tim Daubenschütz
dc6d9160fe Fix error in AppGateway logic 2015-10-01 16:59:44 +02:00
Tim Daubenschütz
b95906d83e Fix whitelabel styling 2015-10-01 16:11:29 +02:00
Tim Daubenschütz
9a17e44df1 Refactor of wallet app routing 2015-10-01 15:57:46 +02:00
diminator
5f201ad76a fix redirect 2015-10-01 15:38:37 +02:00
Tim Daubenschütz
8f9b5c7f27 Implement new routine for routeDidChange 2015-10-01 15:17:55 +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
f9393c5bb3 Remove all unneccessary react-router imports 2015-10-01 14:36:56 +02:00
Tim Daubenschütz
d399027dd6 Fix isActive reference 2015-10-01 14:34:46 +02:00
Tim Daubenschütz
83c652a4f0 Rename pieces routes back to collection 2015-10-01 14:30:11 +02:00
Tim Daubenschütz
a4e00ba89e Fix dynamic routing for react-router-bootstrap 2015-10-01 14:16:20 +02:00
Tim Daubenschütz
17fd470e6b Upgrade react-router-bootstrap 2015-10-01 14:00:56 +02:00
Tim Daubenschütz
957d0c66c9 minor fixes for last commit 2015-10-01 11:24:19 +02:00
Tim Daubenschütz
829f2c592b Switch all usages of Router.Navigation and Router.State 2015-10-01 11:16:38 +02:00
diminator
acd29b0cbe Merge remote-tracking branch 'remotes/origin/master' into AD-535-when-non-member-gets-work-transfe 2015-10-01 10:26:54 +02:00
diminator
708cf1b3da Merged in AD-806-webapp-users-cannot-withdraw-a-pe (pull request #88) 
withdraw consign
 2015-10-01 09:49:56 +02:00
diminator
b233dbb937 PR fixes 2015-10-01 09:49:01 +02:00
diminator
dfa01a0dde signup fix 
consign redirect
 2015-10-01 09:45:12 +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
TimDaubenschuetz
ccc7bf9c06 Merged in AD-992-im-on-page-3-i-deleted-an-edition (pull request #86) 
Ad 992 im on page 3 i deleted an edition
 2015-09-30 17:48:12 +02:00
Tim Daubenschütz
eebe936023 Change: router rendering, router location, route configs, notFound routes, redirect routes, 2015-09-30 17:09:46 +02:00
diminator
bbae33a40f avoid dispatcherror when switching to signup 2015-09-30 17:07:18 +02:00
diminator
0d6e82a45d WIP signup/login redirect and redirectAuthenticated 2015-09-30 17:05:40 +02:00
diminator
44cf707e34 refactoring out edition_actions 2015-09-30 12:12:14 +02:00
diminator
2aef82be0b Merged in AD-772-coa-doesnt-render (pull request #89) 
create CoA when not found
 2015-09-30 12:03:34 +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
Tim Daubenschütz
7283ae7574 PR Feedback: Change API error handling to saver approach 2015-09-30 11:22:20 +02:00
TimDaubenschuetz
ad7f088081 Merged in AD-605-when-an-edition-or-piece-is-not-d (pull request #90) 
Ad 605 when an edition or piece is not d
 2015-09-30 11:15:22 +02:00
TimDaubenschuetz
662b837d5d Merged in AD-1071-naked-domain-is-not-requesting-t (pull request #85) 
Write generic function for extracting subdomain and implement troughout whole app
 2015-09-30 11:10:05 +02:00
Tim Daubenschütz
aa908a1c57 PR Feedback: Simplify subdomain extraction 2015-09-30 11:09:04 +02:00
Tim Daubenschütz
dc753caf87 Add getLangText to ErrorNotFoundPage 2015-09-30 11:06:42 +02:00
Cevo
28ab655505 merged again with master 2015-09-30 10:53:52 +02:00
Cevo
23f10d4d7f qMerge branch 'master' into AD-538-users-and-even-devs-are-unsure-wh 2015-09-30 10:53:16 +02:00
Tim Daubenschütz
99d29449a3 style 404 page 2015-09-30 10:44:38 +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
08c3bfe7fb acl for powered_by 2015-09-29 16:48:46 +02:00
Tim Daubenschütz
90cf137c2c Integrate error page in app + whitelabel pages 2015-09-29 16:00:58 +02:00
diminator
f64fb73aa6 cc fixes in licenses, collection and details 2015-09-29 15:58:24 +02:00
Tim Daubenschütz
40095f7fbf throw javascript errors on >= 400 HTTP errors 2015-09-29 15:38:06 +02:00
Tim Daubenschütz
550eb2dc0b Add fetchPieceList to PieceListBulkModal 2015-09-29 15:23:57 +02:00
Tim Daubenschütz
d50d0faabe Write generic function for extracting subdomain and implement troughout whole app 2015-09-29 14:58:56 +02:00
Tim Daubenschütz
a3656410b1 Update component no PieceListStore changes 2015-09-29 14:25:30 +02:00
diminator
ec0a458189 removed console log 2015-09-29 14:14:59 +02:00
diminator
33ba4ce07f li instead of menuitem 2015-09-29 14:13:15 +02:00
diminator
c4fc6ab97f debug console log 2015-09-29 13:22:24 +02:00
Cevo
7b9424ca68 merging from master and resolving the conflicts in main.scss, master overrides 2015-09-29 11:59:18 +02:00
Tim Daubenschütz
df338ac746 Fix alignment for AclInformationButton 2015-09-29 10:31:13 +02:00
Cevo
661cb44b94 reached the spec with dirty tricks 2015-09-28 22:09:25 +02:00
Tim Daubenschütz
e1ac3ca4c6 Add multi level ACLs for loan piece detail loan button 2015-09-28 17:39:58 +02:00
Tim Daubenschütz
52fc19444a Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra 2015-09-28 17:22:02 +02:00
Tim Daubenschütz
4be3040396 Instead of transition from logout to login, we replace the state 2015-09-28 17:21:34 +02:00
diminator
9bb5a51fed bug fix show public note for anonymous 2015-09-28 17:11:15 +02:00
diminator
2dda22d848 fix: ikonotv redirect to collection if logged in 2015-09-28 16:57:46 +02:00
diminator
19f94110b7 fix: ikonotv redirect to collection if logged in 2015-09-28 16:57:35 +02:00
diminator
0a0a34b0e3 Merge remote-tracking branch 'origin/AD-456-ikonotv-branded-page-for-registra' into AD-456-ikonotv-branded-page-for-registra 2015-09-28 16:44:37 +02:00
Tim Daubenschütz
9045b9ec01 refresh piece list on every major acl action 2015-09-28 16:32:59 +02:00
diminator
db1ef91965 bug fix filterParams=null on sluice 2015-09-28 16:29:50 +02:00
Tim Daubenschütz
3ae362ac15 Fix queryParams glitch for slide show in register_piece 2015-09-28 15:59:36 +02:00
Tim Daubenschütz
5b9d7eae65 Corrections on loan form 2015-09-28 15:14:45 +02:00
Tim Daubenschütz
5b41e368ac Implement AclProxy for hash work in account settings 2015-09-28 12:00:13 +02:00
Tim Daubenschütz
62e85c66ac Rename 'Send loan request' to 'send contract' for ikonoTv 2015-09-28 11:51:02 +02:00
Tim Daubenschütz
afef5db150 Add proper button to create editions form 2015-09-28 10:19:12 +02:00
Tim Daubenschütz
2e6acff56d Make user email uneditable 2015-09-28 10:02:07 +02:00
Tim Daubenschütz
cfab59c027 Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra 2015-09-25 16:23:22 +02:00
Tim Daubenschütz
f2b4c23bd7 Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra 
Conflicts:
	js/routes.js
 2015-09-25 16:23:01 +02:00
diminator
5ddf89e020 forward to collection after contract sent 2015-09-25 15:39:36 +02:00
diminator
b2cbe2c674 merged 2015-09-25 15:35:36 +02:00
diminator
e6a6c2c2a3 set collapsible default show=true 2015-09-25 15:33:01 +02:00
TimDaubenschuetz
a4975e8137 Merged in AD-1036-put-contracts-in-his-own-menu (pull request #79) 
Ad 1036 put contracts in his own menu
 2015-09-25 15:29:21 +02:00
Tim Daubenschütz
5e98787288 Minor renaming fix 2015-09-25 15:25:34 +02:00
Tim Daubenschütz
cb452ce7bf PR Feedback: rename wrapTextAtCharIndex to truncateTextAtCharIndex 2015-09-25 15:22:16 +02:00
Cevo
48f43ac01c the real dropdown version second iteration 2015-09-25 14:36:27 +02:00
Tim Daubenschütz
e20e378533 Remove PrizeDashboard from codebase, add coa_verify to prize app 2015-09-25 11:54:12 +02:00
Tim Daubenschütz
16e7a54b27 add coa_verify route to wallet_routes to avoid crash 2015-09-25 11:51:03 +02:00
Tim Daubenschütz
9080c84fa9 Implement word wrap for ContractSettings 2015-09-25 11:20:12 +02:00
Tim Daubenschütz
7d3c14d1cc Conditional header for + NEW WORK 2015-09-25 10:10:27 +02:00
Tim Daubenschütz
81aa052a8a Fix load piece method in WalletPieceContainer 2015-09-25 09:53:52 +02:00
Cevo
4ae73871d3 initial push for version controlling, will be edited 2015-09-24 16:06:53 +02:00
Tim Daubenschütz
a6f09c8f35 add acl for update button in ContractSettings 2015-09-23 16:09:12 +02:00
Tim Daubenschütz
74e7c9a3d9 Integrate new ACLOptions into settings 2015-09-23 15:41:12 +02:00
Tim Daubenschütz
2a4bc2af89 separate contract settings from account settings 2015-09-23 15:16:46 +02:00
Tim Daubenschütz
4302da2f81 Merge branch 'master' into AD-456-ikonotv-branded-page-for-registra 2015-09-23 14:22:09 +02:00
Tim Daubenschütz
4acbc2c923 fix InputTextareaToggable 2015-09-23 14:12:33 +02:00
Tim Daubenschütz
90d6ec20f6 Revert "Revert "acls on 3 levels"" 
This reverts commit c02d1ea3ac.
 2015-09-22 17:38:25 +02:00
Tim Daubenschütz
c02d1ea3ac Revert "acls on 3 levels" 
This reverts commit f1bc400faf.
 2015-09-22 17:29:07 +02:00
diminator
24b7031c72 Merge remote-tracking branch 'origin/AD-943-add-custom-additional-fields' into AD-943-add-custom-additional-fields 2015-09-22 17:23:37 +02:00
diminator
f1bc400faf acls on 3 levels 
whitelabel
user
piece

the higher on the list, the more power (whitelabel overrides user and piece)
 2015-09-22 17:23:19 +02:00
Tim Daubenschütz
3a11efb2fc Improve input_textarea_toggleable 2015-09-22 17:13:06 +02:00
Tim Daubenschütz
52903c6982 Fix labels for buttons 2015-09-22 16:49:01 +02:00
Tim Daubenschütz
1320b5c965 cleanup form_loan and contract_agreement_list_actions 2015-09-22 16:45:24 +02:00
Tim Daubenschütz
33b8e51aee Fix react warning for select inputs 2015-09-22 14:13:04 +02:00
Tim Daubenschütz
bd5aa266b1 Merge remote-tracking branch 'origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields 2015-09-22 13:38:31 +02:00
Tim Daubenschütz
4bbc4afd61 Increase robustness by excluding meta data for pieces that have been loaned before actual launch 2015-09-22 13:37:31 +02:00
Tim Daubenschütz
878a716262 Remove 'learn more' from contract form 2015-09-22 13:20:55 +02:00
diminator
54a1049b48 Merged in AD-1029-add-filter-for-submitted-accepte (pull request #71) 
filter for submitted and accepted on ikonotv
 2015-09-22 13:14:28 +02:00
diminator
5f98f65842 filter in frontend 2015-09-22 12:20:14 +02:00
Tim Daubenschütz
a8c436c40b Change detail text in loan process 2015-09-22 11:56:30 +02:00
Tim Daubenschütz
aaa27550af Merge branch 'AD-943-add-custom-additional-fields' of bitbucket.org:ascribe/onion into AD-943-add-custom-additional-fields 2015-09-22 11:43:53 +02:00
Tim Daubenschütz
31ffc4262a change text in signup form 2015-09-22 11:41:10 +02:00
Tim Daubenschütz
a0ff5af62b Make style changes 2015-09-22 11:33:59 +02:00
Tim Daubenschütz
b0b44718da Changes to landing page text according to Elisabeth 2015-09-22 10:29:23 +02:00
diminator
b4c7b864fd check if piece exists in props in wallet details 2015-09-22 09:20:10 +02:00
diminator
904793269b refactored detail page for wallets 2015-09-21 18:04:15 +02:00
diminator
c837890895 Merge remote-tracking branch 'remotes/origin/AD-1029-add-filter-for-submitted-accepte' into AD-943-add-custom-additional-fields 2015-09-21 16:51:28 +02:00
diminator
a4fe0417c3 refactored and adapted for cyland 2015-09-21 16:47:29 +02:00
Tim Daubenschütz
bd99adf4c9 add componentWillReceiveProps in ikono piece detail again 2015-09-21 16:25:28 +02:00
vrde
865c21557c Add style for buttons 2015-09-21 16:23:18 +02:00
diminator
fdbae0316f filter for submitted and accepted on ikonotv 
MIGRATE AND
./manage.py loaddata whitelabel/fixtures/settings.json
 2015-09-21 16:14:39 +02:00
Tim Daubenschütz
6102ed3bb4 update react textarea autosize 2015-09-21 16:10:25 +02:00
Tim Daubenschütz
04e331f4e5 hide additional files when not defined and already loaned to whitelabel customer 2015-09-21 15:57:27 +02:00
Tim Daubenschütz
6c2bb041f9 finalize whitelabel custom fields 2015-09-21 15:46:24 +02:00
Tim Daubenschütz
c756024702 Add whitelabel tailored extra_data forms to piece detail 2015-09-21 15:08:24 +02:00
Tim Daubenschütz
652df66cb3 Fix some issues with smelly code 2015-09-21 14:22:52 +02:00
Tim Daubenschütz
8a6674509c Merge branch 'AD-943-add-custom-additional-fields' of bitbucket.org:ascribe/onion into AD-943-add-custom-additional-fields 2015-09-21 12:05:53 +02:00
Tim Daubenschütz
c00e003aeb refactor input textarea to use disabled instead of editable 2015-09-21 12:05:42 +02:00
diminator
92f543490e buttonlink style 2015-09-21 11:26:36 +02:00
diminator
a8976ca54a Merge remote-tracking branch 'remotes/origin/AD-996-add-action-buttons-to-piece-detai' into AD-943-add-custom-additional-fields 2015-09-21 11:08:05 +02:00
Tim Daubenschütz
3cbcfc17a3 Merge branch 'AD-943-add-custom-additional-fields' of bitbucket.org:ascribe/onion into AD-943-add-custom-additional-fields 2015-09-21 10:57:19 +02:00
Tim Daubenschütz
0819724a10 probably fix dispatch.dispatch error + showing wrong piece data bug 2015-09-21 10:57:10 +02:00
diminator
ec0208358d added appendix 2015-09-21 10:54:13 +02:00
diminator
2486158c12 .required => .isRequired 2015-09-21 10:47:24 +02:00
diminator
9d67d046d0 fix currentUser bug 2015-09-21 10:32:35 +02:00
diminator
9bfd50e3bc Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields 
Conflicts:
	js/components/signup_container.js
	js/components/whitelabel/wallet/components/ikonotv/ikonotv_landing.js
 2015-09-21 10:21:44 +02:00
Tim Daubenschütz
7b7250db24 Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra 2015-09-18 16:21:03 +02:00
Tim Daubenschütz
afef1214f0 contract expandedDefault to false 2015-09-18 16:04:48 +02:00
Tim Daubenschütz
7482c3f448 add user endpoint to cyland 2015-09-18 15:51:15 +02:00
vrde
94568934ea Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-999-style-login-and-signup-forms 2015-09-18 15:43:44 +02:00
vrde
004aa16b3f Merge branch 'master' into AD-456-ikonotv-branded-page-for-registra 2015-09-18 15:43:30 +02:00
vrde
2ba7eac191 Add "already a user" link from signup to login 2015-09-18 15:40:06 +02:00
vrde
7be3c8b469 Add style for signup and login 2015-09-18 15:36:01 +02:00
Tim Daubenschütz
eb43b18167 make remove in ContractSettings a secondary action 2015-09-18 15:22:57 +02:00
TimDaubenschuetz
26321571cb Merged in AD-984-disable-contracts-for-regular-asc (pull request #64) 
acl on contract settings
 2015-09-18 15:20:08 +02:00
Tim Daubenschütz
63b375ade6 fix separation 2015-09-18 15:17:24 +02:00
TimDaubenschuetz
4f55c63cf5 Merged in AD-997-prepare-landing-page (pull request #67) 
Finish styling for landing page
 2015-09-18 14:54:11 +02:00
Tim Daubenschütz
e05249eacb WIP fix wrong input fields bug 2015-09-18 14:50:08 +02:00
vrde
03803ca61a Add active routes as css classes 2015-09-18 14:25:31 +02:00