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
|
d343acaac5
|
Merged in AD-544-automatically-share-registered-pr (pull request #32)
Ad 544 automatically share registered pr
|
2015-08-06 14:02:16 +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 |
|
TimDaubenschuetz
|
716d680d0f
|
Merged in AD-589-Form-Cancel-doesnt-reset (pull request #31)
fix property reset function
|
2015-08-06 13:51:18 +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 |
|
diminator
|
18c7e2bc93
|
invite user with token and signup without email validation
|
2015-08-05 19:22:58 +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 |
|
TimDaubenschuetz
|
64fedc7e32
|
Merged in AD-699-rename-prize-endpoint-to-prizes (pull request #26)
Ad 699 rename prize endpoint to prizes
|
2015-08-04 16:09:02 +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
|
b5d9ed2569
|
Merge branch 'AD-708-fineuploader-process-logging'
|
2015-08-03 18:37:57 +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 |
|
TimDaubenschuetz
|
34a47d0290
|
Merged in AD-708-fineuploader-process-logging (pull request #28)
Ad 708 fineuploader process logging
|
2015-08-03 12:56:21 +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 |
|
Tim Daubenschütz
|
5289626b2d
|
update readme and gitignore
|
2015-07-30 14:36:19 +02:00 |
|
diminator
|
950e63b6d0
|
content copy for hash_locally
|
2015-07-30 14:04:39 +02:00 |
|
Tim Daubenschütz
|
d1ed25fe97
|
ellipsis for artist name in accordion list item
|
2015-07-30 13:27:05 +02:00 |
|
Tim Daubenschütz
|
2abd3c4a97
|
search bar padding
|
2015-07-30 11:56:13 +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 |
|