diminator
|
1b335e31a4
|
Merge remote-tracking branch 'remotes/origin/master' into AD-661-due-1208-implement-jury-rating-an
|
2015-08-24 16:45:03 +02:00 |
|
diminator
|
70c39794b4
|
sluice judge + average WIP
|
2015-08-24 15:33:36 +02:00 |
|
Tim Daubenschütz
|
18634ffe50
|
fix additional files button bug
|
2015-08-24 14:16:13 +02:00 |
|
Tim Daubenschütz
|
f54d7bb85c
|
fix validation method
|
2015-08-24 13:57:02 +02:00 |
|
Tim Daubenschütz
|
07ae8cc9bb
|
Merge branch 'AD-613-cyland-white-label-page' of bitbucket.org:ascribe/onion into AD-613-cyland-white-label-page
|
2015-08-24 13:13:08 +02:00 |
|
Tim Daubenschütz
|
c14ab4dcd4
|
fix fineuploader notification bug
|
2015-08-24 13:12:59 +02:00 |
|
diminator
|
b76c752966
|
Merge remote-tracking branch 'remotes/origin/master' into AD-661-due-1208-implement-jury-rating-an
Conflicts:
ownership/test/test_api.py
piece/models.py
|
2015-08-24 12:20:54 +02:00 |
|
diminator
|
411b7cb010
|
increase otherdata limit to 50MB
|
2015-08-24 12:11:07 +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 |
|
diminator
|
54ec829588
|
notes in cyland
|
2015-08-24 11:35:35 +02:00 |
|
Tim Daubenschütz
|
96fe1c69c6
|
Merge branch 'AD-613-cyland-white-label-page' of bitbucket.org:ascribe/onion into AD-613-cyland-white-label-page
|
2015-08-24 11:22:54 +02:00 |
|
Tim Daubenschütz
|
d05662b879
|
fix PR issues
|
2015-08-24 11:22:44 +02:00 |
|
diminator
|
0be6b7f118
|
bug fix loadPiece
|
2015-08-24 11:01:42 +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 |
|
diminator
|
7a09b863b5
|
switch between request action and acl buttons on piece detail page
|
2015-08-21 16:49:04 +02:00 |
|
diminator
|
8b6c5e6e0f
|
username boolean
|
2015-08-21 16:39:06 +02:00 |
|
diminator
|
33cd23d11e
|
getlangtext
|
2015-08-21 16:38:18 +02:00 |
|
diminator
|
f564ce7959
|
Merge remote-tracking branch 'origin/AD-613-cyland-white-label-page' into AD-613-cyland-white-label-page
|
2015-08-21 16:24:22 +02:00 |
|
diminator
|
ea9fb306c4
|
add request action loan to piece
|
2015-08-21 16:22:08 +02:00 |
|
Tim Daubenschütz
|
4dcd66c05b
|
Merge branch 'AD-613-cyland-white-label-page' of bitbucket.org:ascribe/onion into AD-613-cyland-white-label-page
|
2015-08-21 16:14:58 +02:00 |
|
Tim Daubenschütz
|
284919f3db
|
fix bug
|
2015-08-21 16:14:15 +02:00 |
|
diminator
|
edec430109
|
public and private note in edition and piece
connection in frontend
|
2015-08-21 15:04:38 +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
|
09c0451c86
|
Merge branch 'AD-835-make-form-fields-lockable' into AD-613-cyland-white-label-page
Conflicts:
js/components/ascribe_detail/further_details_fileuploader.js
|
2015-08-21 11:34:47 +02:00 |
|
Tim Daubenschütz
|
e0b2f352df
|
fix locked fields
|
2015-08-21 11:29:57 +02:00 |
|
Tim Daubenschütz
|
3b46dbb9f5
|
add upload busy function to fineuploader
|
2015-08-21 11:11:31 +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 |
|
diminator
|
5c6b753acb
|
piece loan history
|
2015-08-20 15:50:30 +02:00 |
|
diminator
|
60db83c626
|
cyland detail subheader
|
2015-08-20 14:18:01 +02:00 |
|
diminator
|
ffdb4847db
|
piece bitcoin id
|
2015-08-20 14:01:02 +02:00 |
|
diminator
|
7afb3d68b8
|
Merge remote-tracking branch 'remotes/origin/AD-835-make-form-fields-lockable' into AD-613-cyland-white-label-page
|
2015-08-20 11:32:27 +02:00 |
|
diminator
|
5b2ab6c1e2
|
bug fix acls
otherdata frontend
MIGRATE + loaddate whitelabel
|
2015-08-20 11:32:11 +02:00 |
|
Tim Daubenschütz
|
5d4762f942
|
fix lock functionality bug
|
2015-08-20 11:03:00 +02:00 |
|
diminator
|
1f1a8b7761
|
bug fix piece loan acl
bug fix piece edit acl
DOUBLE MIGRATE
|
2015-08-19 19:12:30 +02:00 |
|
Tim Daubenschütz
|
12de8139c2
|
separate breadcrumb functionality into own component
|
2015-08-19 18:36:23 +02:00 |
|
Tim Daubenschütz
|
689796b115
|
slidecontainer: display lock on progress
|
2015-08-19 18:23:04 +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 |
|
diminator
|
7e9e187c18
|
bug fix breadcrumbs
bug fix sluice landing page
bug fix sluice register_piece
bug fix ownershiphistory pending
|
2015-08-19 17:18:32 +02:00 |
|
Tim Daubenschütz
|
862cd7986c
|
add lock/disabled functionality to form
|
2015-08-19 17:06:14 +02:00 |
|
diminator
|
b66fdc332d
|
Merge branch 'tmp2' into AD-613-cyland-white-label-page
|
2015-08-19 16:46:07 +02:00 |
|
Tim Daubenschütz
|
d5e8181855
|
make cyland submission stateful
|
2015-08-19 16:02:10 +02:00 |
|
Tim Daubenschütz
|
0b4b3fa727
|
fix slideContainer broken functionality
|
2015-08-19 15:54:13 +02:00 |
|
Tim Daubenschütz
|
8a88f978c6
|
add start_from parameter to slide container
|
2015-08-19 15:30:48 +02:00 |
|
diminator
|
b1703b6284
|
cyland landing
|
2015-08-19 14:48:22 +02:00 |
|
Tim Daubenschütz
|
406cee5bd3
|
refactor breadcrumbs to attributes
|
2015-08-19 14:11:03 +02:00 |
|
diminator
|
6d8d318e8d
|
Merge branch 'tmp2' into AD-456-ikonotv-branded-page-for-registra
|
2015-08-19 13:58:55 +02:00 |
|
Tim Daubenschütz
|
6dab66ec61
|
restructure cyland submit button
|
2015-08-19 13:56:43 +02:00 |
|
diminator
|
b7e81fb0dd
|
cyland landing
|
2015-08-19 13:54:45 +02:00 |
|
diminator
|
188cca4834
|
ikono register
|
2015-08-19 09:31:36 +02:00 |
|
diminator
|
e933b334c2
|
loan contract form
|
2015-08-18 16:24:36 +02:00 |
|
Tim Daubenschütz
|
e88612704f
|
cyland loan form for accordion list
|
2015-08-18 13:39:06 +02:00 |
|
Tim Daubenschütz
|
ad8be7e34a
|
separate pre-sending form submission functionality
|
2015-08-18 13:15:22 +02:00 |
|
diminator
|
e862fa39a9
|
Merge remote-tracking branch 'remotes/origin/AD-803-refactor-acls' into AD-456-ikonotv-branded-page-for-registra
Conflicts:
web/settings.py
|
2015-08-18 12:36:38 +02:00 |
|
diminator
|
8ae7edaa1c
|
ikonotv initial setup
|
2015-08-18 12:08:01 +02:00 |
|
Tim Daubenschütz
|
eb54e6fff6
|
refresh piece list after loan
|
2015-08-18 10:53:50 +02:00 |
|
Tim Daubenschütz
|
6a0a1b1e35
|
Merge branch 'AD-777-fineuploader-needs-to-support-mul' into AD-613-cyland-white-label-page
|
2015-08-18 10:45:57 +02:00 |
|
diminator
|
f77f1d1d5d
|
cyland submit button and form WIP
cyland footers
|
2015-08-18 09:42:28 +02:00 |
|
diminator
|
fc82c866fb
|
cyland refactor
whitelabel + cyland app
|
2015-08-17 20:52:36 +02:00 |
|
diminator
|
0be3e249bb
|
breadcrumb style fix
|
2015-08-17 13:46:04 +02:00 |
|
diminator
|
cf86e352e4
|
slide breadcrumbs
|
2015-08-17 12:18:40 +02:00 |
|
diminator
|
12dde0458c
|
Merge remote-tracking branch 'remotes/origin/master' into AD-613-cyland-white-label-page
|
2015-08-17 09:56:55 +02:00 |
|
diminator
|
5b2e90a03c
|
sorting acl and styling
|
2015-08-14 15:38:30 +02:00 |
|
diminator
|
e843e2fa52
|
order by rating
|
2015-08-14 14:58:23 +02:00 |
|
diminator
|
d24b325062
|
bug fix loadPiece
|
2015-08-13 14:16:44 +02:00 |
|
diminator
|
247cca3ee2
|
piece rating + navigation OK
close prize
|
2015-08-13 13:28:09 +02:00 |
|
Tim Daubenschütz
|
81ff4641c7
|
fix prev and next button for navigationheader
|
2015-08-12 17:30:39 +02:00 |
|
diminator
|
7c0e2312a1
|
revert piece navigation and bug fix in navigation serializer
|
2015-08-12 17:09:48 +02:00 |
|
diminator
|
97c298e304
|
piece navigation prev next WIP
|
2015-08-12 16:47:16 +02:00 |
|
Tim Daubenschütz
|
88423e6757
|
fix scroll overflow
|
2015-08-12 16:26:24 +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 |
|
diminator
|
c25de71b4b
|
notes and bug fixes
|
2015-08-12 13:21:05 +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
|
ac45283968
|
first iteration: whitelabel pages depending on customer
|
2015-08-11 17:40:26 +02:00 |
|
diminator
|
22727c2703
|
refactored piece container and detail
|
2015-08-11 17:12:12 +02:00 |
|
Tim Daubenschütz
|
eb6e3cb20a
|
finishing boilerplate for wallet app + prefixing whitelabel specific files
|
2015-08-11 14:47:28 +02:00 |
|
Tim Daubenschütz
|
f086bece71
|
add boilerplate code for wallet application
|
2015-08-11 13:10:15 +02:00 |
|
diminator
|
d5efd79d14
|
refactored accordion list item:
accordion-list-item
accordion-list-item-piece < accordion-list-item
accordion-list-item-wallet < accordion-list-item-piece
accordion-list-item-prize < accordion-list-item-piece
|
2015-08-11 12:06:01 +02:00 |
|
Tim Daubenschütz
|
95e0b256b6
|
Merge branch 'master' into AD-613-cyland-white-label-page
Conflicts:
.gitignore
|
2015-08-11 11:50:09 +02:00 |
|
Tim Daubenschütz
|
0cf63fa6c8
|
fix synchronization of files of fineuploader
|
2015-08-11 11:39:58 +02:00 |
|
Tim Daubenschütz
|
58c0ce4c3f
|
fix wording for multiple uploads
|
2015-08-11 10:03:12 +02:00 |
|
diminator
|
f5b34222a9
|
remove ratings from master branch
|
2015-08-10 17:45:49 +02:00 |
|
diminator
|
a6e257bd27
|
Merged in AD-545-add-rating-support-for-the-pieces (pull request #36)
Ad 545 add rating support for the pieces
|
2015-08-10 17:08:11 +02:00 |
|
diminator
|
bdeef598eb
|
Merge remote-tracking branch 'remotes/origin/AD-716-aclbutton-doesnt-respect-modals-r'
Conflicts:
js/components/settings_container.js
|
2015-08-10 17:07:15 +02:00 |
|
diminator
|
9408370239
|
Merged in AD-707-add-https-to-embed (pull request #33)
Add "s" to http
|
2015-08-10 17:03:16 +02:00 |
|
diminator
|
36ca2004ff
|
rating create and fetch
|
2015-08-10 17:02:10 +02:00 |
|
Tim Daubenschütz
|
8ff2dea4df
|
refactor: acl buttons message functionality
|
2015-08-10 15:57:20 +02:00 |
|
diminator
|
a27415eb86
|
jury dashboard + rating WIP
|
2015-08-10 15:23:13 +02:00 |
|
Tim Daubenschütz
|
d12dc4dab2
|
remove deprecated collapsible mixin
|
2015-08-10 14:42:38 +02:00 |
|
Tim Daubenschütz
|
f6be11d530
|
remove alert mixin
|
2015-08-10 14:22:25 +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
|
e589925c9d
|
delete form mixin
|
2015-08-10 14:05:35 +02:00 |
|
Tim Daubenschütz
|
d968f02b59
|
refactor request action form
|
2015-08-10 11:57:38 +02:00 |
|
Tim Daubenschütz
|
c8dc4fa12d
|
adjust action panel usage for applications
|
2015-08-10 11:11:28 +02:00 |
|
diminator
|
d1edf898fc
|
api tokens with panel instead of property
Conflicts:
js/components/settings_container.js
|
2015-08-10 11:08:18 +02:00 |
|
Tim Daubenschütz
|
3ff401904b
|
fix submit to prize button
|
2015-08-10 10:10:43 +02:00 |
|
Tim Daubenschütz
|
a55efc1692
|
fix large buttons on sluice landing page
|
2015-08-10 09:39:32 +02:00 |
|
Tim Daubenschütz
|
b70eb23dc0
|
refactor action panel: mostly css and layout
|
2015-08-10 09:22:39 +02:00 |
|
diminator
|
36aa5b1891
|
api tokens with panel instead of property
|
2015-08-07 15:54:36 +02:00 |
|
diminator
|
4627a860b2
|
Merge remote-tracking branch 'remotes/origin/master' into AD-544-automatically-share-registered-pr
|
2015-08-07 15:17:12 +02:00 |
|
Tim Daubenschütz
|
5cef512c0d
|
remove react flow type
|
2015-08-07 15:10:47 +02:00 |
|
diminator
|
8275a8d626
|
prize: permission refactor
email: moved cc folders
bug fix email: encode email in queryparams
|
2015-08-07 15:10:39 +02:00 |
|
Tim Daubenschütz
|
3afb036f24
|
rename apiUrls to ApiUrls
|
2015-08-07 15:08:02 +02:00 |
|
Tim Daubenschütz
|
be62ece14e
|
Merge branch 'master' into AD-716-aclbutton-doesnt-respect-modals-r
|
2015-08-07 14:54:11 +02:00 |
|
TimDaubenschuetz
|
a2b366a7bf
|
Merged AD-391-add-filter-functions-to-pieces-an into master
|
2015-08-07 14:51:07 +02:00 |
|
Tim Daubenschütz
|
b56ae0e145
|
fix requestActions requests
|
2015-08-07 14:50:34 +02:00 |
|
Tim Daubenschütz
|
f73001a5b8
|
remove form property header and replace class name definition
|
2015-08-07 14:31:37 +02:00 |
|
vrde
|
e9c776fec4
|
Add "s" to http lol
|
2015-08-07 14:23:59 +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
|
15c0ae6430
|
Merge branch 'AD-391-add-filter-functions-to-pieces-an'
|
2015-08-07 13:24:36 +02:00 |
|
Tim Daubenschütz
|
6fc7ac8b63
|
remove unneccesary action for edition list actions
|
2015-08-07 13:21:54 +02:00 |
|
Tim Daubenschütz
|
bbb0bb15b6
|
add documentation
|
2015-08-07 13:20:31 +02:00 |
|
Tim Daubenschütz
|
ada7df25a7
|
fix minor consistence bug
|
2015-08-07 13:18:33 +02:00 |
|
Tim Daubenschütz
|
b5448b0acb
|
wording
|
2015-08-07 13:09:57 +02:00 |
|
Tim Daubenschütz
|
192f776bd8
|
Filter open edition tables correctly
|
2015-08-07 13:05:50 +02:00 |
|
diminator
|
aba30acb02
|
Merge remote-tracking branch 'origin/master'
|
2015-08-07 11:28:17 +02:00 |
|
diminator
|
67f70357a5
|
jury invitation, revoke, resend
MIGRATE!
|
2015-08-07 11:27:44 +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
|
2d4f307dcb
|
Merge remote-tracking branch 'origin/AD-544-automatically-share-registered-pr' into AD-544-automatically-share-registered-pr
|
2015-08-06 13:56:57 +02:00 |
|
diminator
|
99ea0e1af8
|
action-panel WIP
|
2015-08-06 13:56:37 +02:00 |
|
Tim Daubenschütz
|
e227db1b3b
|
fix create editions for filter widget
|
2015-08-06 13:43:53 +02:00 |
|
Tim Daubenschütz
|
ee97e600ef
|
fix bug in piece list filter widget
|
2015-08-06 13:15:52 +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 |
|
Tim Daubenschütz
|
f3e378f221
|
update react-bootstrap first cut
|
2015-08-05 16:49:25 +02:00 |
|
diminator
|
792325f71d
|
acl_create_editions
|
2015-08-05 16:02:48 +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
|
5108ca2fc6
|
merge conflict
|
2015-08-05 14:50:44 +02:00 |
|
diminator
|
bd52bc8136
|
Merge remote-tracking branch 'remotes/origin/AD-699-rename-prize-endpoint-to-prizes' into AD-686-in-sluice-art-prize-i-can-submit-
Conflicts:
.gitignore
js/components/whitelabel/prize/constants/api_urls.js
|
2015-08-05 14:50:17 +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
|
23bbbb792a
|
pr review: clear: operators precedence
|
2015-08-04 16:58:36 +02:00 |
|
Tim Daubenschütz
|
c4e372e72f
|
pr review: fix indentation
|
2015-08-04 16:18:14 +02:00 |
|
Tim Daubenschütz
|
f31d576583
|
add styling for piece list filter widget
|
2015-08-04 15:58:39 +02:00 |
|
Tim Daubenschütz
|
fb10d9329b
|
add labels for filter params
|
2015-08-04 15:39:20 +02:00 |
|
Tim Daubenschütz
|
fc0bccbff3
|
add filterBy to edition list action|store
|
2015-08-04 15:06:02 +02:00 |
|
Tim Daubenschütz
|
6f1c6a0168
|
add 'filter active' functionality to piece list filter widget
|
2015-08-04 13:28:44 +02:00 |
|
diminator
|
5ce549e533
|
disable submit prize with ACL
|
2015-08-04 13:15:38 +02:00 |
|
Tim Daubenschütz
|
17b991e06b
|
adjust store calls to fetch list to new interface
|
2015-08-04 11:48:12 +02:00 |
|
diminator
|
2258968856
|
Merge remote-tracking branch 'remotes/origin/AD-619-due-1208-create-jury-dashboard' into AD-686-in-sluice-art-prize-i-can-submit-
Conflicts:
.gitignore
|
2015-08-04 11:45:20 +02:00 |
|
Tim Daubenschütz
|
e3b46c69a5
|
implement piece list filter widget functionality
|
2015-08-04 11:39:33 +02:00 |
|
Tim Daubenschütz
|
7ee296c963
|
static styling of filter widget
|
2015-08-04 10:06:02 +02:00 |
|
Tim Daubenschütz
|
ae8bc674d2
|
add logging for complete as well
|
2015-08-03 18:50:14 +02:00 |
|
Tim Daubenschütz
|
4bf21e1afd
|
Merge branch 'master' of bitbucket.org:ascribe/onion
|
2015-08-03 18:38:33 +02:00 |
|
Tim Daubenschütz
|
92d699a831
|
add chunk logging
|
2015-08-03 18:35:56 +02:00 |
|
Tim Daubenschütz
|
30d84af7fb
|
add more logs
|
2015-08-03 18:02:21 +02:00 |
|
vrde
|
c31acd4317
|
Merge branch 'AD-700-redirect-landing-to-collection-if-logged-in'
|
2015-08-03 13:53:30 +02:00 |
|
vrde
|
72821001b7
|
Merge branch 'AD-601-in-piece_detail-longer-titles-are'
Conflicts:
.gitignore
|
2015-08-03 13:44:53 +02:00 |
|
Tim Daubenschütz
|
5d92716726
|
add logging in fineuploader
|
2015-08-03 11:45:44 +02:00 |
|
vrde
|
ac4a98fa16
|
Redirect from landing to collection if user is logged in
|
2015-08-03 11:32:52 +02:00 |
|
Tim Daubenschütz
|
6bf33f541a
|
remove raven
|
2015-08-03 11:26:30 +02:00 |
|
Tim Daubenschütz
|
765969c5b3
|
log file list to sentry on error
|
2015-08-03 11:09:31 +02:00 |
|
Tim Daubenschütz
|
63b763dd25
|
remove onComplete call if there has been an error with fineuploader
|
2015-08-03 10:54:34 +02:00 |
|
Tim Daubenschütz
|
c9042a0934
|
delete password of user when submitting to sentry
|
2015-08-03 10:41:51 +02:00 |
|
Tim Daubenschütz
|
2c7c78af67
|
Merge remote-tracking branch 'origin/master' into AD-699-rename-prize-endpoint-to-prizes
|
2015-07-31 13:45:53 +02:00 |
|
Tim Daubenschütz
|
84703779a9
|
rename prize endpoint to prizes
|
2015-07-31 13:44:57 +02:00 |
|
diminator
|
950e63b6d0
|
content copy for hash_locally
|
2015-07-30 14:04:39 +02:00 |
|
Tim Daubenschütz
|
52f10f178f
|
Merge branch 'master' into AD-601-in-piece_detail-longer-titles-are
|
2015-07-30 11:49:48 +02:00 |
|
Tim Daubenschütz
|
79bef1e0a9
|
add ellipsis functionality to detail property
|
2015-07-30 11:48:47 +02:00 |
|
vrde
|
91078bfdd9
|
Fix comment
|
2015-07-29 18:24:54 +02:00 |
|
vrde
|
8f52d8bf87
|
Comment the solution
|
2015-07-29 18:19:04 +02:00 |
|
Tim Daubenschütz
|
4f2aa430f2
|
refactor ascribe table and add prizes dashboard boilerplate code
|
2015-07-29 18:03:49 +02:00 |
|
vrde
|
ef61470b5f
|
First iteration
|
2015-07-29 18:00:49 +02:00 |
|
Tim Daubenschütz
|
277cd98549
|
fix cyland logo
|
2015-07-29 16:08:30 +02:00 |
|
Tim Daubenschütz
|
f0d6eaa950
|
update gitignore
|
2015-07-29 15:57:48 +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 |
|
Tim Daubenschütz
|
9ebc489c78
|
refresh piece list correctly after piece with edition creation
|
2015-07-29 15:24:30 +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 |
|
diminator
|
deebacd063
|
Merged in AD-601-in-piece_detail-longer-titles-are (pull request #22)
Ad 601 in piece_detail longer titles are
|
2015-07-29 14:16:40 +02:00 |
|
Tim Daubenschütz
|
cb5b381e0b
|
fix scaling issue for slides container
|
2015-07-29 11:23:25 +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
|
0f658b9a71
|
add error reason to fineuploader raven
|
2015-07-28 16:24:18 +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
|
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 |
|
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 |
|
vrde
|
5d1b7d3294
|
Merge branch 'AD-622-google-analytics-tracking'
|
2015-07-28 11:15:35 +02:00 |
|
Tim Daubenschütz
|
b530018dda
|
remove unused components
|
2015-07-28 11:06:19 +02:00 |
|
Tim Daubenschütz
|
212038ae43
|
cosmetic changes + fix react warning for map fn
|
2015-07-28 10:09:54 +02:00 |
|
Tim Daubenschütz
|
828d24044b
|
Integrate hashing setting in uploader
|
2015-07-28 10:05:31 +02:00 |
|
diminator
|
60ad72aabb
|
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 09:50:29 +02:00 |
|
diminator
|
6d71c20ea8
|
inputcheckbox for loan
settings container with profile update
|
2015-07-28 09:49:53 +02:00 |
|
Tim Daubenschütz
|
275f6c839e
|
minor fixes
|
2015-07-27 18:24:21 +02:00 |
|
vrde
|
17ec6f34e0
|
Fix code after review
|
2015-07-27 18:21:20 +02:00 |
|
Tim Daubenschütz
|
1a1ba8bbb1
|
add ellipsis again
|
2015-07-27 18:19:55 +02:00 |
|
vrde
|
c2601f242f
|
Comment events not yet implemented
|
2015-07-27 18:08:12 +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
|
21fc2cee28
|
convert cancel hashing action to anchor
|
2015-07-27 16:37:54 +02:00 |
|
Tim Daubenschütz
|
332366ec15
|
Integrate dropzone inactivity into user flow
|
2015-07-27 16:00:54 +02:00 |
|
Tim Daubenschütz
|
d52a89cd3e
|
only display hashing toggle on user permissions
|
2015-07-27 15:34:45 +02:00 |
|
Tim Daubenschütz
|
a05698efc1
|
fix app crashing bug when transferring an edition
|
2015-07-27 14:59:49 +02:00 |
|
diminator
|
b105e77009
|
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-27 14:39:42 +02:00 |
|
diminator
|
1504a5b20d
|
inputcheckbox and terms checking
|
2015-07-27 14:39:19 +02:00 |
|
Tim Daubenschütz
|
2274efaed7
|
implement hashing toggle
|
2015-07-27 14:21:26 +02:00 |
|
Tim Daubenschütz
|
8f6b858f0a
|
make form submittable after the files blob was successfully created
|
2015-07-27 09:33:31 +02:00 |
|
Tim Daubenschütz
|
5da577caca
|
use standard promises instead of fineuploaders'
|
2015-07-27 09:28:50 +02:00 |
|
Tim Daubenschütz
|
d71111b6f1
|
fix wording for file drag and drop dialog
|
2015-07-27 09:23:01 +02:00 |
|
Tim Daubenschütz
|
d6968b40b5
|
Fix wording and add localization
|
2015-07-24 17:29:30 +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
|
38751ae612
|
add user interface feedback
|
2015-07-24 15:13:20 +02:00 |
|
Tim Daubenschütz
|
494ab209ca
|
implement hashing progress functionality
|
2015-07-24 14:39:04 +02:00 |
|
Tim Daubenschütz
|
9dc811febb
|
forgot one Q import
|
2015-07-24 13:49:16 +02:00 |
|
Tim Daubenschütz
|
a199fd08c1
|
replace es6-promise with Q
|
2015-07-24 13:44:28 +02:00 |
|
diminator
|
861f633476
|
concurrent upload of chunks
fixed spool tests for bitcoin and blobs
|
2015-07-23 18:14:17 +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
|
5c3d57ff3a
|
Merged in AD-604-non-owner-cannot-download-pdfs-an (pull request #19)
Ad 604 non owner cannot download pdfs an
|
2015-07-23 15:33:54 +02:00 |
|
Tim Daubenschütz
|
71fcdff874
|
made react fine uploader error message more generic
|
2015-07-23 15:27:14 +02:00 |
|
diminator
|
c415e97e42
|
allow download for non-renderable files
|
2015-07-23 15:18:58 +02:00 |
|
vrde
|
21f3b4504e
|
Fix height for audio and video embed
|
2015-07-23 15:04:02 +02:00 |
|
TimDaubenschuetz
|
90b0047eb8
|
Merged in AD-610-on-switching-edition-detail-coa-d (pull request #17)
Flush store after unmounting coa component to force refresh on new user request
|
2015-07-23 14:35:09 +02:00 |
|
diminator
|
0cc48a73e4
|
moved hashing to file_utils
|
2015-07-23 13:03:30 +02:00 |
|
diminator
|
1a1f14e04c
|
add JS file hashing to fineuploader
didnt instantiate it because needs UX
|
2015-07-23 11:45:25 +02:00 |
|
Tim Daubenschütz
|
c2d76034af
|
add flowtype functionality for piece list
|
2015-07-22 17:20:40 +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
|
370a3b43dd
|
add font rendering logic
|
2015-07-22 16:12:52 +02:00 |
|