1
0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 01:25:17 +01:00
Commit Graph

619 Commits

Author SHA1 Message Date
vrde
695a195e55 Replace history for slider 2015-07-14 12:32:18 +02:00
diminator
927c89f342 Merged in AD-419-decouple-piece-registration-from- (pull request #7)
Ad 419 decouple piece registration from
2015-07-14 00:00:19 +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
vrde
3b1fdba80f Merge branch 'AD-565-add-landing-page-for-sluice' 2015-07-13 23:58:15 +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
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
vrde
b4f1d3d6cc Merge branch 'master' into AD-565-add-landing-page-for-sluice
Conflicts:
	js/components/login_container.js
2015-07-13 17:19:23 +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
vrde
3878dc12da Merge branch 'AD-419-decouple-piece-registration-from-' into AD-565-add-landing-page-for-sluice 2015-07-13 16:35:49 +02:00
vrde
8f07abc39b WIP 2015-07-13 16:34:26 +02:00
Tim Daubenschütz
ad6dd40867 Merge branch 'master' into AD-419-decouple-piece-registration-from- 2015-07-13 15:31:44 +02:00
Tim Daubenschütz
54ab0922cf Merge branch 'master' of bitbucket.org:ascribe/onion 2015-07-13 15:28:38 +02:00
Tim Daubenschütz
6372a5af20 adjusted frontend to use first_edition from piece directly 2015-07-13 15:28:28 +02:00
TimDaubenschuetz
80be7e67be Merged in AD-555-prevent-email-enumeration (pull request #6)
removed messages indicating that the email is valid
2015-07-13 15:26:35 +02:00
Tim Daubenschütz
733c95a070 loading feedback for piece and edition page 2015-07-13 15:21:09 +02:00
Tim Daubenschütz
3ae10c5e50 first cut loading spinner pieces 2015-07-13 15:00:12 +02:00
Tim Daubenschütz
fd094aa471 remove first edition routine 2015-07-13 14:49:39 +02:00
Sylvain Bellemare
1497ed45eb removed messages indicating that the email is valid 2015-07-13 14:36:29 +02:00
Tim Daubenschütz
11545c13a6 reorder edition collapsible paragraphs 2015-07-13 14:30:24 +02:00
vrde
3fbe60692e Working on landing 2015-07-13 14:29:20 +02:00
Tim Daubenschütz
b51a03ce9c styling changes 2015-07-13 14:19:22 +02:00
diminator
a07bc9e0e2 piece + share
acl first cut
2015-07-13 14:10:46 +02:00
Tim Daubenschütz
c8649306d4 fix collection queryParams bug 2015-07-13 13:51:16 +02:00
Tim Daubenschütz
5011304939 fix spool color 2015-07-13 10:11:25 +02:00
Tim Daubenschütz
3dd5626eb9 fix polling bug 2015-07-13 10:07:22 +02:00
diminator
88ff4b55d6 acl buttons and share forms for pieces/editions 2015-07-10 20:00:35 +02:00