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
diminator
71c438ee59
close notifications dropdown after click
2015-09-01 18:38:24 +02:00
diminator
7919521578
refactor of notifications
2015-09-01 18:11:18 +02:00
Tim Daubenschütz
9d7b5cbe2a
advance create contract form
2015-09-01 16:57:12 +02:00
diminator
bfaf4886a4
notifications unoptimized
2015-09-01 14:45:14 +02:00
Tim Daubenschütz
b4abe7a245
generic form submission determination for fineuploader
2015-09-01 14:42:09 +02:00
Tim Daubenschütz
b5b1e36109
nested collapsible paragraphs
2015-09-01 14:00:06 +02:00
Tim Daubenschütz
56cdcdb5c6
Merge branch 'AD-901-add-lint-for-scss' into AD-456-ikonotv-branded-page-for-registra
2015-09-01 13:30:04 +02:00
TimDaubenschuetz
c33976ad37
Merged in AD-875-slidecontainer-add-vendor-prefixe (pull request #41 )
...
add vendor prefixes for slide container
2015-09-01 09:49:57 +02:00
Tim Daubenschütz
f83300e597
incorporate pr feedback
2015-09-01 09:34:29 +02:00
Tim Daubenschütz
af7938dbc7
Merge branch 'master' into AD-456-ikonotv-branded-page-for-registra
2015-09-01 09:29:58 +02:00
vrde
d2adc7a388
Merge remote-tracking branch 'origin/master' into AD-901-add-lint-for-scss
...
Conflicts:
sass/main.scss
2015-08-31 19:09:09 +02:00
Tim Daubenschütz
96fdb598f7
change api endpoints to contractblobs
2015-08-31 17:29:43 +02:00
Tim Daubenschütz
55948bc9ba
integrate unfilteredPieceListCount into piece list store and list
2015-08-31 16:57:16 +02:00
Tim Daubenschütz
7e1815bb1f
refactor account settings into multiple files
2015-08-31 16:36:24 +02:00
Tim Daubenschütz
ea52927eec
rename uploading routes
2015-08-31 11:33:44 +02:00
Tim Daubenschütz
90f89e4498
other loan contract to contract renaming
2015-08-31 11:05:33 +02:00
vrde
3f34fc680e
Get rid of ascribe-btn-gray
2015-08-28 16:40:54 +02:00
diminator
9dddf0bf21
Merge remote-tracking branch 'remotes/origin/master' into AD-883-show-notificationsrequests-on-col
2015-08-28 16:25:57 +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
02ed21fef5
fix nav links on logged out user
2015-08-28 15:31:12 +02:00
Tim Daubenschütz
848321a3f3
fix nav links on logged out user
2015-08-28 15:29:30 +02:00
diminator
762c3f89b9
Merge remote-tracking branch 'remotes/origin/master' into AD-883-show-notificationsrequests-on-col
2015-08-28 15:25:43 +02:00
diminator
d3cc6a5007
request actions first cut
2015-08-28 15:24:32 +02:00
Tim Daubenschütz
ddfc8b9621
minor fixes
2015-08-28 14:27:02 +02:00
Tim Daubenschütz
8e7aeab3a6
Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra
2015-08-28 14:08:45 +02:00
Tim Daubenschütz
52ae348e57
dynamic acl for acl_submit
2015-08-28 14:07:29 +02:00
diminator
02e105d2b8
text refactor
2015-08-28 14:00:50 +02:00
diminator
1b730573c7
ikonotv acl_submitted + refactor
2015-08-28 13:58:24 +02:00
diminator
680cc8572f
ikonotv acl_submit
2015-08-28 13:52:58 +02:00
Tim Daubenschütz
d40b671b45
remove ikonotv boilerplate landing page
2015-08-28 12:48:48 +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
5219dd5cf7
fix bug + enable contract
2015-08-28 12:40:00 +02:00
Tim Daubenschütz
e9d0311f58
custom ikonotv piece page
2015-08-28 12:33:00 +02:00
Tim Daubenschütz
2c26aab8cc
add exception for loaning a piece for ikonotv
2015-08-28 12:20:36 +02:00
Tim Daubenschütz
89f68abcec
add: Loan form for Ikonotv
2015-08-28 12:11:29 +02:00
Tim Daubenschütz
9a9aa68ca9
fix lazy evalutaion of loan form
2015-08-28 11:13:28 +02:00
Tim Daubenschütz
8e5c04140f
add vendor prefixes for slide container
2015-08-27 18:11:47 +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
Tim Daubenschütz
64d23f82df
refactoring of the general architecture
2015-08-27 14:47:33 +02:00
Tim Daubenschütz
9d7a9bd028
add router/navigation integration into whole project
2015-08-27 14:34:15 +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
Tim Daubenschütz
4b2f48bc50
Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra
2015-08-27 13:48:33 +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
8406272187
review comments
2015-08-27 10:18:50 +02:00
diminator
33d5480f2f
review comments
2015-08-27 10:10:39 +02:00
diminator
144b823777
Merge remote-tracking branch 'origin/AD-661-due-1208-implement-jury-rating-an' into AD-661-due-1208-implement-jury-rating-an
2015-08-27 09:22:08 +02:00
diminator
1f95ae3a41
show email of user registered on select
2015-08-27 09:21:48 +02:00
Tim Daubenschütz
8cc1f91a3a
Merge branch 'AD-661-due-1208-implement-jury-rating-an' of bitbucket.org:ascribe/onion into AD-661-due-1208-implement-jury-rating-an
2015-08-26 18:05:22 +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
diminator
65571848fb
ordering by selected
2015-08-26 17:41:36 +02:00
Tim Daubenschütz
e473b4c779
fix invariant violation
2015-08-26 17:32:42 +02:00
diminator
19c882f3b4
reveal name on shortlist in list
2015-08-26 16:55:12 +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
Tim Daubenschütz
6808c7c228
remove loan button from piece detail page
2015-08-26 16:44:24 +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
Tim Daubenschütz
88b525f352
change link in accordionlist item dependent on domain
2015-08-26 15:18:05 +02:00
diminator
bcd6400a78
bug fix promises and notifications
2015-08-26 14:50:16 +02:00
diminator
e3b85bf808
removed loadPieceList from shortlist in detail
2015-08-26 12:51:25 +02:00
diminator
ad7e86108e
prize piece serializer with DB rating stats
2015-08-26 12:33:06 +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
5fcee39ed3
shortlisting enabled up till loan request
2015-08-25 15:19:10 +02:00
diminator
a07b4cc35c
reset cyland register form
...
"no votes yet" for judge
2015-08-25 11:11:22 +02:00
diminator
2d10887e1b
reset cyland additional data form
2015-08-25 10:49:49 +02:00
diminator
15bcd4ba14
average rating
...
cyland bug fix
2015-08-25 10:47:38 +02:00
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
06f86b2a0e
first cut: test queue inheritance
2015-08-06 18:03:13 +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
Tim Daubenschütz
c58227b443
first cut flowtype boilerplate
2015-07-22 15:59:05 +02:00
TimDaubenschuetz
61077de3de
Merged in AD-591-finetune-build-process (pull request #13 )
...
Ad 591 finetune build process
2015-07-22 15:19:35 +02:00
TimDaubenschuetz
da7be7bb06
Merged in AD-589-Form-Cancel-doesnt-reset (pull request #16 )
...
Form cancel doesnt reset property/form
2015-07-22 15:19:25 +02:00
Tim Daubenschütz
c3a1b9b626
Flush store after unmounting coa component to force refresh on new user request
2015-07-22 15:16:56 +02:00
diminator
742c1bc6e0
coa fixes and bug report
2015-07-22 00:30:51 +02:00
diminator
6c3868616b
Merged in AD-572-make-thumbnails-way-smaller (pull request #15 )
...
Ad 572 make thumbnails way smaller
2015-07-21 21:14:52 +02:00
diminator
62bdf97a2f
cleanup of SPOOL old code
2015-07-21 21:13:46 +02:00
vrde
3ceadeda32
Fix trailing slash on footer
2015-07-21 17:57:11 +02:00
diminator
35051bf67b
fixed media player text
2015-07-21 17:29:58 +02:00
diminator
af59c70364
fixed media player text
2015-07-21 16:59:19 +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
diminator
e7d85d6eb8
updated thumbnails:
...
- support multiformat
- runs in celery (way faster registration!)
updated s3 url generation:
- anonymous "/DEPLOYMENT/USER_ID_MD5/PIECE_FILE_HASH/CATEGORY/FILENAME.EXT"
- refactored code
!!!!install postgres hstore extension
sudo apt-get install postgresql postgresql-contrib
sudo su - postgres
psql mysite_db -c 'create extension hstore;'
./manage.py migrate
2015-07-21 15:52:58 +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
diminator
11fb512763
s3 urls anonymous and refactored
...
zencoder with multiple thumbnail sizes
2015-07-20 18:59:32 +02:00
Tim Daubenschütz
68dba56a21
refactor some scss variables and include css source map only in debug
2015-07-20 10:52:12 +02:00
Tim Daubenschütz
44f63dace1
fix coa issue and hopefully header bug
2015-07-17 23:28:59 +02:00
Tim Daubenschütz
efd329c44c
patch logout behavior
2015-07-17 18:53:04 +02:00
Tim Daubenschütz
28f875e90c
Merge branch 'master' of bitbucket.org:ascribe/onion
2015-07-17 18:33:33 +02:00
Alberto Granzotto
658a4b3372
Merged in AD-586-implement-logging-for-whole-app (pull request #12 )
...
Ad 586 implement logging for whole app
2015-07-17 18:25:56 +02:00
Tim Daubenschütz
55f00ea0ab
also handle error.detail
2015-07-17 18:10:11 +02:00
vrde
cc8b295e96
Fix logout route
2015-07-17 18:01:22 +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
2ff47ede89
replace console logs with global logging
2015-07-17 15:52:53 +02:00
Tim Daubenschütz
af42bb8e67
error handling first cut
2015-07-17 15:41:09 +02:00
vrde
d298486a6f
cleanup header
2015-07-17 15:09:38 +02:00
vrde
b536af29be
Logout is now a route
2015-07-17 15:02:44 +02:00
Tim Daubenschütz
18a37057e5
fix edition id that was breaking viewport on mobile
2015-07-17 10:36:42 +02:00
Tim Daubenschütz
8cad3b521b
fix globals lint errors and edition creation - 0 editions - bug
2015-07-17 10:30:05 +02:00
Tim Daubenschütz
8e38e9e8de
rename csrftoken
2015-07-16 19:16:26 +02:00
Tim Daubenschütz
13e151e83b
add logging and responsive user navigation
2015-07-16 19:12:18 +02:00
Tim Daubenschütz
343ebcf741
warning instead of exception
2015-07-16 18:30:43 +02:00
Tim Daubenschütz
1d50fa36a2
new fix
2015-07-16 18:27:34 +02:00
Tim Daubenschütz
1b210bd10c
fix extraction
2015-07-16 18:23:44 +02:00
Tim Daubenschütz
ee6d2789ed
set csrftokens as constants
2015-07-16 18:17:45 +02:00
Tim Daubenschütz
7da2149e24
raven fix
2015-07-16 17:07:09 +02:00
Tim Daubenschütz
0ce2794608
disable raven
2015-07-16 17:06:25 +02:00
Tim Daubenschütz
f12d2273d5
fix csrftoken cookie issue
2015-07-16 17:04:37 +02:00
Tim Daubenschütz
d56286a472
fix scaling of button for sluice on mobile
2015-07-16 13:54:02 +02:00
Tim Daubenschütz
e9ea24aed3
add support for zero editions in piece list
2015-07-16 12:11:05 +02:00
Tim Daubenschütz
39ec4c5b91
fix wrong feedback for deleting an edition
2015-07-16 11:50:52 +02:00
Tim Daubenschütz
943c7503ea
fix edition creation display bug on piece detail
2015-07-16 11:39:05 +02:00
vrde
28d6052d6f
Fix typo
2015-07-15 19:01:36 +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
vrde
0065c3d792
Fix bug in polling
2015-07-15 18:00:43 +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
vrde
a31fe76926
Merge branch 'master' of bitbucket.org:ascribe/onion
2015-07-15 17:36:32 +02:00
vrde
4e90c26b53
add subdomain to intercom
2015-07-15 17:36:20 +02:00
diminator
7c546edc2b
fix acl and editions
2015-07-15 17:33:38 +02:00
Tim Daubenschütz
fb609afd28
loading feedback for edition button
2015-07-15 17:32:51 +02:00
Tim Daubenschütz
170bfcfe83
Merge branch 'master' of bitbucket.org:ascribe/onion
2015-07-15 17:22:39 +02:00
Tim Daubenschütz
f3ea3460bb
reload piece list after clicking on create editions
2015-07-15 17:22:28 +02:00
vrde
a70857e8d0
Merge branch 'master' of bitbucket.org:ascribe/onion
2015-07-15 17:14:18 +02:00
vrde
e19a20a60f
add polling to piece
2015-07-15 17:13:45 +02:00
Tim Daubenschütz
756480e4cf
Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k'
2015-07-15 17:03:26 +02:00
Tim Daubenschütz
fe91cc4f6a
fix edition refresh after delete
2015-07-15 17:02:59 +02:00
vrde
d4bb23467e
Fix link to terms
2015-07-15 16:57:41 +02:00
diminator
08137cdb09
Merge remote-tracking branch 'remotes/origin/AD-499-whitelabel-prize-with-sluice-as-k' into AD-419-decouple-piece-registration-from-
2015-07-15 16:56:38 +02:00
diminator
50d1f54051
edition loan
...
piece delete
2015-07-15 16:56:11 +02:00
Tim Daubenschütz
725e79bc4f
Merge remote-tracking branch 'origin/master' into AD-499-whitelabel-prize-with-sluice-as-k
2015-07-15 16:55:38 +02:00
Tim Daubenschütz
06c2e6205c
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 16:55:27 +02:00
Tim Daubenschütz
7d9d2ed6b5
fix edition creation
2015-07-15 16:55:04 +02:00
Tim Daubenschütz
cbfbde262f
fix fineuploader bug when clicking the add files button in a form
2015-07-15 16:50:32 +02:00
diminator
5f7b7db00f
Merge remote-tracking branch 'remotes/origin/master' into AD-419-decouple-piece-registration-from-
...
Conflicts:
bitcoin/models.py
web/settings_env/live.py
2015-07-15 15:54:37 +02:00
diminator
8953d0bfa7
Merge remote-tracking branches 'remotes/origin/AD-499-whitelabel-prize-with-sluice-as-k' and 'remotes/origin/AD-516-add-ga' into AD-419-decouple-piece-registration-from-
2015-07-15 15:04:18 +02:00
diminator
4edc728278
merged
2015-07-15 15:00:39 +02:00
vrde
48aa6caacf
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 14:52:23 +02:00
vrde
344fffad91
Add language support
2015-07-15 14:52:14 +02:00
diminator
44f0b36e73
Merge remote-tracking branch 'remotes/origin/AD-499-whitelabel-prize-with-sluice-as-k' into AD-419-decouple-piece-registration-from-
2015-07-15 14:51:36 +02:00
Tim Daubenschütz
1509c520a4
finalizing loan form
2015-07-15 14:48:51 +02:00
diminator
049a5a6fcb
prize extra data form detail
2015-07-15 14:36:25 +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
9cc12ab841
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 14:03:28 +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
diminator
c54bbe231f
width styling of forms
2015-07-15 13:20:34 +02:00
diminator
9ba30f0938
acl_unshare false for prize
...
piece prize details
num_submissions
2015-07-15 12:23:02 +02:00
vrde
3ad7763577
Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k' of bitbucket.org:ascribe/onion into AD-499-whitelabel-prize-with-sluice-as-k
...
Conflicts:
js/components/ascribe_detail/media_container.js
2015-07-15 12:21:31 +02:00
vrde
26e0957840
Fix progress bar for video encoding
2015-07-15 12:18:29 +02:00
Tim Daubenschütz
92644c285e
change wording for landing page
2015-07-15 11:54:20 +02:00
Tim Daubenschütz
a8dd915ad7
basically reverting media player changes
2015-07-15 11:47:14 +02:00
Tim Daubenschütz
cc0301f5e5
Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-499-whitelabel-prize-with-sluice-as-k
2015-07-15 11:43:10 +02:00
Tim Daubenschütz
26fc2f14b3
make media container robust
2015-07-15 11:43:04 +02:00
diminator
a86befb2d7
fixed signup serializer, acl_editions_view
...
piece container whitelabel
2015-07-15 11:39:08 +02:00
Tim Daubenschütz
e3e8f088c7
add licences for cc
2015-07-15 11:28:53 +02:00
Tim Daubenschütz
ea871f3d1d
acl for delete
2015-07-15 01:46:37 +02:00
vrde
9e7e9782d6
Add google analytics
2015-07-15 01:45:03 +02:00
Tim Daubenschütz
71d2d5b641
Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-499-whitelabel-prize-with-sluice-as-k
2015-07-15 01:43:07 +02:00
Tim Daubenschütz
f1e90795f0
specify editions generically by whitelabel
2015-07-15 01:40:48 +02:00
diminator
d97b219c2d
licenses
2015-07-15 01:35:12 +02:00
Tim Daubenschütz
e1af4c615f
aclproxy for view editions
2015-07-15 01:02:53 +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
e65f052ffe
rename prize_name to prize
2015-07-15 00:16:43 +02:00
Tim Daubenschütz
6385349846
Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-499-whitelabel-prize-with-sluice-as-k
2015-07-15 00:14:52 +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
diminator
73d3055329
Merge remote-tracking branch 'remotes/origin/AD-499-whitelabel-prize-with-sluice-as-k' into AD-419-decouple-piece-registration-from-
2015-07-14 22:53:12 +02:00
vrde
aec1ff2173
Fix acl proxy
2015-07-14 22:50:48 +02:00
vrde
63c78d09d9
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 22:43:03 +02:00
vrde
6405d08673
Merge branch 'AD-499-custom-api-url-mapping' into AD-499-whitelabel-prize-with-sluice-as-k
2015-07-14 22:42:10 +02:00
Tim Daubenschütz
8f386dc0cf
adjust acl proxy
2015-07-14 22:34:34 +02:00
Tim Daubenschütz
d183b9ba1c
include intercom
2015-07-14 21:47:14 +02:00
diminator
a9ac7b5a57
removed promocode
...
prize/<id>/users/ POST, LIST
prize/<id>/users/login
2015-07-14 21:20:34 +02:00
Tim Daubenschütz
5ae80efaa7
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 21:18:32 +02:00
Tim Daubenschütz
483e24b234
add missing language strings
2015-07-14 21:18:05 +02:00
vrde
62b0981cd7
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 21:15:54 +02:00
vrde
c5fd8aa28f
Add custom url mapping
2015-07-14 21:15:10 +02:00
Tim Daubenschütz
d2b2bdf7d5
add custom submit button to piece list
2015-07-14 21:13:15 +02:00
Tim Daubenschütz
b52d000ac7
made add work conditional
2015-07-14 21:06:11 +02:00
Tim Daubenschütz
f8b87a8849
finish register artwork for prize
2015-07-14 20:35:16 +02:00
Tim Daubenschütz
6a04a1a053
fix fineuploader issue after unmounting react-s3-fineuploader
2015-07-14 20:10:41 +02:00
Tim Daubenschütz
18898b6f8a
start working on register piece for price - WIP
2015-07-14 20:07:55 +02:00
vrde
5ced62c496
Cleanup constants
2015-07-14 20:06:13 +02:00
Tim Daubenschütz
aa5934cd25
made inputcheckbox component generic
2015-07-14 19:53:49 +02:00
Tim Daubenschütz
190a65b981
restyle powered by
2015-07-14 19:01:14 +02:00
Tim Daubenschütz
e833dbf61a
Merge remote-tracking branch 'origin/master' into AD-499-whitelabel-prize-with-sluice-as-k
2015-07-14 18:56:00 +02:00
Tim Daubenschütz
97f8d416af
styling again
2015-07-14 18:55:34 +02:00
vrde
dffcbc1191
Restore toolbar
2015-07-14 18:54:47 +02:00
Tim Daubenschütz
e49b920318
more styling on the landing page
2015-07-14 18:34:46 +02:00
vrde
ce46f7c886
Fix bug in whitelabel landing page
2015-07-14 18:00:34 +02:00
diminator
4dfff8d6a5
Merge remote-tracking branch 'remotes/origin/AD-499-whitelabel-prize-with-sluice-as-k' into AD-419-decouple-piece-registration-from-
2015-07-14 17:50:01 +02:00
diminator
89a83961d9
span -> diff
2015-07-14 17:49:31 +02:00
diminator
890a312eff
merge
2015-07-14 17:46:19 +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
ff64734545
styling
2015-07-14 17:41:57 +02:00
Tim Daubenschütz
5ef63fbba3
use local whitelabel constants for route switching
2015-07-14 17:12:32 +02:00
Tim Daubenschütz
8d15238818
add subdomain settings to constants
2015-07-14 16:53:27 +02:00
Tim Daubenschütz
26f35d7628
Merge remote-tracking branch 'origin/master' into AD-499-whitelabel-prize-with-sluice-as-k
2015-07-14 16:48:50 +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
Tim Daubenschütz
cc89475d0c
add routine to refresh specific edition list
2015-07-14 14:45:33 +02:00
diminator
00d6ca9536
Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-419-decouple-piece-registration-from-
2015-07-14 14:17:24 +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
Tim Daubenschütz
e13649383a
add filter function for acl actions
2015-07-14 13:34:32 +02:00
vrde
695a195e55
Replace history for slider
2015-07-14 12:32:18 +02:00
Tim Daubenschütz
9b663c64b2
Merge branch 'AD-419-decouple-piece-registration-from-' of bitbucket.org:ascribe/onion into AD-419-decouple-piece-registration-from-
2015-07-14 12:19:41 +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
7edca25add
small doc for aclproxy
2015-07-14 11:14:15 +02:00
Tim Daubenschütz
f729e3c833
add acl proxy component
2015-07-14 11:11:28 +02:00
Tim Daubenschütz
27c4e588ef
fix minification bug
2015-07-14 10:52:44 +02:00
Tim Daubenschütz
acbfd8c840
remove wrong imports from fineuploader
2015-07-14 10:39:36 +02:00
Tim Daubenschütz
8fc812e574
converting fineuploader promises
2015-07-14 10:36:37 +02:00
Tim Daubenschütz
bfb052f8c0
better error handling for fineuploader
2015-07-14 10:33:15 +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
Tim Daubenschütz
b238fbeeb1
fix piece list error
2015-07-13 23:29:07 +02:00
Tim Daubenschütz
e54db1e0e3
Merge branch 'AD-419-decouple-piece-registration-from-' into AD-565-add-landing-page-for-sluice
2015-07-13 23:17:15 +02:00
vrde
19f82b2bbd
work on register piece for for prize
2015-07-13 22:58:53 +02:00
vrde
5ea6095f6a
Redirect if no artworks are found
2015-07-13 22:05:16 +02:00
vrde
1aa2863b80
Declutter piece list if no pieces are found
2015-07-13 21:51:05 +02:00
diminator
eb5e9f115e
merged sluice
2015-07-13 21:20:42 +02:00
Tim Daubenschütz
a74c10d882
wät
2015-07-13 21:20:12 +02:00
Tim Daubenschütz
60600a72d4
refactor bulk acls for backend adjustment
2015-07-13 21:19:45 +02:00
diminator
3bf613941d
Merge remote-tracking branch 'remotes/origin/AD-565-add-landing-page-for-sluice' into AD-419-decouple-piece-registration-from-
2015-07-13 21:16:45 +02:00
vrde
69b3c8e3dd
Fix handler on sign up
2015-07-13 21:09:39 +02:00
diminator
e13b782cbe
Merge remote-tracking branch 'remotes/origin/AD-565-add-landing-page-for-sluice' into AD-419-decouple-piece-registration-from-
2015-07-13 21:05:41 +02:00
vrde
7aea6669c9
Refactor login and signup
2015-07-13 20:47:43 +02:00
diminator
d069206ca6
Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-419-decouple-piece-registration-from-
2015-07-13 20:16:29 +02:00
diminator
fd2f99f1b0
acl indexof
2015-07-13 20:16:08 +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
f225ee4232
adjust table acl filtered
2015-07-13 19:46:06 +02:00
Tim Daubenschütz
2d28c00d0f
display spinner on pagination request
2015-07-13 19:12:24 +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
vrde
b4f1d3d6cc
Merge branch 'master' into AD-565-add-landing-page-for-sluice
...
Conflicts:
js/components/login_container.js
2015-07-13 17:19:23 +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
vrde
3878dc12da
Merge branch 'AD-419-decouple-piece-registration-from-' into AD-565-add-landing-page-for-sluice
2015-07-13 16:35:49 +02:00
vrde
8f07abc39b
WIP
2015-07-13 16:34:26 +02:00
Tim Daubenschütz
ad6dd40867
Merge branch 'master' into AD-419-decouple-piece-registration-from-
2015-07-13 15:31:44 +02:00
Tim Daubenschütz
54ab0922cf
Merge branch 'master' of bitbucket.org:ascribe/onion
2015-07-13 15:28:38 +02:00
Tim Daubenschütz
6372a5af20
adjusted frontend to use first_edition from piece directly
2015-07-13 15:28:28 +02:00
TimDaubenschuetz
80be7e67be
Merged in AD-555-prevent-email-enumeration (pull request #6 )
...
removed messages indicating that the email is valid
2015-07-13 15:26:35 +02:00
Tim Daubenschütz
733c95a070
loading feedback for piece and edition page
2015-07-13 15:21:09 +02:00
Tim Daubenschütz
3ae10c5e50
first cut loading spinner pieces
2015-07-13 15:00:12 +02:00
Tim Daubenschütz
fd094aa471
remove first edition routine
2015-07-13 14:49:39 +02:00
Sylvain Bellemare
1497ed45eb
removed messages indicating that the email is valid
2015-07-13 14:36:29 +02:00
Tim Daubenschütz
11545c13a6
reorder edition collapsible paragraphs
2015-07-13 14:30:24 +02:00
vrde
3fbe60692e
Working on landing
2015-07-13 14:29:20 +02:00
Tim Daubenschütz
b51a03ce9c
styling changes
2015-07-13 14:19:22 +02:00
diminator
a07bc9e0e2
piece + share
...
acl first cut
2015-07-13 14:10:46 +02:00
Tim Daubenschütz
c8649306d4
fix collection queryParams bug
2015-07-13 13:51:16 +02:00
Tim Daubenschütz
5011304939
fix spool color
2015-07-13 10:11:25 +02:00
Tim Daubenschütz
3dd5626eb9
fix polling bug
2015-07-13 10:07:22 +02:00
diminator
88ff4b55d6
acl buttons and share forms for pieces/editions
2015-07-10 20:00:35 +02:00
Tim Daubenschütz
f7618d18f5
fix stateful polling of editions
2015-07-10 19:11:57 +02:00
Tim Daubenschütz
cbb965c264
Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-551-work-on-burn-down-list
2015-07-10 19:01:21 +02:00
Tim Daubenschütz
104a72fcc9
generic polling
2015-07-10 19:00:59 +02:00
diminator
62289be5ce
polling for editions
2015-07-10 18:51:35 +02:00
vrde
33d599b923
Start to work on custom landing
2015-07-10 18:45:26 +02:00
vrde
df5295dffd
Cleanup and reorder routes
2015-07-10 18:21:42 +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
diminator
b58fe51722
fixed crowdcurity issues on login/email/requestpassword
...
num editions supports status: -1, 0, >0
2015-07-10 16:45:49 +02:00
vrde
d5ea4e515d
Use distinct routers for different apps
2015-07-10 16:43:35 +02:00
Tim Daubenschütz
b6048a7f91
refactor login form
2015-07-10 16:34:34 +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
6f7600fca2
login errors + request obfuscated
2015-07-10 15:52:09 +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
fd6fad5da3
correct number of editions
2015-07-10 14:48:55 +02:00
Tim Daubenschütz
62ae8fd08b
fix warnings
2015-07-10 14:15:22 +02:00
Tim Daubenschütz
fa6e522222
Merge branch 'AD-551-work-on-burn-down-list' of bitbucket.org:ascribe/onion into AD-551-work-on-burn-down-list
2015-07-10 13:54:36 +02:00
Tim Daubenschütz
1df068d75f
add edition creation functionality
2015-07-10 13:54:25 +02:00
diminator
6a84e9d36e
whitelabel logo + sluice
2015-07-10 11:59:03 +02:00
vrde
cbe3be6faa
Correct typo
2015-07-10 11:07:25 +02:00
Tim Daubenschütz
ca72168da2
Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-551-work-on-burn-down-list
2015-07-10 10:32:42 +02:00
Tim Daubenschütz
bcb1bbe29b
first cut edition creation in piece list item
2015-07-10 10:32:39 +02:00
diminator
22b201f388
register piece returns to piece detail
2015-07-10 10:30:17 +02:00
diminator
5855b163a8
Merge remote-tracking branch 'remotes/origin/AD-551-work-on-burn-down-list' into AD-419-decouple-piece-registration-from-
...
Conflicts:
js/components/ascribe_accordion_list/accordion_list_item.js
2015-07-10 10:29:59 +02:00
diminator
8f78de3fb4
editions styling
...
fix otherdata
collapsible styling
2015-07-09 18:46:53 +01:00
Tim Daubenschütz
2e8e86c62f
add boilerplate code for creating an edition
2015-07-09 17:56:27 +02:00
Tim Daubenschütz
5f459aa139
add dynamic links to piece list item depending on wether editions exist or not
2015-07-09 17:28:21 +02:00
Tim Daubenschütz
d051198676
add loading feedback to new edition toggle
2015-07-09 17:01:08 +02:00
Tim Daubenschütz
0642185087
Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-551-work-on-burn-down-list
2015-07-09 16:32:55 +02:00
diminator
cde77bf944
editions layout
2015-07-09 15:29:10 +01:00
Tim Daubenschütz
ec0c668dbf
stop propagation when clicking on an edition link (selection)
2015-07-09 16:26:05 +02:00
Tim Daubenschütz
c538cd757e
remove border from piece list item
2015-07-09 16:09:53 +02:00
diminator
9aa81433a6
Merge remote-tracking branch 'remotes/origin/AD-551-work-on-burn-down-list' into AD-419-decouple-piece-registration-from-
...
Conflicts:
js/components/ascribe_detail/edition.js
2015-07-09 14:59:24 +01:00
diminator
bf0a36f2a3
Merge remote-tracking branch 'remotes/origin/AD-551-work-on-burn-down-list' into AD-419-decouple-piece-registration-from-
...
Conflicts:
js/components/ascribe_detail/edition.js
2015-07-09 14:59:16 +01:00
diminator
fd8859fd22
Merge remote-tracking branch 'remotes/origin/master' into AD-419-decouple-piece-registration-from-
...
Conflicts:
js/components/ascribe_detail/edition.js
2015-07-09 14:54:11 +01:00
Tim Daubenschütz
773d42a3b8
add firstEdition to a piece
2015-07-09 15:44:20 +02:00
diminator
9fd4c1a6fd
otherdata and extradata on a piece level and templated in frontend
2015-07-09 13:37:33 +01:00
Tim Daubenschütz
773cab6505
remove piece list edition table toggle and put it inside of accordion list item
2015-07-09 14:04:48 +02:00
Tim Daubenschütz
d514a553f2
reformat intendation for login modal handler
2015-07-09 12:06:09 +02:00
Tim Daubenschütz
35a287b8a1
made edition registration optional
2015-07-09 11:56:54 +02:00
diminator
8ac26275f5
piece view
2015-07-08 22:54:07 +02:00
Tim Daubenschütz
e9f0af3e72
change the default expand of additional settings
2015-07-08 17:46:52 +02:00
Tim Daubenschütz
bfb40bb19e
made edition table row selectable
2015-07-08 17:35:30 +02:00
Tim Daubenschütz
1c470203b7
scroll page to top on pagination
2015-07-08 17:19:06 +02:00
Tim Daubenschütz
59f131f788
add desktop version for notifications
2015-07-08 17:06:53 +02:00
Tim Daubenschütz
5e14ea6f87
refactor globalnotification
2015-07-08 15:40:32 +02:00
Tim Daubenschütz
16dfe3f224
add debug component for globalnotifications
2015-07-08 15:00:11 +02:00
Tim Daubenschütz
c945fc315b
various visual changes
2015-07-08 14:37:20 +02:00
Tim Daubenschütz
e56fbbac2b
fix polling endless loop
2015-07-08 13:05:15 +02:00
Tim Daubenschütz
7cc5585eb1
readd year again
2015-07-08 11:32:55 +02:00
Tim Daubenschütz
3958c104f1
remove licence for piece list item
2015-07-08 10:56:05 +02:00
Tim Daubenschütz
c61fd71108
Merge branch 'master' of bitbucket.org:ascribe/onion
2015-07-08 10:35:58 +02:00
Tim Daubenschütz
72dfcad17d
Merge branch 'AD-438-progressbar-encoding'
...
Conflicts:
js/components/edition.js
2015-07-08 10:35:45 +02:00
Tim Daubenschütz
6d72352580
some minor corrections
2015-07-08 10:15:58 +02:00
Tim Daubenschütz
c1e50cbe78
visual edits to fineuploader
2015-07-08 10:03:06 +02:00
Sylvain Bellemare
f066008ce9
translated english text to french
2015-07-08 09:57:50 +02:00
Tim Daubenschütz
22629ac09d
adjust register piece form
2015-07-07 18:07:12 +02:00
diminator
d5ce1ecde2
bug fix
2015-07-07 15:56:35 +02:00
diminator
4a2ad0ea9d
piece registration without editions
2015-07-07 15:48:09 +02:00
diminator
27c1b390ea
editions optional
2015-07-07 15:25:49 +02:00
diminator
b9e8aae298
Merge remote-tracking branch 'remotes/origin/AD-475-loading-feedback-for-all-views'
...
Conflicts:
sass/ascribe_piece_list_toolbar.scss
2015-07-07 10:34:40 +02:00
diminator
787d48ad11
Merge remote-tracking branch 'origin/master'
2015-07-07 10:28:59 +02:00
diminator
fa2ae7cba8
styling changes for frontend
2015-07-07 10:28:39 +02:00
Tim Daubenschütz
ae9e2e6a28
if user has piece with one edition, do not display show editions
2015-07-07 09:31:56 +02:00
Tim Daubenschütz
ad833a53dc
fix loading feedback for piece list
2015-07-07 09:22:46 +02:00
Tim Daubenschütz
bc53b4b54c
Merge branch 'AD-540-chunked-edition-list-loading-to-a'
2015-07-06 18:35:17 +02:00
Tim Daubenschütz
d5fad09b60
loading animation for show more
2015-07-06 18:29:27 +02:00
Tim Daubenschütz
5ec54f4324
add icons
2015-07-06 17:07:41 +02:00
Tim Daubenschütz
7863431727
add toggle for show more
2015-07-06 15:56:14 +02:00
Tim Daubenschütz
f12a57c3cf
fix merging on ACL action
2015-07-06 15:42:04 +02:00
Tim Daubenschütz
e10b56cfc7
first cut pagination for editions
2015-07-03 16:31:09 +02:00
diminator
37759582ce
cc-staging
2015-07-03 15:52:42 +02:00
vrde
1d6e3cd26c
Add progressbar for encoding
2015-07-03 15:05:14 +02:00
diminator
9d30b9e3b2
embed
2015-07-03 12:35:45 +02:00
diminator
ecef14b4df
fix comma bug
2015-07-03 10:45:37 +02:00
diminator
b760d23813
Merge branch 'master' of bitbucket.org:ascribe/onion
2015-07-03 10:41:32 +02:00
Tim Daubenschütz
643a50a242
Merge branch 'master' of bitbucket.org:ascribe/onion
2015-07-03 10:40:24 +02:00
Tim Daubenschütz
909e9db0b8
add polyfill
2015-07-03 10:40:04 +02:00
diminator
e9c8ab6bf7
Merge remote-tracking branch 'remotes/origin/AD-523-french-translation-of-whole-front'
2015-07-03 10:29:38 +02:00
diminator
3220cfcd5a
Merge remote-tracking branch 'origin/master'
2015-07-02 19:23:23 +02:00
diminator
59cc9cbbce
coa button
2015-07-02 19:22:32 +02:00
Sylvain Bellemare
3eedda7724
[WIP] adding localisation support for French
2015-07-02 19:13:40 +02:00
diminator
fbba3f4670
staging with cors without uglify and lang error
2015-07-02 18:54:47 +02:00
Tim Daubenschütz
ce5b9231af
Merge branch 'AD-527-transition-to-login-form-if-user-'
2015-07-02 18:43:04 +02:00
Tim Daubenschütz
216c63506e
important stuff
2015-07-02 18:42:24 +02:00
diminator
a26e8f7813
test without cors
2015-07-02 18:40:54 +02:00
diminator
531505c0d1
Merge remote-tracking branch 'remotes/origin/AD-506-add-audio-player'
2015-07-02 18:35:04 +02:00
vrde
c2c0fd3ab8
Add audio player
2015-07-02 18:27:09 +02:00
Tim Daubenschütz
dd039b88e8
fix contract fineuploader bugs
2015-07-02 17:57:33 +02:00
vrde
7f8a36b99a
Add videojs and styles
2015-07-02 17:10:32 +02:00
Tim Daubenschütz
24af321669
Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-527-transition-to-login-form-if-user-
2015-07-02 16:51:43 +02:00
Tim Daubenschütz
29fdb1e0d7
fix csrf bug with fineuploaders props
2015-07-02 16:51:22 +02:00
diminator
41da3b2029
footer + social icons
2015-07-02 15:41:17 +02:00
Tim Daubenschütz
3ae94a2100
nail login transition
2015-07-02 15:40:54 +02:00
Tim Daubenschütz
85a1574d41
handle slide_num default for non-set queryParams
2015-07-02 14:53:49 +02:00
Tim Daubenschütz
cb996566c7
couple slides container to url state
2015-07-02 14:42:04 +02:00
diminator
3556e8c3c2
ellipsis
2015-07-02 14:40:04 +02:00
Tim Daubenschütz
3adcbe0f8d
add slide functionality
2015-07-02 13:56:24 +02:00
Tim Daubenschütz
4b87d21259
add working slides container boilerplate
2015-07-02 13:31:35 +02:00
diminator
18f3b51153
fineuploader session with cors
2015-07-02 11:54:33 +02:00
Tim Daubenschütz
1f6d20fb15
Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-527-transition-to-login-form-if-user-
...
Conflicts:
js/components/register_piece.js
2015-07-02 11:50:39 +02:00
Tim Daubenschütz
e542d3b2a5
piece registration animation process
2015-07-02 11:49:17 +02:00
diminator
85347a8916
fineuploader session with cors
2015-07-02 11:35:06 +02:00
diminator
4ca2144c0c
request actions in frontend
2015-07-01 19:05:47 +02:00
Tim Daubenschütz
d0b8610050
update piece list after piece registration
2015-07-01 16:21:49 +02:00
Tim Daubenschütz
740f506ced
fix bug in mergeOptions method
2015-07-01 16:19:02 +02:00
diminator
323a2472b4
Merge remote-tracking branch 'remotes/origin/master' into AD-368-harmonize-functionality-of-ascrib
2015-07-01 15:55:32 +02:00
diminator
5f372eedda
edition_index + default license
2015-07-01 15:28:48 +02:00
Tim Daubenschütz
787f25ddde
fix old edition data bug
2015-07-01 15:23:50 +02:00
diminator
eb947e68aa
licenses in header and on piece level
2015-07-01 13:54:58 +02:00
diminator
1ec47338a1
deleted editions cannot be retrieved
2015-07-01 12:17:50 +02:00
Tim Daubenschütz
b5a5481285
add editable acl to react s3 fineuploader
2015-07-01 12:13:05 +02:00
diminator
f58a65eb0c
s3 views dont accept anonymous
2015-07-01 11:43:33 +02:00
Tim Daubenschütz
2bf7d2cbb3
fix collapse bug concerning accordion table
2015-07-01 11:36:36 +02:00
diminator
ca3b058b4d
Merge remote-tracking branch 'remotes/origin/AD-496-add-control-buttons-to-fineupload' into AD-368-harmonize-functionality-of-ascrib
2015-07-01 11:22:49 +02:00
diminator
3e71926b7d
register piece transitions
2015-07-01 11:21:43 +02:00
Tim Daubenschütz
75ea9e1da6
piece list toolbar responsive
2015-07-01 11:13:45 +02:00
Tim Daubenschütz
a4fd7fc837
rename bitcoin address to id
2015-07-01 10:59:06 +02:00
Tim Daubenschütz
d67bbe7770
made accordion table responsive
2015-07-01 10:53:40 +02:00
Tim Daubenschütz
1db9921dd8
use safe urls for thumbnails and links
2015-07-01 10:00:53 +02:00
diminator
2436e198db
styling + licenses url
2015-07-01 09:15:36 +02:00
Tim Daubenschütz
929c694ad7
finalized delete functionality
2015-06-30 17:57:20 +02:00
Tim Daubenschütz
bb73416a8c
Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-496-add-control-buttons-to-fineupload
2015-06-30 17:14:53 +02:00
diminator
c6528d8999
other_data : delete without cascade and show acl
2015-06-30 17:12:51 +02:00
diminator
5ecd1368f0
Merge remote-tracking branch 'remotes/origin/AD-496-add-control-buttons-to-fineupload' into AD-368-harmonize-functionality-of-ascrib
...
Conflicts:
js/components/ascribe_uploader/react_s3_fine_uploader.js
2015-06-30 17:12:21 +02:00
Tim Daubenschütz
26442c9230
add margins to button lists
2015-06-30 17:12:13 +02:00
Tim Daubenschütz
a8120867b9
add call to action on empty piece list
2015-06-30 16:58:26 +02:00
diminator
5008ade408
otherdata delete
2015-06-30 16:54:45 +02:00
Tim Daubenschütz
2a5bd9173e
fix image scaling
2015-06-30 16:53:22 +02:00
Tim Daubenschütz
e6ac475ad5
add download functionality to s3 fine uploader
2015-06-30 16:15:50 +02:00
diminator
fe4d4c6a72
Merge remote-tracking branch 'remotes/origin/AD-496-add-control-buttons-to-fineupload' into AD-368-harmonize-functionality-of-ascrib
2015-06-30 15:43:48 +02:00
Tim Daubenschütz
9ce6c45690
add sessions for already uploaded files and implement manual deletion
2015-06-30 15:41:39 +02:00
diminator
ce13da4b49
password reset complete + subdomain
2015-06-30 15:26:39 +02:00
diminator
6660065cad
signup process complete + subdomained
2015-06-30 14:46:28 +02:00
Tim Daubenschütz
8c3dfc4b73
made download functionality optional
2015-06-30 13:53:02 +02:00
Tim Daubenschütz
ea47f7a371
add place holder for empty piece list
2015-06-30 13:32:41 +02:00
Tim Daubenschütz
1976dee57a
fix firefox simulate click issue
2015-06-30 11:56:38 +02:00
Tim Daubenschütz
e31b6f0108
Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-496-add-control-buttons-to-fineupload
...
Conflicts:
js/components/register_piece.js
2015-06-30 10:45:07 +02:00
diminator
8fc400bb01
licenses in registration
2015-06-30 10:42:58 +02:00
Tim Daubenschütz
e7f29cd973
fix bug in edition detail
2015-06-30 09:23:26 +02:00
Tim Daubenschütz
31e3c23302
rename upload status variable
2015-06-30 09:20:20 +02:00
Tim Daubenschütz
52db729a4d
readd delete functionality
2015-06-29 17:59:35 +02:00
Tim Daubenschütz
f1d3b3968f
Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-496-add-control-buttons-to-fineupload
2015-06-29 17:37:51 +02:00
Tim Daubenschütz
a66a4e1c9f
add pause and play functionality
2015-06-29 17:37:14 +02:00
diminator
c6bc34c2f7
otherdata POST and fineuploader_session OK
2015-06-29 17:21:14 +02:00
Tim Daubenschütz
dbbf9fd233
debug
2015-06-29 16:57:31 +02:00
Tim Daubenschütz
e44ae60b75
first cut pause
2015-06-29 16:46:12 +02:00
Tim Daubenschütz
8064fdb39d
Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-496-add-control-buttons-to-fineupload
2015-06-29 16:19:04 +02:00
Tim Daubenschütz
90e8278504
integrate file sessions for edition detail
2015-06-29 16:17:57 +02:00
diminator
ea770943f2
editions and api_urls
2015-06-29 16:15:41 +02:00
diminator
e36681ad4d
Merge remote-tracking branch 'remotes/origin/AD-496-add-control-buttons-to-fineupload' into AD-368-harmonize-functionality-of-ascrib
...
Conflicts:
js/components/ascribe_uploader/react_s3_fine_uploader.js
2015-06-29 16:15:08 +02:00
Tim Daubenschütz
6c44333f1a
add file drag and drop toolbar
2015-06-29 16:00:26 +02:00
diminator
f3677501c1
whitelabel subdomains
2015-06-29 15:58:47 +02:00
Tim Daubenschütz
dcb3e00e3a
styling for mobile
2015-06-29 14:36:55 +02:00
Tim Daubenschütz
867ebec134
fix styling for fineuploader
2015-06-29 13:41:37 +02:00
Tim Daubenschütz
a87f2eb272
refactor form validation
2015-06-29 11:44:16 +02:00
Tim Daubenschütz
1a9c82d683
finalize delete and cancel functionality
2015-06-29 11:01:45 +02:00
Tim Daubenschütz
66fff1c50a
implement cancel functionality
2015-06-29 10:01:54 +02:00
diminator
5916c27c45
uploader defaultprops
2015-06-29 10:00:26 +02:00
diminator
2c2ccd7891
Merge remote-tracking branch 'remotes/origin/AD-496-add-control-buttons-to-fineupload' into AD-504-revive-coa-for-new-frontend
2015-06-26 11:52:59 +02:00
diminator
eff25a9801
withdraw transfer with delete of transfer record
2015-06-26 11:44:35 +02:00
diminator
99d6dd278c
withdraw fix
2015-06-26 01:05:20 +02:00
diminator
7e115e26ad
withdraw transfer part one
2015-06-26 00:38:40 +02:00
diminator
930982873a
Merge remote-tracking branch 'remotes/origin/master' into AD-504-revive-coa-for-new-frontend
2015-06-26 00:04:25 +02:00
diminator
b1ad4cc36f
withdraw transfer part one
2015-06-25 23:25:03 +02:00
diminator
64017f604c
login location with baseurl
2015-06-25 15:30:47 +02:00
diminator
93c1b2e826
login location with baseurl
2015-06-25 15:25:34 +02:00
diminator
d980ef7949
verify button link
2015-06-25 15:23:10 +02:00
