Brett Sun
85eb45b5cd
Add small changes for previous merges that were missed
2015-11-04 00:41:12 +01:00
Brett Sun
cd6673f255
Merge with AD-1264
2015-11-03 11:34:48 +01:00
Brett Sun
f7259a8ab3
Merge with AD-1255
2015-11-03 11:13:32 +01:00
Tim Daubenschütz
c6f6bb398d
Replace all occurrences of with momentjs
2015-11-03 10:57:41 +01:00
Brett Sun
d2529bf015
Merge with master
2015-11-03 10:39:01 +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
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
Brett Sun
7746241a59
Fix getLangText() when using multiple placeholders
2015-11-02 15:21:27 +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
Brett Sun
7e1f6a382a
Remove unnecessary import from form utils
2015-10-30 11:16:44 +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
Tim Daubenschütz
eba9023efc
From dom_utils.js, remove useless 'continue' statement in loop/try-catch
2015-10-29 13:22:10 +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
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
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
Brett Sun
e226477424
Merge with master
2015-10-22 14:18:23 +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
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
Brett Sun
de3c5bca14
Correct misleading comments in utils
2015-10-22 11:12:41 +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
vrde
e220ee6fbb
Merge branch 'AD-697-update-title-in-the-browser'
2015-10-20 15:06:41 +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
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
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
Cevo
0b716cfa19
warn added
2015-10-16 11:30:45 +02:00
Tim Daubenschütz
d77bdb25a5
Cleanup code
2015-10-15 11:17:16 +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
Tim Daubenschütz
8b23a9c74f
Introduce draganddrop feature detection and add it to FileDragAndDropDialog
2015-10-14 17:19:01 +02:00
diminator
317d2611ba
spinners part2
...
scrollbar
uploader styles
property blur
2015-10-14 16:17:10 +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
66dbf3da71
Add document title management for the ascribe app
2015-10-13 16:42:40 +02:00
Tim Daubenschütz
984761a386
Remove stopPropagation for event in FileDragAndDrop
2015-10-13 16:12:05 +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
diminator
6175775503
property blur refactor
2015-10-12 17:59:45 +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
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
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
Cevo
f5a37ab4a9
browser title added, setTitle method added to head_setter module in utils
2015-10-07 15:47:54 +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
Tim Daubenschütz
dc6d9160fe
Fix error in AppGateway logic
2015-10-01 16:59:44 +02:00
Tim Daubenschütz
aa908a1c57
PR Feedback: Simplify subdomain extraction
2015-09-30 11:09:04 +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
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
Tim Daubenschütz
9080c84fa9
Implement word wrap for ContractSettings
2015-09-25 11:20:12 +02:00
diminator
1c5b0c7172
only one agreement pending
...
agreement notifications per subdomain (only by whitelabel owner)
2015-09-09 19:29:58 +02:00
diminator
ec2ae39e15
contractagreement with PUT instead of PATCH
2015-09-09 13:53:03 +02:00
Cevo
3e1b362cc0
remove debugged 204 no response comes as error, handled gracefully
2015-09-08 13:08:49 +02:00
Cevo
5b0cbc92ad
create refresh added, conflicts resolved
2015-09-08 11:57:20 +02:00
Cevo
a8fce698a6
createcontract refresh added
2015-09-08 11:53:09 +02:00
Tim Daubenschütz
ba2ebe81fd
code restructuring
2015-09-08 11:44:05 +02:00
Cevo
86306fc089
console.log remove from requests.js
2015-09-07 16:36:31 +02:00
Tim Daubenschütz
8a75e94413
fix bug
2015-09-04 16:24:29 +02:00
Cevo
d2f8b658af
contract listing being done
2015-09-03 15:53:02 +02:00
Tim Daubenschütz
b67466d196
Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra
2015-08-27 14:05:21 +02:00
diminator
b2fed6426f
loan request up till accept
2015-08-26 09:50:38 +02:00
Tim Daubenschütz
cd49a9c402
Create generic links in nav using routes
2015-08-25 16:33:26 +02:00
diminator
411b7cb010
increase otherdata limit to 50MB
2015-08-24 12:11:07 +02:00
Tim Daubenschütz
1620437c86
add defaultValue to inputdate
2015-08-12 13:53:17 +02:00
Tim Daubenschütz
d5dc164810
boilerplate for loan process
2015-08-12 13:34:41 +02:00
Tim Daubenschütz
8ff2dea4df
refactor: acl buttons message functionality
2015-08-10 15:57:20 +02:00
Tim Daubenschütz
dbd0e14a64
add DELETE http support to form
2015-08-06 10:09:25 +02:00
vrde
ef61470b5f
First iteration
2015-07-29 18:00:49 +02:00
diminator
3142e00ea5
Merge remote-tracking branch 'remotes/origin/master' into AD-435-hash-locally-for-when-a-artist-do
2015-07-28 12:13:40 +02:00
vrde
4d93e076df
Add third party modules to handle tracking without polluting the code
2015-07-27 18:06:02 +02:00
Tim Daubenschütz
e53a45822b
simplified error handling in progress routine
2015-07-24 16:29:57 +02:00
Tim Daubenschütz
a7a36589a7
Add abort hashing functionality
2015-07-24 16:17:27 +02:00
Tim Daubenschütz
494ab209ca
implement hashing progress functionality
2015-07-24 14:39:04 +02:00
Tim Daubenschütz
a199fd08c1
replace es6-promise with Q
2015-07-24 13:44:28 +02:00
Tim Daubenschütz
01b34ec1fb
add getLangText for reactfineuploader
2015-07-23 17:17:48 +02:00
Tim Daubenschütz
2f24ad8352
implement feedback for hashing functionalitxy
2015-07-23 17:05:52 +02:00
Tim Daubenschütz
4ec8f6b718
add file hashing functionality to react fine uploader
2015-07-23 16:47:32 +02:00
Tim Daubenschütz
80861813e9
documente and implement routine in react fine uploader
2015-07-23 15:57:25 +02:00
Tim Daubenschütz
33a179cfe2
converte computeHashOfFile to a promise based solution
2015-07-23 15:38:52 +02:00
diminator
0cc48a73e4
moved hashing to file_utils
2015-07-23 13:03:30 +02:00
Tim Daubenschütz
55f00ea0ab
also handle error.detail
2015-07-17 18:10:11 +02:00
Tim Daubenschütz
55058b8b34
fix form error handling
2015-07-17 16:44:24 +02:00