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
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
vrde
004aa16b3f
Merge branch 'master' into AD-456-ikonotv-branded-page-for-registra
2015-09-18 15:43:30 +02:00
Tim Daubenschütz
e05249eacb
WIP fix wrong input fields bug
2015-09-18 14:50:08 +02:00
Tim Daubenschütz
2cbf7d0095
Implement PR Feedback
2015-09-18 14:12:50 +02:00
diminator
2bd148407b
Merge remote-tracking branch 'origin/AD-943-add-custom-additional-fields' into AD-943-add-custom-additional-fields
2015-09-17 14:22:19 +02:00
diminator
ff163df61e
PR update
2015-09-17 14:20:46 +02:00
Tim Daubenschütz
780ab9f7f1
Cleanup window.setTimeout
2015-09-17 13:28:59 +02:00
diminator
63fffc2132
PR comments fix
2015-09-17 11:39:55 +02:00
Cevo
cf39b1e708
min year changed to 1
2015-09-17 11:17:47 +02:00
diminator
5c2ec3ffb0
bug fix signup query
...
landing page redirect
ikono: user acl proxy on submit button
ikono: further details + slides
2015-09-16 23:27:38 +02:00
diminator
a85447e94c
bug fix user token on signup/login
2015-09-16 19:00:59 +02:00
diminator
b24d4608dd
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-943-add-custom-additional-fields
2015-09-16 15:59:07 +02:00
Tim Daubenschütz
7c376b7229
PR Feedback: add getLangText and move itemLimit and sizeLimit to app constants
2015-09-16 15:14:08 +02:00
diminator
d6bd4b4ac1
bug fix acl button
...
form copyright association + account settings
bug fix dispatch in form loan
ikonotv slides
2015-09-16 14:07:13 +02:00
Tim Daubenschütz
f0936b9074
Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-957-custom-upload-button-for-contract
2015-09-15 17:19:50 +02:00
Tim Daubenschütz
2656bdac14
correct query parameters for contract list request
2015-09-15 17:18:38 +02:00
Tim Daubenschütz
497a330e1a
Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-957-custom-upload-button-for-contract
2015-09-15 13:56:31 +02:00
diminator
4ae137ee9e
Merged in AD-924-apply-contractagreements-to-loan- (pull request #57 )
...
Ad 924 apply contractagreements to loan
2015-09-15 13:43:21 +02:00
diminator
06f5b61cad
reset agreements on mount of loan_form
2015-09-15 13:37:18 +02:00
Tim Daubenschütz
ab1cab2091
Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra
...
Clear some merge conflicts and also some wrong merges.
BAD GIT!!!
Conflicts:
js/components/ascribe_forms/property.js
js/components/ascribe_uploader/react_s3_fine_uploader_utils.js
sass/ascribe_uploader.scss
2015-09-15 13:30:24 +02:00
diminator
71f94768d9
fix PR comments
2015-09-15 13:22:52 +02:00
Tim Daubenschütz
c5ef3cacd5
add ContractSettingsUpdateButton boilerplate code
2015-09-15 11:50:23 +02:00
Tim Daubenschütz
280f3bc73a
Add input filter for specific file extensions to react fineuploader
2015-09-15 10:15:56 +02:00
diminator
0ce298879b
fixed tests
...
refactored contractagreement actions
2015-09-14 17:53:50 +02:00
Tim Daubenschütz
209d141939
extend fileClassToUpload functionality and implement it in contract settings
2015-09-14 17:02:47 +02:00
Tim Daubenschütz
d47ead1bff
add fileclassToUpload to react fineuploader
2015-09-14 16:33:32 +02:00
Tim Daubenschütz
6c713714ec
make contract creation implicit
2015-09-14 16:15:01 +02:00
Tim Daubenschütz
73c2a7c544
rename fineuploader's submitKey method to submitFile
2015-09-14 14:46:03 +02:00
Tim Daubenschütz
f78dbf9e1a
Merge remote-tracking branch 'origin/master' into AD-887-list-contracts-in-settings
...
Conflicts:
js/components/ascribe_forms/property.js
2015-09-14 14:23:36 +02:00
diminator
7fd5516b79
contract, contractagreement migration
...
contractagreement added to loanpiece
2015-09-14 14:16:53 +02:00
Tim Daubenschütz
e087e9f332
PR Feedback: Provide source for types, change function validation, fix bool statement in Property.js
2015-09-14 11:36:24 +02:00
Tim Daubenschütz
356483f9ca
Fix bug for resetting non-native HTML inputs in form
2015-09-14 10:49:45 +02:00
diminator
ef22707680
create public agreement
2015-09-11 18:23:31 +02:00
Tim Daubenschütz
c8ece4c532
refactor contract creation form
2015-09-11 10:11:07 +02:00
diminator
23eb3a7fd9
Fetch contractagreements, order them and filter by accepted or pending
...
Merge remote-tracking branch 'remotes/origin/AD-885-convert-roles-to-acls' into AD-924-apply-contractagreements-to-loan-
Conflicts:
ownership/serializers.py
2015-09-10 20:20:42 +02:00
diminator
01ebee87ec
form loan edit
2015-09-10 17:46:50 +02:00
diminator
6013303bd6
Merge remote-tracking branch 'remotes/origin/master' into AD-456-ikonotv-branded-page-for-registra
...
Conflicts:
js/components/ascribe_buttons/button_submit_close.js
js/components/ascribe_forms/form_loan.js
js/components/ascribe_forms/form_register_piece.js
sass/ascribe_media_player.scss
sass/main.scss
2015-09-10 17:45:51 +02:00
Tim Daubenschütz
b5e5102ea4
replace in keyword with dot notation checking
2015-09-10 14:00:59 +02:00
Tim Daubenschütz
5588f766c1
add reset functionality for InputDate and LoanForm
2015-09-10 13:24:32 +02:00
Tim Daubenschütz
9297f804fe
reset method for property collapsible
2015-09-10 11:35:39 +02:00
Tim Daubenschütz
1d184973f4
reset method for react s3 fineuploader
2015-09-10 11:22:42 +02:00
Tim Daubenschütz
c3b71b5398
WIP: make fineuploader an input
2015-09-10 10:51:47 +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
diminator
17f7be9257
contract list make public
2015-09-09 11:11:16 +02:00
diminator
e892becc50
contract settings update
2015-09-08 14:43:06 +02:00
diminator
9ad713f781
merge 456
2015-09-08 14:42:51 +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
2c1ad6dc46
fix bug in contract settings and expand actionpanel functionality
2015-09-08 11:19:11 +02:00
diminator
06ce603c44
list only is_active
2015-09-08 11:01:43 +02:00
diminator
9b7a69bc20
contract agreement notifications
2015-09-04 11:49:55 +02:00
diminator
6a1f58fdb4
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-883-show-notificationsrequests-on-col
2015-09-03 17:37:40 +02:00
diminator
73ee0753c1
refactored notifications per detail
2015-09-03 17:25:22 +02:00
Tim Daubenschütz
85efa4b416
Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra
2015-09-04 15:55:07 +02:00
Cevo
5265332901
Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra
2015-09-03 15:53:22 +02:00
Cevo
d2f8b658af
contract listing being done
2015-09-03 15:53:02 +02:00
diminator
9334251fd3
notifications on piece details (www, ikono, cyland) and edition details
2015-09-03 15:17:12 +02:00
diminator
7f39c62130
create contract and agreement
2015-09-02 16:34:43 +02:00
diminator
19726560ba
bitbucket test
2015-09-02 14:39:32 +02:00
diminator
07ce180ff7
contract form POST
2015-09-02 13:57:41 +02:00
diminator
92971a9f62
Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-883-show-notificationsrequests-on-col
...
Conflicts:
sass/ascribe_accordion_list.scss
2015-09-02 10:50:33 +02:00
diminator
bf5d1de635
update notification on request action
2015-09-01 19:14:48 +02:00
Tim Daubenschütz
9d7b5cbe2a
advance create contract form
2015-09-01 16:57:12 +02:00
Tim Daubenschütz
b4abe7a245
generic form submission determination for fineuploader
2015-09-01 14:42:09 +02:00
Tim Daubenschütz
96fdb598f7
change api endpoints to contractblobs
2015-08-31 17:29:43 +02:00
Tim Daubenschütz
dd20afff90
rename LoanContract to Contract
2015-08-28 16:18:10 +02:00
Tim Daubenschütz
d9f3f2a9d7
rename contract_form to form_contract
2015-08-28 15:55:39 +02:00
Tim Daubenschütz
8eec5d8f38
Merge branch 'AD-863-acl-forms-prefil-email-address-an' into AD-456-ikonotv-branded-page-for-registra
2015-08-28 12:44:02 +02:00
Tim Daubenschütz
9a9aa68ca9
fix lazy evalutaion of loan form
2015-08-28 11:13:28 +02:00
Tim Daubenschütz
86efb66663
add collapsible appendix to send contract form
2015-08-27 17:33:51 +02:00
Tim Daubenschütz
65148e24de
remove contract form from ikonotv codebase and integrate it into ascribe-core
2015-08-27 14:56:49 +02:00
diminator
bc28f3d8f5
loan request actions for multiple actions
2015-08-27 13:43:26 +02:00
diminator
79106dd106
loan request + answer complete
2015-08-27 11:38:21 +02:00
diminator
33d5480f2f
review comments
2015-08-27 10:10:39 +02:00
Tim Daubenschütz
b4f68f23e8
update react-datepicker DO NPM INSTALL
2015-08-26 18:03:58 +02:00
Tim Daubenschütz
6028812128
adjust loan form to disable dates
2015-08-26 18:01:50 +02:00
Tim Daubenschütz
e473b4c779
fix invariant violation
2015-08-26 17:32:42 +02:00
diminator
c64aae332d
Merge remote-tracking branch 'remotes/origin/AD-862-remove-confusion-introduced-in-prev-update' into AD-661-due-1208-implement-jury-rating-an
2015-08-26 16:54:41 +02:00
diminator
6530149971
problem with loanForm
2015-08-26 16:34:41 +02:00
diminator
ab97fa420c
loan request with moment
...
shortlist on accordeonlist OK
2015-08-26 15:46:27 +02:00
Tim Daubenschütz
1f8c8a7d9e
(hopefully) fix auto-fill bug for safari/chrome
2015-08-26 15:41:59 +02:00
diminator
e3b85bf808
removed loadPieceList from shortlist in detail
2015-08-26 12:51:25 +02:00
diminator
b2fed6426f
loan request up till accept
2015-08-26 09:50:38 +02:00
diminator
440dcd9785
Merge branch 'AD-846-loan-request-action-panel-on-piec' into AD-613-cyland-white-label-page
2015-08-24 11:36:30 +02:00
Tim Daubenschütz
d05662b879
fix PR issues
2015-08-24 11:22:44 +02:00
diminator
3b27238adf
request form on piece level
...
bug fix cyland piece endpoint
bug fix otherDataUploader editable
2015-08-24 10:48:40 +02:00
Tim Daubenschütz
116cb9c2fc
fix disappearing fineuploader in additional data
2015-08-21 14:07:10 +02:00
Tim Daubenschütz
5acce27df2
Merge branch 'AD-613-cyland-white-label-page' of bitbucket.org:ascribe/onion into AD-613-cyland-white-label-page
2015-08-21 11:35:00 +02:00
Tim Daubenschütz
e0b2f352df
fix locked fields
2015-08-21 11:29:57 +02:00
Tim Daubenschütz
30d57a943f
fix lock form
2015-08-21 11:01:13 +02:00
diminator
433703a470
moved terms
2015-08-21 10:54:57 +02:00
Tim Daubenschütz
5d4762f942
fix lock functionality bug
2015-08-20 11:03:00 +02:00
Tim Daubenschütz
215f251845
enable overriding of editable prop for property
2015-08-19 18:09:37 +02:00
Tim Daubenschütz
495f5600af
implement form locking for cyland
2015-08-19 17:39:25 +02:00
Tim Daubenschütz
862cd7986c
add lock/disabled functionality to form
2015-08-19 17:06:14 +02:00
Tim Daubenschütz
3475d07cee
Revert "form validation first cut"
...
Tim:
I reverted this commit because I want to keep if for later.
We decided to do so because we're of the opinion validation is not a pressing issue right now.
This reverts commit 8a814c287c
2015-08-19 16:03:59 +02:00
