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
