Brett Sun
61cd316a86
Merge branch 'AD-1255-refactor-aclbuttons-form-creatio' into AD-1309-change-share-to-email
2015-11-09 20:08:11 +01:00
Brett Sun
8dc0470007
Add Twitter button
2015-11-09 19:01:27 +01:00
Tim Daubenschütz
31d9b85ddd
Merge pull request #19 from ascribe/Remove-deadcode-fineuploader.min.js
...
Remove s3.fine-uploader.min.js as we're using s3.fine-uploader.js for shiming anyways
2015-11-09 17:55:35 +01:00
Tim Daubenschütz
9ae6b10add
Finalizing basic submission flow with lazy evaluated form
2015-11-09 17:52:09 +01:00
Brett Sun
d972da935a
Add Facebook Share button
2015-11-09 17:46:49 +01:00
Tim Daubenschütz
deceb61c60
Implement lazy blob creation routine and increase robustness of upload button template for react-fineuploader
2015-11-09 16:58:35 +01:00
Brett Sun
7c73b7fac7
Refactor InjectInHeadMixin to be a util class instead
2015-11-09 14:32:14 +01:00
Tim Daubenschütz
3e22ad1d9d
Finalize layouting submission form
2015-11-09 10:35:23 +01:00
Tim Daubenschütz
7721d62319
Create boilerplate code for portfolioreview
2015-11-06 16:52:08 +01:00
Tim Daubenschütz
b78bc66fe9
Fix minor bugs for simple_prize app
2015-11-06 15:47:55 +01:00
Tim Daubenschütz
f5a5e045a6
Finalize boilerplate for portfolioreview subdomain
2015-11-06 15:18:46 +01:00
Tim Daubenschütz
5adc34faeb
Move and rename sluice prize app to 'simple_prize'
2015-11-06 15:18:36 +01:00
Brett Sun
56eff0d9ed
Improve DRYness of acl buttons
...
The React dev tools don’t seem to be able to automatically pick up the
displayName when using createClass from within another function, so
it’s added here to give clarity when debugging.
2015-11-06 15:10:29 +01:00
Tim Daubenschütz
8892ac4225
Add additional fields to step two of cyland's loan process
2015-11-05 11:56:09 +01:00
Brett Sun
2711c4ddb9
Move onChange() to after componentWillUnmount() for ESLint
2015-11-04 13:57:15 +01:00
Brett Sun
543605aae3
Move store resets to componentDidMount()
2015-11-04 13:56:43 +01:00
Tim Daubenschütz
9a54ebdbd7
Merge pull request #15 from ascribe/AD-1256-refactor-modalwrapper-to-not-be-
...
Refactor ModalWrapper to not require a trigger component
2015-11-03 17:21:11 +01:00
Brett Sun
f2555aefcc
Add email prop to loan and consign button
2015-11-03 11:12:04 +01:00
Tim Daubenschütz
c6f6bb398d
Replace all occurrences of with momentjs
2015-11-03 10:57:41 +01:00
Tim Daubenschütz
4d526a5568
Merge pull request #11 from ascribe/AD-1251-refactor-inputtextareatoggables-
...
Refactor InputTextAreaToggable's required property to take a bool instead of a string
2015-11-03 10:25:46 +01:00
Tim Daubenschütz
cd4157df32
Remove s3.fine-uploader.min.js as we're using s3.fine-uploader.js for shiming anyways
2015-11-03 10:21:43 +01:00
Brett Sun
05e3069240
Add propTypes to acl buttons
2015-11-02 18:44:09 +01:00
Brett Sun
fe4e337690
Use Object.assign() instead of writing own merge function
2015-11-02 18:27:45 +01:00
Tim Daubenschütz
0157c048ab
Add cache invalidation for signup and login
2015-11-02 15:38:37 +01:00
Brett Sun
8540e3de36
Bring over missed changes for cyland for changes to form utils
2015-11-02 15:36:18 +01:00
Brett Sun
a0ebc7dc58
Use string formatting for RequestActionForm's notification message
2015-11-02 15:21:33 +01:00
Brett Sun
fe06ea607f
Remove unnecessary default props
2015-11-02 15:20:02 +01:00
Brett Sun
6c8016e094
Remove misleading editions prop to pieceOrEditions
2015-11-02 15:19:52 +01:00
Brett Sun
49f20462f1
Check for a new csrf token on componentWillReceiveProps instead of componentWillUpdate
...
this.setState() should not be used in componentWillUpdate():
https://facebook.github.io/react/docs/component-specs.html#updating-comp
onentwillupdate
2015-11-02 12:10:41 +01:00
Tim Daubenschütz
0770a1ed61
Implement cache invalidation functionality for UserStore & UserSources
2015-11-02 11:31:02 +01:00
Brett Sun
5f5461c10d
Remove warning for missing prop from FurtherDetailsFileUploader
2015-11-02 10:42:15 +01:00
Brett Sun
a513af984d
Update cyland for FineUploader changes
2015-11-02 10:41:59 +01:00
Tim Daubenschütz
147c852b02
Replace getFullYear() with getUTCFullYear()
2015-11-02 10:32:48 +01:00
Brett Sun
d23331d9b9
Remove ReactS3FineUploader's dependency on react-router's location
...
ReactS3FineUploader used to check the current url’s query params to
determine which method it should use to upload, but this decision means
the component is tightly coupled with react-router and history.js. A
major pain point is having to propagate the location prop all the way
down to this component even when it’s not necessary.
Now, ReactS3FineUploader’s parent elements can either parse the current
query params themselves or, if they have a location from react-router,
simply use the location.
Added a few utils to help parse url params.
2015-10-30 17:43:20 +01:00
Brett Sun
67fbfbd470
Update RequestActionForm to use form utils
2015-10-30 11:46:01 +01:00
Brett Sun
5bec3c5dc6
Use const for the cloned trigger element
2015-10-30 11:13:32 +01:00
Brett Sun
03e0bbd024
Separate form building concerns from AclButton
...
AclButton’s form building is now delegated to AclFormFactory so other
components can use the same forms with ease. Its show/hide behaviour is
also now controlled with AclProxy.
2015-10-30 11:10:31 +01:00
Brett Sun
c242cffdbd
Bring over changes for acl_button from Lumenus
2015-10-29 17:04:31 +01:00
Brett Sun
22234492e6
Refactor ModalWrapper to not require a trigger component
2015-10-29 16:23:02 +01:00
Brett Sun
864e0bd2a6
Remove redundant truth check for required prop
2015-10-29 15:45:00 +01:00
Cevo
3cf59ae2af
added public note to piece
2015-10-29 15:31:25 +01:00
Tim Daubenschütz
590818cf0b
Merge pull request #10 from ascribe/cleanup-utility-file-declarations
...
Move code from head_setter.js to dom_utils.js and adjust function-com…
2015-10-29 13:25:15 +01:00
Brett Sun
906ef7c37e
Refactor InputTextAreaToggable's required property to take a bool instead
2015-10-28 19:19:14 +01:00
Tim Daubenschütz
66b86209bf
Add appropriate spaces to import statement in header.js
2015-10-28 17:55:44 +01:00
Tim Daubenschütz
ee4c8f624e
Move code from head_setter.js to dom_utils.js and adjust function-comments
2015-10-28 17:45:28 +01:00
Tim Daubenschütz
cc8e455a0e
Merge pull request #8 from ascribe/AD-1233-delete-button-is-way-to-prominent
...
Change delete button back to old styling
2015-10-28 15:56:02 +01:00
Tim Daubenschütz
5788e77501
Merge pull request #9 from ascribe/AD-1219-sort-by-and-filter-drop-down-widget-are-cut-off
...
Pull DropdownButtons in collection to the right, to make them work al…
2015-10-27 18:11:00 +01:00
Tim Daubenschütz
6217663fe0
Pull DropdownButtons in collection to the right, to make them work also on mobile
2015-10-27 17:34:31 +01:00
Tim Daubenschütz
d617f7212f
Merge pull request #7 from ascribe/AD-1237-navbar-ascribe-logo-doesnt-link
...
AD-1237 Navbar Ascribe Logo Doesn't Link
2015-10-27 17:19:44 +01:00
Tim Daubenschütz
9765ed040b
Add tertiary button style
2015-10-27 17:15:23 +01:00
Tim Daubenschütz
12c7fa7ba4
Change delete button back to old styling
2015-10-27 16:32:26 +01:00
Brett Sun
7e438dcaf5
Add link to /collection to ascribe branding on navbar
2015-10-27 11:44:40 +01:00
Tim Daubenschütz
dc813f2687
Merge pull request #4 from ascribe/AD-1075-year-before-1000-starts-with-0
...
Fix correct year extraction from date-string in edition and piece detail
2015-10-27 10:59:29 +01:00
Tim Daubenschütz
969d2f8b34
Merge pull request #5 from ascribe/AD-1209-Sort-by-widget-is-using-wrong-native-UI-elements
...
Change input type in PieceListToolbarOrderWidget from "checkbox" to "…
2015-10-27 10:56:21 +01:00
Tim Daubenschütz
4dbed67a63
Merge pull request #3 from ascribe/AD-1229-aclinformation-button-on-no-available-buttons-fails
...
Login validation for ACL actions in edition and piece detail
2015-10-27 10:53:49 +01:00
Tim Daubenschütz
576fa39167
Fix wrong pushState invocation
2015-10-27 09:59:46 +01:00
Tim Daubenschütz
fc4d4dbe17
Change input type in PieceListToolbarOrderWidget from "checkbox" to "radio"
2015-10-26 17:12:24 +01:00
Tim Daubenschütz
384ec0f445
Fix correct year extraction from date-string in
...
AccordionListItemWallet
WalletPieceContainer
2015-10-26 16:20:33 +01:00
Tim Daubenschütz
42733740db
Fix correct year extraction from date-string in
...
AccordionListItemPrize
PrizePieceContainer
CylandAccordionListItem
IkonotvAccordionListItem
2015-10-26 16:07:31 +01:00
Tim Daubenschütz
1207522266
Fix correct year extraction from date-string in edition and piece detial view
2015-10-26 15:39:33 +01:00
Tim Daubenschütz
d48da96e3b
Add login-validation to actions DetailProperty in Edition and Piece detail view
2015-10-26 11:21:22 +01:00
TimDaubenschuetz
d0f6f1571d
Merged in AD-538-users-and-even-devs-are-unsure-wh (pull request #94 )
...
Ad 538 users and even devs are unsure wh
2015-10-23 11:25:50 +02:00
Tim Daubenschütz
3bf70628c1
Finalizing behavior of AclInformation
2015-10-23 11:24:26 +02:00
Tim Daubenschütz
cd3c8b8f6e
Complete visual styling
2015-10-23 10:37:23 +02:00
Tim Daubenschütz
e8a9cd89a4
Add resizing functionality to AclButtonList and AclInformation
2015-10-23 09:29:17 +02:00
Tim Daubenschütz
b77beb0b1e
Replace last occurences of ascribe-spool-chunked
2015-10-22 17:17:38 +02:00
Tim Daubenschütz
d4de2434ee
Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh
...
Conflicts:
js/components/ascribe_forms/form_share_email.js
js/components/ascribe_forms/form_transfer.js
js/utils/general_utils.js
sass/main.scss
2015-10-22 13:38:49 +02:00
Tim Daubenschütz
ef14fc9b2e
Fix edition deletion redirect
2015-10-22 13:21:07 +02:00
Tim Daubenschütz
68b608763a
Merge remote-tracking branch 'origin/master' into AD-756-branding-for-sluiceascribeio-brow
...
Conflicts:
js/components/header.js
js/utils/head_setter.js
2015-10-22 12:00:59 +02:00
TimDaubenschuetz
e16198e3ab
Merged in AD-1080-restyle-webapp-with-new-corporate-identity (pull request #104 )
...
Ad 1080 restyle webapp with new corporate identity
2015-10-22 11:55:34 +02:00
Sylvain Bellemare
ffb699f3f3
Point to apiary-based docs - fixes AD-1218
2015-10-22 11:52:14 +02:00
Tim Daubenschütz
b2a9eb1c7c
Add thumbnail replacement for new logo
2015-10-22 10:39:11 +02:00
Tim Daubenschütz
7f97ce9828
Handle deletion method for WalletPieceContainer
2015-10-21 23:45:53 +02:00
TimDaubenschuetz
bb18676020
Merged master into AD-1080-restyle-webapp-with-new-corporate-identity
2015-10-21 21:25:49 +02:00
Tim Daubenschütz
a9fa60eaf2
Fix buttons for cc
2015-10-21 14:52:25 +02:00
Tim Daubenschütz
61cb4c87a9
Replace ascribe-green-color with new ascribe-blue-color
2015-10-21 11:34:12 +02:00
Tim Daubenschütz
cd1cdfeede
Change font-weights, remove gibson from local CSS file and fix glitches
2015-10-21 10:35:11 +02:00
Brett Sun
f1e9f4a0c8
Add missing space to accordion list placeholder
2015-10-21 09:57:40 +02:00
Tim Daubenschütz
fad6caca63
Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity
...
Conflicts:
js/components/ascribe_detail/edition_container.js
js/components/logout_container.js
2015-10-21 09:47:14 +02:00
Tim Daubenschütz
8d0e9a42fc
Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh
...
Conflicts:
package.json
2015-10-20 18:11:41 +02:00
Tim Daubenschütz
ddc2e7b919
Rename intersectAcls to intersectList and do some clean up
2015-10-20 18:10:48 +02:00
Tim Daubenschütz
8417c2781e
Making AclInformation more robust by adding checks for if the information to display is available
2015-10-20 18:00:59 +02:00
Tim Daubenschütz
738e94a43d
Change helper texts
2015-10-20 17:22:40 +02:00
Tim Daubenschütz
beee069d3f
Minor layouting fixes
2015-10-20 15:51:22 +02:00
Tim Daubenschütz
22a95f07fd
Further cleanup
2015-10-20 15:10:18 +02:00
vrde
e220ee6fbb
Merge branch 'AD-697-update-title-in-the-browser'
2015-10-20 15:06:41 +02:00
vrde
a1827b329c
Merge branch 'AD-1195-window-videojs-is-not-a-func'
2015-10-20 15:04:47 +02:00
diminator
3a503db396
Merged in AD-1174-collecting-society-info-is-showi (pull request #102 )
...
Put CopyrightAssociationForm in AclProxy
2015-10-20 14:41:45 +02:00
vrde
1a6ddf67ac
Add fall back if client cannot load 3rd party libs
2015-10-20 14:16:49 +02:00
vrde
7ce98d0433
Fix comments on PR
2015-10-19 17:24:49 +02:00
TimDaubenschuetz
5a35e40a76
Merged in AD-947-fileuploader-button-does-not-work (pull request #100 )
...
Remove stopPropagation for event in FileDragAndDrop
2015-10-19 14:53:02 +02:00
Tim Daubenschütz
019ff6c7ed
Fix simulate click for Opera
2015-10-19 14:22:20 +02:00
Tim Daubenschütz
f0d8e32ecf
Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity
...
Conflicts:
js/components/ascribe_accordion_list/accordion_list_item_piece.js
js/components/ascribe_app.js
js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js
js/components/logout_container.js
js/components/whitelabel/wallet/wallet_app.js
2015-10-19 10:30:14 +02:00
TimDaubenschuetz
d66c201a98
Merged in AD-727-missing-redirects-to-login-page (pull request #95 )
...
Ad 727 missing redirects to login page
2015-10-19 10:13:54 +02:00
Tim Daubenschütz
b964bde281
Merge branch 'AD-1080-restyle-webapp-with-new-corporate-identity' of bitbucket.org:ascribe/onion into AD-1080-restyle-webapp-with-new-corporate-identity
2015-10-16 13:10:44 +02:00
Tim Daubenschütz
69e75f5ce0
Add AscribeSpinner to LogoutContainer
2015-10-16 13:10:18 +02:00
Tim Daubenschütz
5e6e2e8cb0
Redirect directly to /login on loggout
2015-10-16 13:01:54 +02:00
diminator
f8d2d39b2d
thumbnails, header, footer, pager
2015-10-16 13:00:19 +02:00
Tim Daubenschütz
712ec74247
add getLangText
2015-10-16 12:10:28 +02:00
Tim Daubenschütz
32d317cdef
add download button to loan form
2015-10-16 11:29:08 +02:00