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
|
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 |
|
Tim Daubenschütz
|
f8b87a8849
|
finish register artwork for prize
|
2015-07-14 20:35:16 +02:00 |
|
Tim Daubenschütz
|
18898b6f8a
|
start working on register piece for price - WIP
|
2015-07-14 20:07:55 +02:00 |
|
Tim Daubenschütz
|
aa5934cd25
|
made inputcheckbox component generic
|
2015-07-14 19:53:49 +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
|
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 |
|
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 |
|
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
|
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 |
|
vrde
|
19f82b2bbd
|
work on register piece for for prize
|
2015-07-13 22:58:53 +02:00 |
|
Tim Daubenschütz
|
60600a72d4
|
refactor bulk acls for backend adjustment
|
2015-07-13 21:19:45 +02:00 |
|
vrde
|
7aea6669c9
|
Refactor login and signup
|
2015-07-13 20:47:43 +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
|
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 |
|
diminator
|
1f73811950
|
register form separate
spinner => spans
|
2015-07-13 18:13:47 +02:00 |
|
Tim Daubenschütz
|
85ba816a53
|
separate polling-success functionality
|
2015-07-13 18:13:16 +02:00 |
|
Tim Daubenschütz
|
e71c2f9fe0
|
separate create edition form logic
|
2015-07-13 17:09:44 +02:00 |
|
vrde
|
232a4ede92
|
Add form_login
|
2015-07-13 16:59:12 +02:00 |
|
vrde
|
db1c6a530a
|
Refactor login/signup containers
|
2015-07-13 16:57:25 +02:00 |
|
diminator
|
a07bc9e0e2
|
piece + share
acl first cut
|
2015-07-13 14:10:46 +02:00 |
|
diminator
|
88ff4b55d6
|
acl buttons and share forms for pieces/editions
|
2015-07-10 20:00:35 +02:00 |
|
diminator
|
62289be5ce
|
polling for editions
|
2015-07-10 18:51:35 +02:00 |
|
diminator
|
e282da8474
|
Merge remote-tracking branch 'remotes/origin/AD-551-work-on-burn-down-list' into AD-419-decouple-piece-registration-from-
|
2015-07-10 17:52:39 +02:00 |
|
Tim Daubenschütz
|
e55bc239b4
|
refactor signup form
|
2015-07-10 16:04:57 +02:00 |
|
Tim Daubenschütz
|
b364414e16
|
input checkbox functionality
|
2015-07-10 15:56:54 +02:00 |
|
diminator
|
8679a2446d
|
Merge remote-tracking branch 'remotes/origin/AD-551-work-on-burn-down-list' into AD-419-decouple-piece-registration-from-
|
2015-07-10 14:49:19 +02:00 |
|
Tim Daubenschütz
|
62ae8fd08b
|
fix warnings
|
2015-07-10 14:15:22 +02:00 |
|
Tim Daubenschütz
|
1df068d75f
|
add edition creation functionality
|
2015-07-10 13:54:25 +02:00 |
|
diminator
|
6a84e9d36e
|
whitelabel logo + sluice
|
2015-07-10 11:59:03 +02:00 |
|
diminator
|
22b201f388
|
register piece returns to piece detail
|
2015-07-10 10:30:17 +02:00 |
|
diminator
|
bf0a36f2a3
|
Merge remote-tracking branch 'remotes/origin/AD-551-work-on-burn-down-list' into AD-419-decouple-piece-registration-from-
Conflicts:
js/components/ascribe_detail/edition.js
|
2015-07-09 14:59:16 +01:00 |
|
diminator
|
fd8859fd22
|
Merge remote-tracking branch 'remotes/origin/master' into AD-419-decouple-piece-registration-from-
Conflicts:
js/components/ascribe_detail/edition.js
|
2015-07-09 14:54:11 +01:00 |
|
diminator
|
9fd4c1a6fd
|
otherdata and extradata on a piece level and templated in frontend
|
2015-07-09 13:37:33 +01:00 |
|
Tim Daubenschütz
|
773cab6505
|
remove piece list edition table toggle and put it inside of accordion list item
|
2015-07-09 14:04:48 +02:00 |
|