Skip to content

Merge master into develop to bring some direct-to-master changes. #554

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

Merged
OmarIthawi merged 15 commits into from
Mar 30, 2020
Merged

Merge master into develop to bring some direct-to-master changes. #554

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
710c564
Merge pull request #445 from appsembler/appsembler/tahoe/develop
melvinsoft Aug 15, 2019
0e67fd2
Merge branch 'appsembler/tahoe/develop' into appsembler/tahoe/master
melvinsoft Aug 19, 2019
f058a7f
Merge pull request #453 from appsembler/appsembler/tahoe/develop
melvinsoft Oct 11, 2019
eebe91c
Merge pull request #466 from appsembler/appsembler/tahoe/develop
OmarIthawi Oct 14, 2019
d223e70
Tahoe registration API - added test for suport methods
johnbaldwin Oct 14, 2019
87705ca
Fixed Reg API 'send_activation_email' normalization
johnbaldwin Oct 21, 2019
8b311aa
Merge pull request #476 from appsembler/appsembler/tahoe/develop
OmarIthawi Nov 13, 2019
99a909f
Merge pull request #485 from appsembler/appsembler/tahoe/develop
OmarIthawi Dec 3, 2019
0e3ef5f
fix uploaded image aspect ratio in tinymce
grozdanowski Dec 10, 2019
b720bf2
Merge pull request #498 from appsembler/appsembler/matej/fix-image-ra…
grozdanowski Dec 12, 2019
4d24ab1
Merge pull request #504 from appsembler/appsembler/tahoe/develop
melvinsoft Dec 18, 2019
2f535bc
Merge pull request #520 from appsembler/appsembler/tahoe/develop
melvinsoft Jan 15, 2020
1cfb12e
Merge pull request #523 from appsembler/appsembler/tahoe/develop
melvinsoft Jan 17, 2020
7495db5
Merge pull request #533 from appsembler/appsembler/tahoe/develop
melvinsoft Feb 18, 2020
7376c0e
Merge pull request #544 from appsembler/appsembler/tahoe/develop
melvinsoft Mar 26, 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
1 change: 1 addition & 0 deletions common/static/css/tinymce-studio-content.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@

.mce-content-body img {
max-width: 100%;
height: auto;
}

.mce-content-body pre {
Expand Down