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
Tim Daubenschütz
8a814c287c
form validation first cut
2015-08-18 17:57:14 +02:00
Tim Daubenschütz
ad8be7e34a
separate pre-sending form submission functionality
2015-08-18 13:15:22 +02:00
Tim Daubenschütz
0cf5815f42
add functionality to make a forwarded process slide container
2015-08-12 16:11:15 +02:00
Tim Daubenschütz
d3bf990ca5
adjust props
2015-08-12 14:40:44 +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
9630d043db
first slide cyland archive submission
2015-08-12 09:52:51 +02:00
Tim Daubenschütz
8612f73e96
separate cc register form
2015-08-12 09:30:24 +02:00
Tim Daubenschütz
d12dc4dab2
remove deprecated collapsible mixin
2015-08-10 14:42:38 +02:00
Tim Daubenschütz
ada07e707e
switch action wording
2015-08-10 14:20:26 +02:00
Tim Daubenschütz
5be771f6ac
add inline property to form
2015-08-10 14:15:32 +02:00
Tim Daubenschütz
4b8987dc7c
add urls
2015-08-10 14:07:23 +02:00
Tim Daubenschütz
3137583b0f
adjust button choose logic
2015-08-10 14:06:01 +02:00
Tim Daubenschütz
d968f02b59
refactor request action form
2015-08-10 11:57:38 +02:00
Tim Daubenschütz
3ff401904b
fix submit to prize button
2015-08-10 10:10:43 +02:00
Tim Daubenschütz
b70eb23dc0
refactor action panel: mostly css and layout
2015-08-10 09:22:39 +02:00
Tim Daubenschütz
3afb036f24
rename apiUrls to ApiUrls
2015-08-07 15:08:02 +02:00
Tim Daubenschütz
8f9c699b69
Merge branch 'master' into AD-716-aclbutton-doesnt-respect-modals-r
...
Conflicts:
js/components/ascribe_buttons/submit_to_prize_button.js
js/components/ascribe_forms/form.js
js/components/ascribe_forms/form_loan.js
2015-08-07 14:10:05 +02:00
Tim Daubenschütz
158f91f3f2
Merge branch 'master' of bitbucket.org:ascribe/onion
2015-08-06 15:15:19 +02:00
Tim Daubenschütz
dfbc7b75fe
fix loan form
2015-08-06 15:14:50 +02:00
diminator
99ea0e1af8
action-panel WIP
2015-08-06 13:56:37 +02:00
Tim Daubenschütz
04c406a288
minor changes
2015-08-06 10:58:09 +02:00
Tim Daubenschütz
3624ae874f
refactor form_remove_piece_from_collection
2015-08-06 10:42:12 +02:00
Tim Daubenschütz
0eb10c6c4b
refactor form_remove_editions_from_collection
2015-08-06 10:31:51 +02:00
Tim Daubenschütz
68f4decaad
remove FormPropertyHeader
2015-08-06 10:23:01 +02:00
Tim Daubenschütz
a3bfda186a
refactor form_delete_piece
2015-08-06 10:15:02 +02:00
Tim Daubenschütz
dbd0e14a64
add DELETE http support to form
2015-08-06 10:09:25 +02:00
diminator
18c7e2bc93
invite user with token and signup without email validation
2015-08-05 19:22:58 +02:00
Tim Daubenschütz
d66549478f
WIP: Refactor delete editions form
2015-08-05 18:14:49 +02:00
Tim Daubenschütz
1ae77d5157
remove close button from modals
2015-08-05 18:00:44 +02:00
Tim Daubenschütz
4c88f88d56
first cut porting and using new react-bootstrap version
2015-08-05 17:32:35 +02:00
diminator
36356dd5c5
Merge remote-tracking branches 'remotes/origin/AD-391-add-filter-functions-to-pieces-an', 'remotes/origin/AD-589-Form-Cancel-doesnt-reset' and 'remotes/origin/AD-619-due-1208-create-jury-dashboard' into AD-686-in-sluice-art-prize-i-can-submit-
2015-08-05 14:52:18 +02:00
diminator
6ab5bec8d3
WIP prize settings for admin
2015-08-05 14:40:26 +02:00
Tim Daubenschütz
f134ca29d6
fix property reset function
2015-08-05 13:42:53 +02:00
Tim Daubenschütz
c9042a0934
delete password of user when submitting to sentry
2015-08-03 10:41:51 +02:00
diminator
bab29d6ffa
Merge remote-tracking branch 'remotes/origin/AD-435-hash-locally-for-when-a-artist-do'
...
Conflicts:
js/components/ascribe_forms/form_loan.js
2015-07-29 15:55:16 +02:00
diminator
f5732661bd
subdomain-dependent localhashing
2015-07-29 15:22:30 +02:00
Tim Daubenschütz
b0d3213816
add flushLoanContract logic
2015-07-29 15:03:15 +02:00
diminator
f4ccd417fc
loan form styling
2015-07-29 14:49:36 +02:00
Tim Daubenschütz
8da71d0229
make term components unique in loan form
2015-07-29 14:46:33 +02:00
Tim Daubenschütz
76cf9fd74d
Merge branch 'AD-435-hash-locally-for-when-a-artist-do'
...
Conflicts:
js/components/ascribe_forms/form_register_piece.js
js/components/ascribe_slides_container/slides_container.js
js/components/ascribe_uploader/file_drag_and_drop.js
js/components/ascribe_uploader/react_s3_fine_uploader.js
2015-07-29 09:35:14 +02:00
Tim Daubenschütz
390e5d51e9
advanced error logging for register piece
2015-07-28 17:45:05 +02:00
TimDaubenschuetz
78049b448e
Merged in AD-598-register-action-switches (pull request #14 )
...
Ad 598 register action switches
2015-07-28 16:36:57 +02:00
Tim Daubenschütz
8868842817
react fineuploader remove multiple property
2015-07-28 16:30:50 +02:00
Tim Daubenschütz
4c99632616
remove form console.log
2015-07-28 15:49:08 +02:00
Tim Daubenschütz
bd28450619
add documentation for input checkbox
2015-07-28 15:46:55 +02:00
Tim Daubenschütz
bb11bbc6e4
Fix all instances of input checkbox
2015-07-28 15:33:47 +02:00
diminator
232991b566
removed signup terms default false
2015-07-28 12:13:19 +02:00
diminator
3031fcdbe1
Merge remote-tracking branch 'remotes/origin/AD-606-login-returns-this-field-may-not-' into AD-435-hash-locally-for-when-a-artist-do
...
Conflicts:
js/components/ascribe_forms/input_checkbox.js
js/components/ascribe_forms/property.js
2015-07-28 12:11:48 +02:00
Tim Daubenschütz
09ce4de29d
refactor input checkbox
2015-07-28 12:03:45 +02:00
diminator
c5072164eb
Merge remote-tracking branch 'origin/AD-435-hash-locally-for-when-a-artist-do' into AD-435-hash-locally-for-when-a-artist-do
2015-07-28 11:32:31 +02:00
diminator
2cece3ce33
inputcheckbox defaultvalue WIP
2015-07-28 11:32:16 +02:00
Tim Daubenschütz
b530018dda
remove unused components
2015-07-28 11:06:19 +02:00
Tim Daubenschütz
828d24044b
Integrate hashing setting in uploader
2015-07-28 10:05:31 +02:00
Tim Daubenschütz
d52a89cd3e
only display hashing toggle on user permissions
2015-07-27 15:34:45 +02:00
diminator
1504a5b20d
inputcheckbox and terms checking
2015-07-27 14:39:19 +02:00
Tim Daubenschütz
4ec8f6b718
add file hashing functionality to react fine uploader
2015-07-23 16:47:32 +02:00
diminator
1b7b344605
solves the issue for textarea_toggable
...
couldnt reproduce login
2015-07-22 17:12:46 +02:00
diminator
e060d39486
solves the issue for textarea_toggable
...
couldnt reproduce login
2015-07-22 17:12:00 +02:00
Tim Daubenschütz
550a2d9e58
Property:
...
- update initialValue when Property has been save successfully to enable consecutive cancel + save actions
Private Note:
- Made private note non-required
2015-07-21 16:23:50 +02:00
Tim Daubenschütz
7daef3b082
small fix and more comments
2015-07-21 15:30:00 +02:00
Tim Daubenschütz
20a83167ab
slide container works now with browser history
2015-07-21 15:05:42 +02:00
Tim Daubenschütz
23e6cc17b2
make dropzone inactive when user is logged out
2015-07-21 11:09:21 +02:00
Tim Daubenschütz
efd329c44c
patch logout behavior
2015-07-17 18:53:04 +02:00
Tim Daubenschütz
55058b8b34
fix form error handling
2015-07-17 16:44:24 +02:00
Tim Daubenschütz
2ff47ede89
replace console logs with global logging
2015-07-17 15:52:53 +02:00
Tim Daubenschütz
ee6d2789ed
set csrftokens as constants
2015-07-16 18:17:45 +02:00
Tim Daubenschütz
943c7503ea
fix edition creation display bug on piece detail
2015-07-16 11:39:05 +02:00
vrde
3a64f1b180
Remove console log
2015-07-15 18:55:02 +02:00
diminator
a0e6e0c5a4
Merge branch 'AD-419-decouple-piece-registration-from-'
2015-07-15 18:01:38 +02:00
Tim Daubenschütz
c2ce0b9d05
load fix
2015-07-15 17:57:28 +02:00
diminator
58294687f9
fix acl and editions
2015-07-15 17:51:09 +02:00
diminator
7c546edc2b
fix acl and editions
2015-07-15 17:33:38 +02:00
vrde
d4bb23467e
Fix link to terms
2015-07-15 16:57:41 +02:00
Tim Daubenschütz
1509c520a4
finalizing loan form
2015-07-15 14:48:51 +02:00
Tim Daubenschütz
81aeb478b7
Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-499-whitelabel-prize-with-sluice-as-k
2015-07-15 14:06:03 +02:00
Tim Daubenschütz
795a268184
loan form styling and loan contract store
2015-07-15 14:03:23 +02:00
diminator
d03f98af76
loan url
2015-07-15 14:02:33 +02:00
Tim Daubenschütz
e3e8f088c7
add licences for cc
2015-07-15 11:28:53 +02:00
diminator
d97b219c2d
licenses
2015-07-15 01:35:12 +02:00
Tim Daubenschütz
0351b6fce4
remove id from submission
2015-07-15 00:59:22 +02:00
Tim Daubenschütz
ebfd4339ab
change prize submission to new backend route
2015-07-15 00:57:31 +02:00
Tim Daubenschütz
07f4cdd2e1
advance prize submission form
2015-07-15 00:52:16 +02:00
Tim Daubenschütz
0b9383576c
Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k' of bitbucket.org:ascribe/onion into AD-499-whitelabel-prize-with-sluice-as-k
2015-07-15 00:41:04 +02:00
Tim Daubenschütz
5e90f3cac7
remove buggy close button
2015-07-15 00:40:51 +02:00
vrde
45a49cafe9
Fix bug with getLangText
2015-07-15 00:37:45 +02:00
Tim Daubenschütz
56389a542e
override api_urls and fix wording
2015-07-15 00:14:17 +02:00
Tim Daubenschütz
188f8ebf9c
Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k' of bitbucket.org:ascribe/onion into AD-499-whitelabel-prize-with-sluice-as-k
2015-07-14 23:54:00 +02:00
Tim Daubenschütz
07dce25fe7
add functionality for submit to prize button and fix delete button
2015-07-14 23:53:49 +02:00
vrde
d093fe013c
Add awful hack to handle redirect on login and collection pages
2015-07-14 23:11:23 +02:00
Tim Daubenschütz
f8b87a8849
finish register artwork for prize
2015-07-14 20:35:16 +02:00
Tim Daubenschütz
18898b6f8a
start working on register piece for price - WIP
2015-07-14 20:07:55 +02:00
Tim Daubenschütz
aa5934cd25
made inputcheckbox component generic
2015-07-14 19:53:49 +02:00
diminator
982b701a5c
Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-419-decouple-piece-registration-from-
...
Conflicts:
js/components/ascribe_detail/edition.js
2015-07-14 17:45:39 +02:00
diminator
9fa9db8352
consign/unconsign
2015-07-14 17:42:15 +02:00
Tim Daubenschütz
5a0663ea14
unshare and delete functionality + store updates for all views
2015-07-14 16:29:01 +02:00
Tim Daubenschütz
adf4630efd
Merge branch 'AD-419-decouple-piece-registration-from-' of bitbucket.org:ascribe/onion into AD-419-decouple-piece-registration-from-
...
Conflicts:
js/components/ascribe_table/table_item_acl_filtered.js
2015-07-14 14:46:30 +02:00
diminator
f6be4a2922
consign WIP
2015-07-14 14:16:51 +02:00
Tim Daubenschütz
373aa89041
fix bulk action refresh bug and add better feedback for edition creation
2015-07-14 13:58:33 +02:00
diminator
7a699d7cb8
Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-419-decouple-piece-registration-from-
2015-07-14 11:42:32 +02:00
diminator
e0eb31d1de
transfer + withdraw
2015-07-14 11:42:09 +02:00
Tim Daubenschütz
6bf28dbfa4
fix specify editions in register piece
2015-07-14 10:17:12 +02:00
diminator
3cc95cf7d5
acl WIP
2015-07-14 00:56:23 +02:00
diminator
1b3f614c80
Merge remote-tracking branch 'remotes/origin/master' into AD-419-decouple-piece-registration-from-
2015-07-13 23:59:07 +02:00
diminator
9a7bf46675
acl WIP
2015-07-13 23:57:16 +02:00
diminator
a985fb855e
acl WIP
2015-07-13 23:56:55 +02:00
vrde
19f82b2bbd
work on register piece for for prize
2015-07-13 22:58:53 +02:00
Tim Daubenschütz
60600a72d4
refactor bulk acls for backend adjustment
2015-07-13 21:19:45 +02:00
vrde
7aea6669c9
Refactor login and signup
2015-07-13 20:47:43 +02:00
vrde
3f0cdbad06
Merge branch 'AD-419-decouple-piece-registration-from-' into AD-565-add-landing-page-for-sluice
2015-07-13 20:02:42 +02:00
vrde
4af174dffb
Work on signup/login
2015-07-13 19:53:16 +02:00
Tim Daubenschütz
6e1cf55841
Merge branch 'AD-419-decouple-piece-registration-from-' of bitbucket.org:ascribe/onion into AD-419-decouple-piece-registration-from-
...
Conflicts:
js/components/ascribe_accordion_list/accordion_list_item_create_editions.js
2015-07-13 18:54:06 +02:00
Tim Daubenschütz
463f205a6e
finalized: separation of edition creation and edition form
2015-07-13 18:52:55 +02:00
diminator
1f73811950
register form separate
...
spinner => spans
2015-07-13 18:13:47 +02:00
Tim Daubenschütz
85ba816a53
separate polling-success functionality
2015-07-13 18:13:16 +02:00
Tim Daubenschütz
e71c2f9fe0
separate create edition form logic
2015-07-13 17:09:44 +02:00
vrde
232a4ede92
Add form_login
2015-07-13 16:59:12 +02:00
vrde
db1c6a530a
Refactor login/signup containers
2015-07-13 16:57:25 +02:00
diminator
a07bc9e0e2
piece + share
...
acl first cut
2015-07-13 14:10:46 +02:00
diminator
88ff4b55d6
acl buttons and share forms for pieces/editions
2015-07-10 20:00:35 +02:00
diminator
62289be5ce
polling for editions
2015-07-10 18:51:35 +02:00
diminator
e282da8474
Merge remote-tracking branch 'remotes/origin/AD-551-work-on-burn-down-list' into AD-419-decouple-piece-registration-from-
2015-07-10 17:52:39 +02:00
Tim Daubenschütz
e55bc239b4
refactor signup form
2015-07-10 16:04:57 +02:00
Tim Daubenschütz
b364414e16
input checkbox functionality
2015-07-10 15:56:54 +02:00
diminator
8679a2446d
Merge remote-tracking branch 'remotes/origin/AD-551-work-on-burn-down-list' into AD-419-decouple-piece-registration-from-
2015-07-10 14:49:19 +02:00
Tim Daubenschütz
62ae8fd08b
fix warnings
2015-07-10 14:15:22 +02:00
