Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
00fb7d8
Pass media type to bridge
pinarol Apr 3, 2019
b47e8f5
Add video block
pinarol Apr 4, 2019
c496809
Merge branch 'master' into rnmobile/update-media-type
pinarol Apr 4, 2019
d29cecc
Add media upload ui
pinarol Apr 4, 2019
a663c30
Merge branch 'master' into rnmobile/update-media-type
pinarol Apr 5, 2019
15ddaf2
Add video block
pinarol Apr 8, 2019
b2fe442
Extract media upload
pinarol Apr 8, 2019
3d5aaa2
Merge branch 'master' into rnmobile/video-block-first-iteration
pinarol Apr 8, 2019
2aabed5
Fix lint issues
pinarol Apr 8, 2019
44cf944
Integrate RN video
pinarol Apr 9, 2019
7ab8ebd
Integrate RN video
pinarol Apr 9, 2019
63868bd
Fix lint issues
pinarol Apr 10, 2019
db1080a
Rename MediaUploadUI
pinarol Apr 10, 2019
069a701
Separate Android and iOS video player configs
pinarol Apr 10, 2019
7d1047f
Fix lint issues
pinarol Apr 10, 2019
9423a53
Merge branch 'master' into rnmobile/video-block-first-iteration
pinarol Apr 10, 2019
95278d3
Revert unwanted auto linter fix
pinarol Apr 10, 2019
4307156
Update order of video block
pinarol Apr 10, 2019
13fc93c
Fix typo
pinarol Apr 10, 2019
49cca70
Enhance placeholder
pinarol Apr 11, 2019
590d1ae
Add retry action for video block
pinarol Apr 12, 2019
ab37524
Merge branch 'master' into rnmobile/video-block-first-iteration
pinarol Apr 15, 2019
4bcc7a3
Merge branch 'master' into rnmobile/video-block-first-iteration
pinarol Apr 17, 2019
2a84566
Merge branch 'master' into rnmobile/video-block-first-iteration
pinarol Apr 17, 2019
7333b9f
Merge branch 'master' into rnmobile/video-block-first-iteration
marecar3 Apr 17, 2019
bffcb7f
Merge branch 'master' into rnmobile/video-block-first-iteration
pinarol Apr 18, 2019
1c0bc4d
Remove unused state property
pinarol Apr 18, 2019
aaad3b8
Merge branch 'master' into rnmobile/video-block-first-iteration
marecar3 Apr 19, 2019
b2fddc1
Merge branch 'master' into rnmobile/video-block-first-iteration
marecar3 Apr 21, 2019
e5c0313
Merge branch 'master' into rnmobile/video-block-first-iteration
pinarol Apr 24, 2019
226e57d
Merge branch 'master' into rnmobile/video-block-first-iteration
pinarol Apr 24, 2019
c046bab
Merge branch 'master' into rnmobile/video-block-first-iteration
marecar3 Apr 25, 2019
8d4e4c9
Merge branch 'master' into rnmobile/video-block-first-iteration
pinarol May 1, 2019
8e33850
Merge branch 'master' into rnmobile/video-block-first-iteration
pinarol May 6, 2019
c996619
Fixed problem with cancel/retry uploading of video
marecar3 May 6, 2019
862aebf
Set proper bottom sheet icons for video block
marecar3 May 6, 2019
248fce1
Make sure that icon block has latest value of isUploadingInProgress
marecar3 May 6, 2019
0e13082
Remove unnecessary code for video copy/paste handling
pinarol May 7, 2019
3c29489
Removing poster support
pinarol May 9, 2019
c8a6fb8
Implemented latest ui-ux on video block
marecar3 May 10, 2019
5421b69
Aligned image block with video block
marecar3 May 10, 2019
922767a
Merge branch 'rnmobile/video-block-first-iteration' into rnmobile/vid…
marecar3 May 10, 2019
1a9f357
Merge branch 'master' into rnmobile/video-block-first-iteration
pinarol May 10, 2019
66cd5dc
Merge branch 'rnmobile/video-block-first-iteration' into rnmobile/vid…
marecar3 May 10, 2019
d752797
Fixed logic on iOS when selecting video block first time, avoid to pl…
marecar3 May 10, 2019
2838fec
Merge branch 'master' into rnmobile/video-block-first-iteration
marecar3 May 12, 2019
8a2f97c
Fixed crash when opening the post which previously had cancelled imag…
marecar3 May 12, 2019
460eba2
Merge branch 'rnmobile/video-block-first-iteration' into rnmobile/vid…
marecar3 May 12, 2019
7447902
Set black background for uploaded video
marecar3 May 12, 2019
c2c97c8
Merge branch 'master' into rnmobile/video-block-first-iteration
marecar3 May 12, 2019
629810c
Merge branch 'rnmobile/video-block-first-iteration' into rnmobile/vid…
marecar3 May 12, 2019
776a9fb
Fixed retry icon color on image upload failed state
marecar3 May 13, 2019
f4435d4
Merge branch 'master' into rnmobile/video-block-ui-ux-enhancements
marecar3 May 13, 2019
97e6800
Avoid loading video before it's uploaded
marecar3 May 13, 2019
af2fb2f
Fixed failed tests
marecar3 May 13, 2019
580be02
Set image background as black color with 50% alpha when image is in f…
marecar3 May 14, 2019
c216b48
Merge branch 'master' into rnmobile/video-block-ui-ux-enhancements
marecar3 May 15, 2019
9a1acd2
Make sure that image/video block is selected when user taps on it
marecar3 May 15, 2019
1ec2db0
Merge branch 'master' into rnmobile/video-block-ui-ux-enhancements
marecar3 May 16, 2019
7082eb1
Fixed issue with missing placeholder while image is uploading
marecar3 May 16, 2019
25aa9ca
Merge branch 'master' into rnmobile/video-block-ui-ux-enhancements
marecar3 May 16, 2019
4c6d2b2
Reuse Icon function in image/video block and block picker
marecar3 May 16, 2019
27eda92
Merge branch 'master' into rnmobile/video-block-ui-ux-enhancements
marecar3 May 16, 2019
4292925
Fixes issue with retry state background
marecar3 May 16, 2019
21a42c4
Fix icon crash and inject props to SVG icons
pinarol May 17, 2019
542ae59
Merge branch 'master' into rnmobile/video-block-ui-ux-enhancements
pinarol May 17, 2019
4065516
Update video upload icon color and size, also caption padding
pinarol May 17, 2019
c4a0bd5
Merge branch 'master' into rnmobile/video-block-ui-ux-enhancements
pinarol May 20, 2019
30e98b0
Merge branch 'master' into rnmobile/video-block-ui-ux-enhancements
pinarol May 20, 2019
a5bf475
Update Icon to accept a style prop
Tug May 20, 2019
deaa780
Revert "Update Icon to accept a style prop"
pinarol May 21, 2019
32037e8
Fix retry icon size
pinarol May 21, 2019
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
Merge branch 'master' into rnmobile/video-block-first-iteration
  • Loading branch information
pinarol committed Apr 18, 2019
commit bffcb7f779074ef44146dddd92386cb159ad9312

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.