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