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
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
