Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merging changes from pietro's master branch #94

Open
wants to merge 189 commits into
base: master
Choose a base branch
from
Open

Merging changes from pietro's master branch #94

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
189 commits
Select commit Hold shift + click to select a range
45e7f36
1.0.8-alpha.3
Dec 25, 2019
09bcf1f
had to change name of repo
Dec 25, 2019
9172181
updated package-lock
Jan 30, 2020
e7ef779
fixed a whole bunch of stuff
Jan 30, 2020
6761b82
1.3.3-alpha.5
Jan 30, 2020
f133211
adjusted functions names
Jan 31, 2020
f308c2c
1.3.3-alpha.6
Jan 31, 2020
cf966c7
removed footer
Feb 5, 2020
0b0aeac
Added support for mxf
Feb 6, 2020
682c5e6
1.3.3-alpha.7
Feb 6, 2020
12f8cc6
Added CEP path to electron wrapper
Feb 6, 2020
c81dc37
1.3.3-alpha.8
Feb 6, 2020
4616437
fixing ref error path is not defined
Feb 6, 2020
a37f664
1.3.3-alpha.9
Feb 6, 2020
3f67f35
fixed ADL export?
Feb 7, 2020
5de0163
1.3.3-alpha.10
Feb 7, 2020
b02bd36
1.3.3-alpha.11
Feb 7, 2020
39895fb
1.3.3-alpha.12
Feb 8, 2020
7e8dc18
fixed save message
Feb 12, 2020
02d4115
1.3.3-alpha.13
Feb 12, 2020
f5d66e9
1.3.3-alpha.14
Feb 12, 2020
72476bd
1.3.3-alpha.15
Feb 12, 2020
30bfa70
1.3.3-alpha.16
Feb 12, 2020
4bc5423
1.3.3-alpha.16
Feb 13, 2020
38e0135
1.3.3-alpha.18
Feb 14, 2020
b4c4278
1.3.3-alpha.19
Feb 14, 2020
675dece
1.3.3-alpha.20
Feb 14, 2020
af0e804
1.3.3-alpha.21
Feb 14, 2020
f687137
1.3.3-alpha.22
Feb 14, 2020
1d8843b
fixed error
Feb 14, 2020
659622d
fixed error
Feb 14, 2020
ef7ba4a
fixed error
Feb 14, 2020
972475f
fixing issue
Feb 14, 2020
13fd7a4
1.3.3-alpha.25
Feb 14, 2020
839582b
1.3.3-alpha.25
Feb 14, 2020
ad963fa
1.3.3-alpha.26
Feb 14, 2020
e8f3a0b
1.3.3-alpha.27
Feb 14, 2020
6cd8d64
added support to export paper edit as word document
Feb 15, 2020
c3521cb
1.3.3-alpha.28
Feb 18, 2020
fbb5b61
1.3.3-alpha.29
Feb 18, 2020
7c1c6e4
adding loading info
Feb 18, 2020
daaede9
simplified search filter
Feb 18, 2020
285aa51
1.3.3-alpha.30
Feb 19, 2020
8b31ba7
excluded video as well
Feb 19, 2020
7cf0595
1.3.3-alpha.31
Feb 19, 2020
fa95d87
1.3.3-alpha.32
Feb 19, 2020
a767f9e
1.3.3-alpha.33
Feb 19, 2020
563dd5d
fixed edit delete programme script bug
Feb 20, 2020
1c3aec0
fixes #13
Feb 20, 2020
e435b85
fixed issue with #13
Feb 20, 2020
de07d9d
1.3.3-alpha.34
Feb 20, 2020
49a4bf8
testing batch import for electron
Feb 21, 2020
15b15ba
1.3.3-alpha.35
Feb 21, 2020
203ecd5
Merge pull request #16 from pietrop/fixing-client-for-electron-batch-…
pietrop Feb 21, 2020
1f719f9
fixed react client - transcript editor integration
Feb 21, 2020
aa6eab3
1.3.3-alpha.37
Feb 21, 2020
280a471
fixed demo mode notice link
Feb 21, 2020
1bd69a0
Removed batch name
Feb 21, 2020
885db29
replaced edl composer
Feb 22, 2020
6fa332f
1.3.3-alpha.38
Feb 22, 2020
bc2c253
fixed layout
Feb 25, 2020
af17e75
Added and tested auto save for programme script
Feb 25, 2020
4a86a09
added auto save for programme script
Feb 25, 2020
4092417
removed unecessary console.log
Feb 25, 2020
71f0839
Merge pull request #17 from pietrop/auto-save-programme-script
pietrop Feb 25, 2020
3b02147
auto save transcript
Feb 25, 2020
5bcbb67
Merge pull request #18 from pietrop/auto-save-transcrit-2
pietrop Feb 25, 2020
ca96f92
updated package-lock
Feb 25, 2020
5f7f5d6
1.4.0
Feb 25, 2020
815c59f
added src attribute to programme script paper cuts for interactive vi…
Feb 26, 2020
2a6fc24
1.4.0-alpha.1
Feb 26, 2020
73f40cf
layout reorg
Feb 28, 2020
19dc7cb
Merge pull request #21 from pietrop/layout-reorg
pietrop Feb 28, 2020
a01b996
1.4.0-alpha.2
Feb 28, 2020
09972b1
removed uncessary console.log and adjusted layout columns
Mar 2, 2020
601a9c4
Saving progress
Mar 3, 2020
60c3bd3
when searching across transcripts not seeing list of transcripts on l…
Mar 3, 2020
dcbf163
various tweaks
Mar 3, 2020
8c72839
some adjustments
Mar 3, 2020
af36748
clean up
Mar 3, 2020
3b7ecc2
1.4.1
Mar 3, 2020
a198c15
Merge pull request #22 from pietrop/search-across-transcript
pietrop Mar 4, 2020
c783054
improved search across transcripts UX
Mar 4, 2020
ac44103
Saving progress
Mar 5, 2020
1507051
Added contextual insert for VO,Header,Notes
Mar 5, 2020
83595fd
adjusted length of btn group
Mar 5, 2020
3e92792
fixed bug when cancelling prompt
Mar 5, 2020
6fe50d4
handled edge case
Mar 5, 2020
e390d09
mild clean up
Mar 5, 2020
331a684
Merge pull request #25 from pietrop/ux-improvements
pietrop Mar 5, 2020
82192c8
Merge pull request #26 from pietrop/programme-script-ux-improvements
pietrop Mar 5, 2020
b82d7ec
1.4.2
Mar 5, 2020
113c457
1.4.3
Mar 5, 2020
029dfc5
1.4.4-fixed issue with moving insert point via contextual menu
Mar 5, 2020
683aa07
commenting out autosave for now
Mar 5, 2020
84a884d
refactor mouse up listener
Mar 5, 2020
d4eff3a
first pass
Mar 5, 2020
9e91b1a
tweak UI
Mar 5, 2020
ecafeb4
Merge pull request #28 from pietrop/advanced-select
pietrop Mar 5, 2020
0aa0c60
1.4.5
Mar 5, 2020
661448e
batch delete programme script elements
Mar 6, 2020
59595c3
Merge pull request #29 from pietrop/batch-delete-programme-script-ele…
pietrop Mar 6, 2020
658eaaf
added icons to export
Mar 6, 2020
f2c6ae3
Testing ffmpeg integration with electron
Mar 6, 2020
9b82e9b
1.4.5-alpha.1
Mar 6, 2020
7d5c361
switching ffmpeg remix to use end instead of duration
Mar 6, 2020
5c8967d
added export audio/video-madded fileName etc..
Mar 6, 2020
e92364c
fixed bug
Mar 6, 2020
d897112
1.4.5-alpha.3
Mar 6, 2020
c62d7be
export audio, file extension wav
Mar 6, 2020
ec6373f
fixed mini bug
Mar 6, 2020
a2b1d03
1.4.5-alpha.4
Mar 6, 2020
e10472d
1.4.5-alpha.5
Mar 6, 2020
754c31d
fixed mp4 wav bug
Mar 6, 2020
cc6e872
1.4.5-alpha.6
Mar 6, 2020
ff30a3f
added wave form video
Mar 8, 2020
04cc99a
Merge pull request #34 from pietrop/ffmpeg-remix-spike-for-electron-w…
pietrop Mar 8, 2020
349b57c
1.4.5-alpha.7
Mar 8, 2020
4e9b46f
removed padding in video and preview canvas
Mar 9, 2020
8ccbc5b
Merge pull request #35 from pietrop/paper-edit-video-and-preview-ui-t…
pietrop Mar 9, 2020
0e6df50
ui tweaks on words and speaker
Mar 9, 2020
41b6e1b
fixing #32
Mar 10, 2020
c4c62e2
half progress
Mar 20, 2020
716abd2
Adjusted CSS
Mar 20, 2020
5ca18d7
readme add github project board
Apr 21, 2020
8697e56
added stt engine info and filename to transcript card
Apr 22, 2020
dca50ef
Refactor outline secondary to seconday+custom css to make it easier t…
Apr 22, 2020
74b9a37
1.4.6
Apr 22, 2020
0e20d76
Merge pull request #43 from pietrop/bootstrap-material-design-css
pietrop Apr 22, 2020
15a5419
UI tweaks
Apr 22, 2020
c9d3ae3
1.4.7
Apr 22, 2020
473db1a
if clipName and sttEngine not available it won't show the info btn
Apr 23, 2020
a3cfd2c
1.4.8
Apr 23, 2020
023f950
added latest version of slate transcript editor
Apr 27, 2020
ad5d51d
Merge pull request #44 from pietrop/migrating-to-slate-transcript-editor
pietrop Apr 27, 2020
d35c248
1.5.1
Apr 28, 2020
8d35ab2
Removed margin issue in transcript
Apr 28, 2020
eefa044
1.5.6
Apr 28, 2020
345e0f7
1.5.7
Apr 29, 2020
a39e1d9
change color scheme for paper edit
Apr 30, 2020
1693065
adjusted btn of programme script
Apr 30, 2020
8763786
styling tweaks
Apr 30, 2020
50639dc
1.6.0
Apr 30, 2020
0175fa5
fixed bug
Apr 30, 2020
1da79f1
Save
Apr 30, 2020
4ee5991
tweaked UI+added plain text only export option
Apr 30, 2020
f21fb2e
updated
Apr 30, 2020
20d1738
Merge pull request #45 from pietrop/ui-tweak
pietrop Apr 30, 2020
d42a688
fixed color in programme script paper cuts borders
Apr 30, 2020
a1e251d
1.7.0
Apr 30, 2020
a02e49c
added support for mobile for menu in programme script
Apr 30, 2020
b0b0ce9
customise export options for audio wave form
May 5, 2020
0262d97
1.7.2
May 5, 2020
de956bf
1.8.0
May 15, 2020
9ad7283
1.8.1
May 18, 2020
af692d2
1.8.2
May 18, 2020
c7b9d44
1.8.3
May 18, 2020
a0be179
1.8.5
May 18, 2020
d44d0a4
cleaned up warnings
May 22, 2020
46c1827
introduce code splitting
May 22, 2020
81a3068
first pas ass adding skeleton to suspense in lazy loading code split…
May 22, 2020
6d7b56d
1.8.6
May 22, 2020
7f58b41
re introduced load transcript btn
May 22, 2020
5103d1d
1.8.7
May 22, 2020
027ec46
fixes #46
Jun 9, 2020
955b425
fix #48
Jun 9, 2020
eb647de
fixed search for transcript
Jun 9, 2020
244d325
1.8.8
Jun 9, 2020
2dbf6ce
1.8.9-mfixed notice message for file size to be electron only
Jun 9, 2020
bb1d2ea
save
Jun 9, 2020
b5da565
1.8.10
Jun 9, 2020
bb63b72
playsInLine fix
Oct 29, 2020
7ccddf2
project name
Oct 29, 2020
2c38c33
save btn disabled
Oct 29, 2020
3740997
1.8.11
Oct 29, 2020
1afd80f
fix #49
Oct 29, 2020
d445ce8
1.8.12
Feb 2, 2021
16947db
updated slate transcript editor
Feb 23, 2021
74264c2
1.8.13
Feb 23, 2021
5d25e1f
1.8.14
Feb 23, 2021
12653fc
1.8.15
Feb 23, 2021
2d0c8c4
1.8.16
Feb 23, 2021
9c62adf
1.8.17
Feb 23, 2021
7d9e838
1.9.0
Feb 25, 2021
ca1e954
saving
May 2, 2021
4dbca00
updating slate-transcript-editor
May 19, 2021
8501dc5
1.9.1
May 19, 2021
58f0046
1.9.2
Jun 24, 2021
78469f0
1.9.3
Jun 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
removed padding in video and preview canvas
  • Loading branch information
Pietro Passarelli committed Mar 9, 2020
commit 4e9b46f63e31a68c80c060b07a8b7899da24ac0a
3 changes: 1 addition & 2 deletions src/Components/PaperEdits/PaperEdit/ProgramScript/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,8 +801,7 @@ class ProgramScript extends Component {
return (
<>
<Card>
<Card.Header>
{/* <hr/> */}
<Card.Header style={{ padding: '1em',paddingTop: '0em'}}>
{ !this.state.resetPreview ?
<PreviewCanvas playlist={ this.state.playlist }
width={ 300 }
Expand Down
5 changes: 3 additions & 2 deletions src/Components/PaperEdits/PaperEdit/Transcripts/Transcript.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ class Transcript extends Component {
{`${ this.state.sentenceToSearchCSSInHighlights } { background-color: ${ 'yellow' }; text-shadow: 0 0 0.01px black }`}
</style>
<Card>
<Card.Header>
<Card.Header style={{backgroundColor:'black', padding: '0px'}}>
{this.state.componentMounted && <video
src={ this.props.url }
ref={ this.videoRef }
Expand All @@ -296,7 +296,8 @@ class Transcript extends Component {
width: '100%',
height:'10em',
marginTop: '0em',
backgroundColor: 'black'
backgroundColor: 'black',
boxShadow: 'none'
} }
controls/> }
</Card.Header>
Expand Down