Tim Daubenschütz
da73d40fd6
Merge branch 'master' into AD-1264-refactor-reacts3fineuploader-to-
...
Cleared all conflicts
Conflicts:
js/components/ascribe_forms/form.js
js/components/ascribe_forms/input_fineuploader.js
js/components/ascribe_uploader/react_s3_fine_uploader.js
js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
js/utils/requests.js
2015-11-16 15:27:00 +01:00
Tim Daubenschütz
286dd114af
Merge pull request #16 from ascribe/AD-1255-refactor-aclbuttons-form-creatio
...
Ad 1255 refactor aclbuttons form creatio
2015-11-16 13:50:13 +01:00
Tim Daubenschütz
8188e5ca2f
Merge branch 'master' into AD-1315-implement-submission-flow
2015-11-16 09:41:06 +01:00
Tim Daubenschütz
c852eaf143
Merge pull request #17 from ascribe/AD-1259-All-dates-showing-up-as-2014
...
Replace Javascript's Date object with momentjs
2015-11-13 09:58:12 +01:00
Tim Daubenschütz
66aef4886f
Adjust MediaContainer and MediaPlayer to newly introduced manual-thumbnail functionality
2015-11-11 10:51:45 +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
c6f6bb398d
Replace all occurrences of with momentjs
2015-11-03 10:57:41 +01:00
Brett Sun
6c8016e094
Remove misleading editions prop to pieceOrEditions
2015-11-02 15:19:52 +01:00
Brett Sun
5f5461c10d
Remove warning for missing prop from FurtherDetailsFileUploader
2015-11-02 10:42:15 +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
Cevo
3cf59ae2af
added public note to piece
2015-10-29 15:31:25 +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
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
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
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
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
7f97ce9828
Handle deletion method for WalletPieceContainer
2015-10-21 23:45:53 +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
738e94a43d
Change helper texts
2015-10-20 17:22:40 +02:00
vrde
e220ee6fbb
Merge branch 'AD-697-update-title-in-the-browser'
2015-10-20 15:06:41 +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
Tim Daubenschütz
8bb971d9df
Merge remote-tracking branch 'origin/master' into AD-727-missing-redirects-to-login-page
...
Conflicts:
js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
js/components/whitelabel/wallet/components/cyland/cyland_landing.js
2015-10-15 11:55:44 +02:00
Tim Daubenschütz
c7c83083d3
change layout of AclButtonList
2015-10-15 11:32:34 +02:00
Tim Daubenschütz
d77bdb25a5
Cleanup code
2015-10-15 11:17:16 +02:00
Tim Daubenschütz
a1f159fc2d
Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh
...
Conflicts:
js/components/ascribe_detail/edition.js
js/utils/general_utils.js
sass/main.scss
2015-10-15 10:06:39 +02:00
diminator
c24021302f
Merge remote-tracking branch 'remotes/origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity
...
Conflicts:
js/components/whitelabel/wallet/components/cyland/cyland_hero.js
2015-10-14 17:25:53 +02:00
Cevo
b4b05b3161
information added to forms and delete form title changed, acl information component created, information text is added to the constants
2015-10-13 18:33:08 +02:00
vrde
2967a29f2e
Set title to edition/piece containers
2015-10-13 17:52:45 +02:00
Tim Daubenschütz
8ac69bab5d
Change additional files label
2015-10-13 10:20:23 +02:00
diminator
8d970a65c4
spinners in forms
...
button wide
2015-10-12 17:55:02 +02:00
diminator
aaa1a9a000
replaced fonts
...
replaced spinners WIP
renamed settings-property to property
2015-10-12 15:25:21 +02:00
Cevo
b8f7527a0b
console.logs removed
2015-10-09 14:32:45 +02:00
Cevo
03680bd830
information button gets the active buttons and shows i only relevant info (Tim I didn't set the arrays as props because it would require more work and fills the memory and are not going to be reused, gc should delete them)
2015-10-09 14:19:43 +02:00
Cevo
087884ef3c
sharare button moved to the right
2015-10-08 10:14:50 +02:00
Cevo
924b462cc1
sharare button moved to the right
2015-10-08 10:14:06 +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
8ba6f11dfe
Fix AccordionListTable item links and missing location propagation
2015-10-01 14:54:56 +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
diminator
b233dbb937
PR fixes
2015-10-01 09:49:01 +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
diminator
44cf707e34
refactoring out edition_actions
2015-09-30 12:12:14 +02:00
diminator
009d12ee53
Merge remote-tracking branch 'remotes/origin/AD-772-coa-doesnt-render' into AD-806-webapp-users-cannot-withdraw-a-pe
2015-09-30 11:45:56 +02:00
