ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +01:00
Code Issues Releases Wiki Activity
2,605 Commits 115 Branches 0 Tags 13 MiB
687c3a9b74
Commit Graph

312 Commits

Author SHA1 Message Date
Tim Daubenschütz
a8ccf13f91 Remove uploadStarted prop from ReactS3Fineuploader as it was replaced with setIsUploadReady 2015-11-17 12:03:22 +01:00
Tim Daubenschütz
ac07107210 Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark 
Conflicts:
	js/constants/application_constants.js
	js/utils/requests.js
 2015-11-16 16:38:35 +01:00
Tim Daubenschütz
339421a4b7 Merge branch 'master' into AD-56-add-social-share-functionality 
Conflicts:
	js/components/ascribe_detail/media_container.js
	js/components/ascribe_media/media_player.js
 2015-11-16 15:54:49 +01:00
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
357f63fa2b Add contract link to loan history 2015-11-16 11:45:56 +01:00
Tim Daubenschütz
8188e5ca2f Merge branch 'master' into AD-1315-implement-submission-flow 2015-11-16 09:41:06 +01:00
Brett Sun
cef19f427c Add comment for content registration check 2015-11-13 16:02:34 +01:00
Brett Sun
09812a1881 Forgot to unlisten to UserStore when unmounting 2015-11-13 13:33:12 +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
af58687572 Add twitter text 2015-11-10 19:33:08 +01:00
Brett Sun
a9f0a46fbd Move social share buttons to left of download button to accommodate for embed button 2015-11-10 10:29:37 +01:00
Brett Sun
8dc0470007 Add Twitter button 2015-11-09 19:01:27 +01:00
Brett Sun
d972da935a Add Facebook Share button 2015-11-09 17:46:49 +01:00
Brett Sun
3fb4ae55bf Merge with AD-1290 2015-11-04 14:04:16 +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
Brett Sun
cd6673f255 Merge with AD-1264 2015-11-03 11:34:48 +01:00
Brett Sun
f7259a8ab3 Merge with AD-1255 2015-11-03 11:13:32 +01:00
Tim Daubenschütz
c6f6bb398d Replace all occurrences of with momentjs 2015-11-03 10:57:41 +01:00
Brett Sun
d2529bf015 Merge with master 2015-11-03 10:39:01 +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
Brett Sun
784098f225 Fix PropType warnings for components in ascribe_detail 2015-10-28 18:37:09 +01:00
Brett Sun
c72a5aa308 Add Lumenus specific data forms to edition and piece details 2015-10-28 11:26:54 +01:00
Brett Sun
82b49fc653 Add additional required properties for Lumenus 
Currently uses the FurtherDetailsFileuploader, just relabeled, to
handle the marketplace image. For now, this allows us to avoid creating
another property in the backend to handle the image, but could be
replaced or modified in the future if we do want to create another
property.
 2015-10-27 17:54:35 +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
757ee40e4e add 404 routine to PieceContainer 2015-10-19 15:58:05 +02:00
Tim Daubenschütz
23b7ebd776 add 404 routine to EditionContainer 2015-10-19 15:29:57 +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
diminator
b773ac829a Merge remote-tracking branch 'remotes/origin/master' into AD-806-webapp-users-cannot-withdraw-a-pe 2015-09-30 11:45:37 +02:00
diminator
55f5d959ff PR fixes 2015-09-30 11:26:31 +02:00
Cevo
23f10d4d7f qMerge branch 'master' into AD-538-users-and-even-devs-are-unsure-wh 2015-09-30 10:53:16 +02:00
diminator
4f6e39699f PR getlangtext 2015-09-30 09:46:11 +02:00
diminator
ea4805caa0 create CoA when not found 2015-09-30 09:14:57 +02:00
diminator
cda81b6f5b withdraw consign 
and acl buttonlist in detail refactor
 2015-09-29 18:09:34 +02:00
Tim Daubenschütz
e356570bc8 remove console log 2015-09-29 17:56:18 +02:00
diminator
f64fb73aa6 cc fixes in licenses, collection and details 2015-09-29 15:58:24 +02:00
Cevo
7b9424ca68 merging from master and resolving the conflicts in main.scss, master overrides 2015-09-29 11:59:18 +02:00
Tim Daubenschütz
df338ac746 Fix alignment for AclInformationButton 2015-09-29 10:31:13 +02:00
Cevo
661cb44b94 reached the spec with dirty tricks 2015-09-28 22:09:25 +02:00
diminator
9bb5a51fed bug fix show public note for anonymous 2015-09-28 17:11:15 +02:00
Tim Daubenschütz
9045b9ec01 refresh piece list on every major acl action 2015-09-28 16:32:59 +02:00
Cevo
48f43ac01c the real dropdown version second iteration 2015-09-25 14:36:27 +02:00
Cevo
4ae73871d3 initial push for version controlling, will be edited 2015-09-24 16:06:53 +02:00
Tim Daubenschütz
c00e003aeb refactor input textarea to use disabled instead of editable 2015-09-21 12:05:42 +02:00
diminator
ff163df61e PR update 2015-09-17 14:20:46 +02:00
diminator
63fffc2132 PR comments fix 2015-09-17 11:39:55 +02:00
Tim Daubenschütz
7c376b7229 PR Feedback: add getLangText and move itemLimit and sizeLimit to app constants 2015-09-16 15:14:08 +02:00
Tim Daubenschütz
497a330e1a Merge branch 'AD-456-ikonotv-branded-page-for-registra' into AD-957-custom-upload-button-for-contract 2015-09-15 13:56:31 +02:00
Cevo
6a57a69e29 main.scss edited 2015-09-15 13:53:09 +02:00
Tim Daubenschütz
73c2a7c544 rename fineuploader's submitKey method to submitFile 2015-09-14 14:46:03 +02:00
diminator
6013303bd6 Merge remote-tracking branch 'remotes/origin/master' into AD-456-ikonotv-branded-page-for-registra 
Conflicts:
	js/components/ascribe_buttons/button_submit_close.js
	js/components/ascribe_forms/form_loan.js
	js/components/ascribe_forms/form_register_piece.js
	sass/ascribe_media_player.scss
	sass/main.scss
 2015-09-10 17:45:51 +02:00
Tim Daubenschütz
b5e5102ea4 replace in keyword with dot notation checking 2015-09-10 14:00:59 +02:00
Tim Daubenschütz
c3b71b5398 WIP: make fineuploader an input 2015-09-10 10:51:47 +02:00
diminator
73ee0753c1 refactored notifications per detail 2015-09-03 17:25:22 +02:00
diminator
9334251fd3 notifications on piece details (www, ikono, cyland) and edition details 2015-09-03 15:17:12 +02:00
diminator
edcd8e57a4 notification app 
notification refactor in onion - split by piece/edition
 2015-09-03 14:15:00 +02:00
Cevo
6555c02f23 Merge branch 'AD-456-ikonotv-branded-page-for-registra' of bitbucket.org:ascribe/onion into AD-456-ikonotv-branded-page-for-registra 2015-09-02 14:03:02 +02:00
Cevo
aa3c188509 contract list add 2015-09-02 14:02:23 +02:00
diminator
92971a9f62 Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-883-show-notificationsrequests-on-col 
Conflicts:
	sass/ascribe_accordion_list.scss
 2015-09-02 10:50:33 +02:00
diminator
bfaf4886a4 notifications unoptimized 2015-09-01 14:45:14 +02:00
Tim Daubenschütz
b4abe7a245 generic form submission determination for fineuploader 2015-09-01 14:42:09 +02:00
Tim Daubenschütz
ddfc8b9621 minor fixes 2015-08-28 14:27:02 +02:00
Tim Daubenschütz
52ae348e57 dynamic acl for acl_submit 2015-08-28 14:07:29 +02:00
Tim Daubenschütz
e9d0311f58 custom ikonotv piece page 2015-08-28 12:33:00 +02:00
Tim Daubenschütz
2c26aab8cc add exception for loaning a piece for ikonotv 2015-08-28 12:20:36 +02:00
diminator
bc28f3d8f5 loan request actions for multiple actions 2015-08-27 13:43:26 +02:00
diminator
c64aae332d Merge remote-tracking branch 'remotes/origin/AD-862-remove-confusion-introduced-in-prev-update' into AD-661-due-1208-implement-jury-rating-an 2015-08-26 16:54:41 +02:00
Tim Daubenschütz
6808c7c228 remove loan button from piece detail page 2015-08-26 16:44:24 +02:00
diminator
5fcee39ed3 shortlisting enabled up till loan request 2015-08-25 15:19:10 +02:00
diminator
411b7cb010 increase otherdata limit to 50MB 2015-08-24 12:11:07 +02:00
diminator
440dcd9785 Merge branch 'AD-846-loan-request-action-panel-on-piec' into AD-613-cyland-white-label-page 2015-08-24 11:36:30 +02:00
Tim Daubenschütz
96fe1c69c6 Merge branch 'AD-613-cyland-white-label-page' of bitbucket.org:ascribe/onion into AD-613-cyland-white-label-page 2015-08-24 11:22:54 +02:00
Tim Daubenschütz
d05662b879 fix PR issues 2015-08-24 11:22:44 +02:00
diminator
0be6b7f118 bug fix loadPiece 2015-08-24 11:01:42 +02:00
diminator
3b27238adf request form on piece level 
bug fix cyland piece endpoint
bug fix otherDataUploader editable
 2015-08-24 10:48:40 +02:00
diminator
7a09b863b5 switch between request action and acl buttons on piece detail page 2015-08-21 16:49:04 +02:00
diminator
8b6c5e6e0f username boolean 2015-08-21 16:39:06 +02:00
diminator
33cd23d11e getlangtext 2015-08-21 16:38:18 +02:00
diminator
ea9fb306c4 add request action loan to piece 2015-08-21 16:22:08 +02:00
diminator
edec430109 public and private note in edition and piece 
connection in frontend
 2015-08-21 15:04:38 +02:00
Tim Daubenschütz
116cb9c2fc fix disappearing fineuploader in additional data 2015-08-21 14:07:10 +02:00
Tim Daubenschütz
09c0451c86 Merge branch 'AD-835-make-form-fields-lockable' into AD-613-cyland-white-label-page 
Conflicts:
	js/components/ascribe_detail/further_details_fileuploader.js
 2015-08-21 11:34:47 +02:00
Tim Daubenschütz
3b46dbb9f5 add upload busy function to fineuploader 2015-08-21 11:11:31 +02:00
Tim Daubenschütz
30d57a943f fix lock form 2015-08-21 11:01:13 +02:00
diminator
5c6b753acb piece loan history 2015-08-20 15:50:30 +02:00
diminator
ffdb4847db piece bitcoin id 2015-08-20 14:01:02 +02:00
diminator
5b2ab6c1e2 bug fix acls 
otherdata frontend

MIGRATE + loaddate whitelabel
 2015-08-20 11:32:11 +02:00
Tim Daubenschütz
ad8be7e34a separate pre-sending form submission functionality 2015-08-18 13:15:22 +02:00
diminator
fc82c866fb cyland refactor 
whitelabel + cyland app
 2015-08-17 20:52:36 +02:00
diminator
12dde0458c Merge remote-tracking branch 'remotes/origin/master' into AD-613-cyland-white-label-page 2015-08-17 09:56:55 +02:00
diminator
d24b325062 bug fix loadPiece 2015-08-13 14:16:44 +02:00
diminator
97c298e304 piece navigation prev next WIP 2015-08-12 16:47:16 +02:00
Tim Daubenschütz
d5dc164810 boilerplate for loan process 2015-08-12 13:34:41 +02:00
diminator
22727c2703 refactored piece container and detail 2015-08-11 17:12:12 +02:00
diminator
bdeef598eb Merge remote-tracking branch 'remotes/origin/AD-716-aclbutton-doesnt-respect-modals-r' 
Conflicts:
	js/components/settings_container.js
 2015-08-10 17:07:15 +02:00
Tim Daubenschütz
5be771f6ac add inline property to form 2015-08-10 14:15:32 +02:00
Tim Daubenschütz
3afb036f24 rename apiUrls to ApiUrls 2015-08-07 15:08:02 +02:00
vrde
e9c776fec4 Add "s" to http lol 2015-08-07 14:23:59 +02:00
Tim Daubenschütz
192f776bd8 Filter open edition tables correctly 2015-08-07 13:05:50 +02:00
Tim Daubenschütz
17b991e06b adjust store calls to fetch list to new interface 2015-08-04 11:48:12 +02:00
vrde
72821001b7 Merge branch 'AD-601-in-piece_detail-longer-titles-are' 
Conflicts:
	.gitignore
 2015-08-03 13:44:53 +02:00
Tim Daubenschütz
52f10f178f Merge branch 'master' into AD-601-in-piece_detail-longer-titles-are 2015-07-30 11:49:48 +02:00
Tim Daubenschütz
79bef1e0a9 add ellipsis functionality to detail property 2015-07-30 11:48:47 +02:00
diminator
bab29d6ffa Merge remote-tracking branch 'remotes/origin/AD-435-hash-locally-for-when-a-artist-do' 
Conflicts:
	js/components/ascribe_forms/form_loan.js
 2015-07-29 15:55:16 +02:00
Tim Daubenschütz
9ebc489c78 refresh piece list correctly after piece with edition creation 2015-07-29 15:24:30 +02:00
diminator
deebacd063 Merged in AD-601-in-piece_detail-longer-titles-are (pull request #22) 
Ad 601 in piece_detail longer titles are
 2015-07-29 14:16:40 +02:00
Tim Daubenschütz
275f6c839e minor fixes 2015-07-27 18:24:21 +02:00
Tim Daubenschütz
1a1ba8bbb1 add ellipsis again 2015-07-27 18:19:55 +02:00
Tim Daubenschütz
a05698efc1 fix app crashing bug when transferring an edition 2015-07-27 14:59:49 +02:00