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.

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

Tenor integration #13949

Merged
merged 105 commits into from
May 12, 2020
Merged
Changes from 1 commit
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
e857e35
Added Tenor feature flag
ngoctr Apr 6, 2020
4a33eb3
Merge branch 'feature/13803-tenor_integration' into feature/tenor-fea…
ngoctr Apr 6, 2020
7bae58f
Merge pull request #13829 from ngoctr/feature/tenor-feature-flag
ScoutHarris Apr 7, 2020
8ec416b
Merge branch 'develop' into feature/13803-tenor_integration
ScoutHarris Apr 7, 2020
6b19638
Added Tenor API Key support in gencredentials.rb
ngoctr Apr 3, 2020
30a06f9
Added Tenor Client API
ngoctr Apr 6, 2020
37ca6ba
Added more unit tests for Tenor API response
ngoctr Apr 6, 2020
b0e7160
Added nanoGIF into TenorGIFCollection to use as thumbnail
ngoctr Apr 7, 2020
bb32ab4
Removed file header generated by Xcode
ngoctr Apr 8, 2020
aa199f2
Merge branch 'develop' into feature/13803-tenor_integration
ScoutHarris Apr 8, 2020
5f50901
Print error if Tenor key not being configure
ngoctr Apr 8, 2020
1e56339
Fixed a typo in code comment
ngoctr Apr 8, 2020
f0fbfd1
Removed unnecessary properties that we don't need them
ngoctr Apr 8, 2020
f5dbe08
Use DDLogError instead of assertionFailture
ngoctr Apr 8, 2020
b46ccde
Added comment and explicitly add `public` modifier for search method
ngoctr Apr 8, 2020
53fd5fa
Merge pull request #13842 from ngoctr/13803/tenor-api-credentials
ScoutHarris Apr 8, 2020
ae01693
Merge pull request #13843 from ngoctr/13803/tenor-client-api
ScoutHarris Apr 8, 2020
29a5a23
Merge branch 'develop' into feature/13803-tenor_integration
ScoutHarris Apr 9, 2020
8dbadf5
Merge branch 'develop' into feature/13803-tenor_integration
ScoutHarris Apr 9, 2020
0773f8d
Implement Tenor media picker
ngoctr Apr 7, 2020
8e47b28
Added tenor-attribution image
ngoctr Apr 7, 2020
579fa89
Added unit tests for TenorPageable
ngoctr Apr 7, 2020
95c6f4f
Fixed a typo on variable name
ngoctr Apr 7, 2020
b9c58d2
Used nano GIF size from Tenor for a faster thumbnail loading in the P…
ngoctr Apr 7, 2020
e2b30ea
Used largest GIF image size from Tenor for user's media library and p…
ngoctr Apr 7, 2020
5a243d2
Removed commented code
ngoctr Apr 9, 2020
c4b336c
Fixed a build issue
ngoctr Apr 9, 2020
eecacb8
Moved mock data into json resource files
ngoctr Apr 9, 2020
fe9884b
Added TenorResultsPage tests
ngoctr Apr 9, 2020
d81e424
Added Tenor media exporter
ngoctr Apr 9, 2020
56b7b44
Added Tenor media source
ngoctr Apr 9, 2020
859f457
Added Tenor media source
ngoctr Apr 9, 2020
5d021d4
Added Tenor media source
ngoctr Apr 9, 2020
40bab0c
Added Tenor support for media library
ngoctr Apr 10, 2020
731dfa5
Added Tenor support for Aztec Editor
ngoctr Apr 10, 2020
da261a0
Implement Tenor support for Block editor
ngoctr Apr 10, 2020
1961c99
Changed TenorService to class so we can mock it
ngoctr Apr 10, 2020
eb59a69
Made TenorMedia immutable
ngoctr Apr 10, 2020
9c7f00c
Added unit tests for TenorDataSource
ngoctr Apr 10, 2020
97ec082
Implemented trailing_newline policy
ngoctr Apr 10, 2020
d230006
Merge branch '13803/tenor-picker' into 13803/tenor-for-media-library
ngoctr Apr 10, 2020
bd99c14
Merge branch '13803/tenor-picker' into 13803/tenor-for-aztec-editor
ngoctr Apr 10, 2020
f55adae
Merge branch '13803/tenor-picker' into 13803/tenor-for-gutenberg-editor
ngoctr Apr 10, 2020
0425612
Merge branch 'develop' into feature/13803-tenor_integration
ScoutHarris Apr 14, 2020
dc81e1c
Removed caption property from TenorMedia
ngoctr Apr 14, 2020
422f53c
Removed force unwrap
ngoctr Apr 14, 2020
f884b0b
Removed force unwrap
ngoctr Apr 14, 2020
1adbdab
Removed force unwrap.
ngoctr Apr 14, 2020
2230ba5
Clean up unnecessary code
ngoctr Apr 15, 2020
a9249b8
Changed the Tenor page size to 40 to make it consistent with StockPhotos
ngoctr Apr 15, 2020
b30652e
Merge branch '13803-tenor-master-branch' into 13803/tenor-picker
ngoctr Apr 15, 2020
dc5bdf2
Merge branch '13803/tenor-picker' into 13803/tenor-for-media-library
ngoctr Apr 15, 2020
90e2260
Merge branch '13803/tenor-picker' into 13803/tenor-for-gutenberg-editor
ngoctr Apr 15, 2020
38dd814
Merge branch '13803/tenor-picker' into 13803/tenor-for-aztec-editor
ngoctr Apr 15, 2020
9fad122
Merge branch 'develop' into feature/13803-tenor_integration
ScoutHarris Apr 15, 2020
e3c965f
Merge pull request #13861 from ngoctr/13803/tenor-picker
ScoutHarris Apr 15, 2020
82f7a7d
Merge branch 'develop' into feature/13803-tenor_integration
ScoutHarris Apr 15, 2020
b063dc7
Merge branch '13803-tenor-master-branch' into 13803/tenor-for-media-l…
ngoctr Apr 15, 2020
441db93
Merge branch '13803-tenor-master-branch' into 13803/tenor-for-gutenbe…
ngoctr Apr 15, 2020
647d61a
Merge branch '13803-tenor-master-branch' into 13803/tenor-for-aztec-e…
ngoctr Apr 15, 2020
6cd90d3
Changed *Tenor* to *Free GIF Library* to make it more understandable …
ngoctr Apr 15, 2020
ea3af7f
Changed *Tenor* to *Free GIF Library* to make it more understandable …
ngoctr Apr 15, 2020
7a92257
Changed *Tenor* to *Free GIF Library* to make it more understandable …
ngoctr Apr 15, 2020
dfa77e4
Merge pull request #13907 from ngoctr/13803/tenor-for-media-library
ScoutHarris Apr 16, 2020
12c5b9e
Merge branch '13803-tenor-master-branch' into 13803/tenor-for-aztec-e…
ngoctr Apr 16, 2020
6ae0331
Merge branch '13803-tenor-master-branch' into 13803/tenor-for-gutenbe…
ngoctr Apr 16, 2020
5fa137d
Merge pull request #13910 from ngoctr/13803/tenor-for-gutenberg-editor
ScoutHarris Apr 16, 2020
249c2da
Merge pull request #13908 from ngoctr/13803/tenor-for-aztec-editor
ScoutHarris Apr 16, 2020
6db76db
Merge branch 'develop' into feature/13803-tenor_integration
ScoutHarris Apr 16, 2020
c65a385
Merge branch 'develop' into feature/13803-tenor_integration
ScoutHarris Apr 16, 2020
9eeb0f3
Correct datetime decoding from Tenor response
ngoctr Apr 16, 2020
7c701e7
Added unit test for TenorMedia.created date
ngoctr Apr 17, 2020
964aae4
Added analytics events for Tenor
ngoctr Apr 17, 2020
d052c5a
Tracked accessed, searched & uploaded events for Tenor
ngoctr Apr 17, 2020
2b13e0f
Correct media and editor events
ngoctr Apr 17, 2020
f8671c8
Added events tracking for Tenor media
ngoctr Apr 17, 2020
df4a5de
Merge branch 'develop' into feature/13803-tenor_integration
ScoutHarris Apr 17, 2020
6490dd6
Merge branch 'develop' into feature/13803-tenor_integration
ScoutHarris Apr 17, 2020
1a1484d
Merge branch 'develop' into feature/13803-tenor_integration
ScoutHarris Apr 17, 2020
3a0e107
Clean up code in track function associated with a blog
ngoctr Apr 17, 2020
30c286d
Correct media source in StockPhotos & TenorPhotos sources for Gutenbe…
ngoctr Apr 17, 2020
cc29595
Merge pull request #13919 from ngoctr/13803/tenor-accesibility-support
ScoutHarris Apr 18, 2020
61d1c39
Added support animating GIFs in Tenor Picker
ngoctr Apr 18, 2020
a848a0e
Added a tiny GIF play strategy to reduce memory usage in a collection…
ngoctr Apr 18, 2020
1db8728
Merge branch 'develop' into feature/13803-tenor_integration
ScoutHarris Apr 20, 2020
6a1b672
Made function names more Swifty
ngoctr Apr 20, 2020
1deccc8
Undoed changes in StockPhotos tracking sources
ngoctr Apr 20, 2020
f0f11a5
Merge branch 'feature/13803-tenor_integration' of https://github.com/…
ngoctr Apr 20, 2020
7abe7db
Merge pull request #13923 from ngoctr/13803/tenor-analytics-support
ScoutHarris Apr 21, 2020
69aecc1
Merge pull request #13941 from ngoctr/13803/animated-gifs
ScoutHarris Apr 21, 2020
6e31736
Merge branch 'develop' into feature/13803-tenor_integration
ScoutHarris Apr 22, 2020
125be33
Removed reference to P2
ngoctr Apr 25, 2020
5258dec
Added contentFilter param to Tenor Client API
ngoctr Apr 25, 2020
2e90a13
Made subtitle image name a constant
ngoctr Apr 25, 2020
1a96c43
Created a new Tenor picker each time being invoked in Aztec Editor
ngoctr Apr 25, 2020
ae4e567
Correctly releasing the Tenor picker instance
ngoctr Apr 25, 2020
1d9fdf6
Removed unnecessary guards
ngoctr Apr 25, 2020
65e3a9b
Merge branch 'develop' into feature/13803-tenor_integration
ScoutHarris Apr 27, 2020
73494fd
Merge branch 'develop' into feature/13803-tenor_integration
ScoutHarris Apr 29, 2020
1bcf08a
Merge branch 'develop' into feature/13803-tenor_integration
ScoutHarris May 4, 2020
71573b7
Merge branch 'develop' into feature/13803-tenor_integration
ScoutHarris May 4, 2020
e4139be
Merge pull request #14001 from ngoctr/13803-tenor-master-branch
ScoutHarris May 5, 2020
25c6d0a
TenorClient: Added comment to clarify content filter ratings.
frosty May 6, 2020
a8aab30
Merge branch 'develop' into feature/13803-tenor_integration
ScoutHarris May 8, 2020
d35ce72
Merge branch 'develop' into feature/13803-tenor_integration
ScoutHarris May 12, 2020
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 'develop' into feature/13803-tenor_integration
ScoutHarris committed Apr 9, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 29a5a23b368e3895d03602b1658a32edc3d6c9a0

This merge commit was added into this branch cleanly.

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