Tim Daubenschütz
ac07107210
Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark
...
Conflicts:
js/constants/application_constants.js
js/utils/requests.js
2015-11-16 16:38:35 +01:00
Tim Daubenschütz
da73d40fd6
Merge branch 'master' into AD-1264-refactor-reacts3fineuploader-to-
...
Cleared all conflicts
Conflicts:
js/components/ascribe_forms/form.js
js/components/ascribe_forms/input_fineuploader.js
js/components/ascribe_uploader/react_s3_fine_uploader.js
js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
js/utils/requests.js
2015-11-16 15:27:00 +01:00
Brett Sun
85eb45b5cd
Add small changes for previous merges that were missed
2015-11-04 00:41:12 +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
fe4e337690
Use Object.assign() instead of writing own merge function
2015-11-02 18:27:45 +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
984761a386
Remove stopPropagation for event in FileDragAndDrop
2015-10-13 16:12:05 +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
dbd0e14a64
add DELETE http support to form
2015-08-06 10:09:25 +02:00
Tim Daubenschütz
a199fd08c1
replace es6-promise with Q
2015-07-24 13:44:28 +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
Tim Daubenschütz
263a7b2676
fix error throwing in requests
2015-07-17 16:23:25 +02:00
Tim Daubenschütz
f215026f8b
better error messages for API failures
2015-07-17 16:12:24 +02:00
Tim Daubenschütz
af42bb8e67
error handling first cut
2015-07-17 15:41:09 +02:00
Tim Daubenschütz
13e151e83b
add logging and responsive user navigation
2015-07-16 19:12:18 +02:00
Tim Daubenschütz
ee6d2789ed
set csrftokens as constants
2015-07-16 18:17:45 +02:00
Tim Daubenschütz
5a0663ea14
unshare and delete functionality + store updates for all views
2015-07-14 16:29:01 +02:00
diminator
18f3b51153
fineuploader session with cors
2015-07-02 11:54:33 +02:00
Tim Daubenschütz
929c694ad7
finalized delete functionality
2015-06-30 17:57:20 +02:00
ddejongh
23190f6c48
signup/login
2015-06-20 16:43:18 +02:00
vrde
bd2be63341
Fix empty X-CSRFToken bug
2015-06-16 19:28:21 +02:00
ddejongh
1ecd579718
Merge remote-tracking branch 'remotes/origin/master' into AD-44-in-piece-detail-support-public-not
...
Conflicts:
js/utils/requests.js
2015-06-16 14:06:35 +02:00
vrde
03f09b8c83
Rename fetch to requests to avoid name clashing
2015-06-16 13:48:48 +02:00
vrde
ed3adf8f67
Rename fetch to requests to avoid name clashing
2015-06-16 13:48:33 +02:00
