Tim Daubenschütz
|
28dfcfa75a
|
Merge remote-tracking branch 'origin/master' into AD-727-missing-redirects-to-login-page
Conflicts:
js/components/ascribe_detail/edition.js
js/components/ascribe_forms/form_login.js
js/components/ascribe_forms/form_signup.js
|
2015-10-06 16:40:02 +02:00 |
|
Tim Daubenschütz
|
83c652a4f0
|
Rename pieces routes back to collection
|
2015-10-01 14:30:11 +02:00 |
|
Tim Daubenschütz
|
829f2c592b
|
Switch all usages of Router.Navigation and Router.State
|
2015-10-01 11:16:38 +02:00 |
|
Tim Daubenschütz
|
8cd4377a58
|
Change links in app to new react-router@1.0rc1 syntax
|
2015-09-30 18:30:50 +02:00 |
|
Tim Daubenschütz
|
88423e6757
|
fix scroll overflow
|
2015-08-12 16:26:24 +02:00 |
|
Tim Daubenschütz
|
0cf5815f42
|
add functionality to make a forwarded process slide container
|
2015-08-12 16:11:15 +02:00 |
|
Tim Daubenschütz
|
9630d043db
|
first slide cyland archive submission
|
2015-08-12 09:52:51 +02:00 |
|
Tim Daubenschütz
|
8612f73e96
|
separate cc register form
|
2015-08-12 09:30:24 +02:00 |
|
diminator
|
d1edf898fc
|
api tokens with panel instead of property
Conflicts:
js/components/settings_container.js
|
2015-08-10 11:08:18 +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
|
68f4decaad
|
remove FormPropertyHeader
|
2015-08-06 10:23:01 +02:00 |
|
diminator
|
792325f71d
|
acl_create_editions
|
2015-08-05 16:02:48 +02:00 |
|
Tim Daubenschütz
|
17b991e06b
|
adjust store calls to fetch list to new interface
|
2015-08-04 11:48:12 +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 |
|
Tim Daubenschütz
|
af42bb8e67
|
error handling first cut
|
2015-07-17 15:41:09 +02:00 |
|
diminator
|
7c546edc2b
|
fix acl and editions
|
2015-07-15 17:33:38 +02:00 |
|
Tim Daubenschütz
|
7d9d2ed6b5
|
fix edition creation
|
2015-07-15 16:55:04 +02:00 |
|
Tim Daubenschütz
|
f1e90795f0
|
specify editions generically by whitelabel
|
2015-07-15 01:40:48 +02:00 |
|
Tim Daubenschütz
|
6bf28dbfa4
|
fix specify editions in register piece
|
2015-07-14 10:17:12 +02:00 |
|
vrde
|
19f82b2bbd
|
work on register piece for for prize
|
2015-07-13 22:58:53 +02:00 |
|
vrde
|
7aea6669c9
|
Refactor login and signup
|
2015-07-13 20:47:43 +02:00 |
|
diminator
|
1f73811950
|
register form separate
spinner => spans
|
2015-07-13 18:13:47 +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 |
|
diminator
|
6f7600fca2
|
login errors + request obfuscated
|
2015-07-10 15:52:09 +02:00 |
|
Tim Daubenschütz
|
ca72168da2
|
Merge remote-tracking branch 'origin/AD-419-decouple-piece-registration-from-' into AD-551-work-on-burn-down-list
|
2015-07-10 10:32:42 +02:00 |
|
Tim Daubenschütz
|
bcb1bbe29b
|
first cut edition creation in piece list item
|
2015-07-10 10:32:39 +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 |
|
Tim Daubenschütz
|
35a287b8a1
|
made edition registration optional
|
2015-07-09 11:56:54 +02:00 |
|
diminator
|
8ac26275f5
|
piece view
|
2015-07-08 22:54:07 +02:00 |
|
Tim Daubenschütz
|
c945fc315b
|
various visual changes
|
2015-07-08 14:37:20 +02:00 |
|
Tim Daubenschütz
|
c61fd71108
|
Merge branch 'master' of bitbucket.org:ascribe/onion
|
2015-07-08 10:35:58 +02:00 |
|
Tim Daubenschütz
|
c1e50cbe78
|
visual edits to fineuploader
|
2015-07-08 10:03:06 +02:00 |
|
Sylvain Bellemare
|
f066008ce9
|
translated english text to french
|
2015-07-08 09:57:50 +02:00 |
|
Tim Daubenschütz
|
22629ac09d
|
adjust register piece form
|
2015-07-07 18:07:12 +02:00 |
|
diminator
|
4a2ad0ea9d
|
piece registration without editions
|
2015-07-07 15:48:09 +02:00 |
|
diminator
|
27c1b390ea
|
editions optional
|
2015-07-07 15:25:49 +02:00 |
|
diminator
|
fa2ae7cba8
|
styling changes for frontend
|
2015-07-07 10:28:39 +02:00 |
|
Tim Daubenschütz
|
216c63506e
|
important stuff
|
2015-07-02 18:42:24 +02:00 |
|
Tim Daubenschütz
|
29fdb1e0d7
|
fix csrf bug with fineuploaders props
|
2015-07-02 16:51:22 +02:00 |
|
Tim Daubenschütz
|
3ae94a2100
|
nail login transition
|
2015-07-02 15:40:54 +02:00 |
|
Tim Daubenschütz
|
85a1574d41
|
handle slide_num default for non-set queryParams
|
2015-07-02 14:53:49 +02:00 |
|
Tim Daubenschütz
|
cb996566c7
|
couple slides container to url state
|
2015-07-02 14:42:04 +02:00 |
|
Tim Daubenschütz
|
3adcbe0f8d
|
add slide functionality
|
2015-07-02 13:56:24 +02:00 |
|
Tim Daubenschütz
|
4b87d21259
|
add working slides container boilerplate
|
2015-07-02 13:31:35 +02:00 |
|
Tim Daubenschütz
|
1f6d20fb15
|
Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-527-transition-to-login-form-if-user-
Conflicts:
js/components/register_piece.js
|
2015-07-02 11:50:39 +02:00 |
|
Tim Daubenschütz
|
e542d3b2a5
|
piece registration animation process
|
2015-07-02 11:49:17 +02:00 |
|