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
Tim Daubenschütz
1a1ba8bbb1
add ellipsis again
2015-07-27 18:19:55 +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
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
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
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
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
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
13e151e83b
add logging and responsive user navigation
2015-07-16 19:12:18 +02:00
Tim Daubenschütz
ee6d2789ed
set csrftokens as constants
2015-07-16 18:17:45 +02:00
Tim Daubenschütz
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
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
