Brett Sun
|
8ba9eb20b6
|
Add better PropType validation for components
|
2016-02-05 11:53:33 +01:00 |
|
Brett Sun
|
826ca08073
|
Merge with master
|
2016-02-05 10:38:59 +01:00 |
|
Brett Sun
|
40041197d6
|
Update components for loading WhitelabelStore from top level app
|
2016-01-11 19:22:25 +01:00 |
|
Brett Sun
|
1c4ca0d152
|
Change RegisterPieceForm and parents for loading UserStore from top level app
|
2016-01-11 18:16:46 +01:00 |
|
Brett Sun
|
8531b77633
|
Merge with master
|
2016-01-11 17:52:32 +01:00 |
|
Brett Sun
|
443be236f5
|
Whitespace fix for comments
|
2016-01-11 16:26:36 +01:00 |
|
Brett Sun
|
06ea23c627
|
Update prize routes for loading user and whitelabel settings in top level app
|
2016-01-11 15:14:54 +01:00 |
|
Brett Sun
|
d622ddac06
|
Load current user and whitelabel settings in AscribeApp
|
2016-01-11 12:54:15 +01:00 |
|
Tim Daubenschütz
|
49421e1fa1
|
Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form
Conflicts:
js/components/ascribe_detail/further_details_fileuploader.js
js/components/ascribe_forms/form.js
js/components/ascribe_forms/form_loan.js
js/components/ascribe_forms/form_register_piece.js
js/components/ascribe_forms/input_fineuploader.js
js/components/ascribe_forms/property.js
js/components/ascribe_forms/property_collapsible.js
js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js
js/components/ascribe_uploader/react_s3_fine_uploader.js
js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artist_details_form.js
js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artwork_details_form.js
sass/ascribe-fonts/ascribe-fonts.scss
sass/whitelabel/wallet/cyland/cyland_custom_style.scss
|
2015-12-07 13:39:30 +01:00 |
|
diminator
|
743c11df5b
|
fixed cyland/ikono serializers
|
2015-12-02 18:56:48 +01:00 |
|
Tim Daubenschütz
|
fe24a5e15a
|
Remove all occurrences of inactivity mgmt of ReactS3Fineuploader
|
2015-12-02 12:37:21 +01:00 |
|
Tim Daubenschütz
|
25372a3edf
|
Include PropertyCollapsible's functionality into Property
|
2015-11-18 16:31:37 +01:00 |
|
Tim Daubenschütz
|
b78bc66fe9
|
Fix minor bugs for simple_prize app
|
2015-11-06 15:47:55 +01:00 |
|
vrde
|
66dbf3da71
|
Add document title management for the ascribe app
|
2015-10-13 16:42:40 +02:00 |
|
Tim Daubenschütz
|
299007baab
|
Refactor redirect and redirectAuthenticated
|
2015-10-09 13:51:21 +02:00 |
|
Tim Daubenschütz
|
b4f9c11c16
|
Implement loggedOut routings
|
2015-10-07 09:39:30 +02:00 |
|
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 |
|