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

Background plugin and image upload #582

Merged
merged 43 commits into from Aug 30, 2018
Merged

Background plugin and image upload #582

merged 43 commits into from Aug 30, 2018

Conversation

aeneasr
Copy link
Collaborator

@aeneasr aeneasr commented Aug 30, 2018

No description provided.

PeterKottas and others added 30 commits August 12, 2018 20:27
@PeterKottas
Fixed few issues
a7714dc 
Signed-off-by: Peter Kottas <petokottas@gmail.com>
@PeterKottas
Added no plugins found text to toolbar
0c05197 
Signed-off-by: Peter Kottas <petokottas@gmail.com>
@PeterKottas
Fixed problem with type
4b7107b
@PeterKottas
Fixed anon functions in render
b9ca68c 
Signed-off-by: Peter Kottas <petokottas@gmail.com>
@PeterKottas
Types again
c7a6abd 
Signed-off-by: Peter Kottas <petokottas@gmail.com>
@PeterKottas
Still types
dd53cba 
Signed-off-by: Peter Kottas <petokottas@gmail.com>
@PeterKottas
Types
188026e 
Signed-off-by: Peter Kottas <petokottas@gmail.com>
@PeterKottas
Image upload, gradients, color, modeFlags and some more refactoring
26c9bf7 
Signed-off-by: Peter Kottas <petokottas@gmail.com>
@PeterKottas
Build errors and warnings
86ac660 
Signed-off-by: Peter Kottas <petokottas@gmail.com>
@PeterKottas
Many types fixes
c458d2d 
Signed-off-by: Peter Kottas <petokottas@gmail.com>
@PeterKottas
Downgraded flow
967f1cd 
Signed-off-by: Peter Kottas <petokottas@gmail.com>
@PeterKottas
Type fixes
474d160 
Signed-off-by: Peter Kottas <petokottas@gmail.com>
@PeterKottas
Removing advanced types
9f95512 
Signed-off-by: Peter Kottas <petokottas@gmail.com>
@PeterKottas
Types still
0fb56b5 
Signed-off-by: Peter Kottas <petokottas@gmail.com>
@PeterKottas
Attempting some fixes
98c9ff3 
Signed-off-by: Peter Kottas <petokottas@gmail.com>
@PeterKottas
Hopefully fixed type errors
f7fa5df 
Signed-off-by: Peter Kottas <petokottas@gmail.com>
@PeterKottas @arekkas
plugins/slate: Updates to latest slate and adds migrations (#554)
913fc7b 
Signed-off-by: Peter Kottas <petokottas@gmail.com>
@arekkas
vendor: Move to npm and declare material-ui as peerDependency
1191e89 
Signed-off-by: arekkas <aeneas@ory.am>
@arekkas
emove ejected react-scripts from examples
f0320ce 
Also re-adds yarn as package manager adn adds pre-commit hooks
@arekkas
Bump development and build dependencies
4c9d58d 
Signed-off-by: arekkas <aeneas@ory.am>
@arekkas
Only build libraries when running start
9424b80 
Signed-off-by: arekkas <aeneas@ory.am>
@arekkas
Bump flow-bin and update typdefs
e423b84 
Signed-off-by: arekkas <aeneas@ory.am>
@PeterKottas
Resolve issues in paralax background plugin (#556)
326616f 
Signed-off-by: Peter Kottas <petokottas@gmail.com>
@PeterKottas
plugins/slate: Updates to latest slate and adds migrations (#554)
95c7621 
Signed-off-by: Peter Kottas <petokottas@gmail.com>
@PeterKottas
vendor: Move to npm and declare material-ui as peerDependency
3d05c39 
Signed-off-by: arekkas <aeneas@ory.am>
@PeterKottas
emove ejected react-scripts from examples
a2d5e3e 
Also re-adds yarn as package manager adn adds pre-commit hooks
@PeterKottas
Bump development and build dependencies
5c872d6 
Signed-off-by: arekkas <aeneas@ory.am>
@PeterKottas
Only build libraries when running start
b30a4f1 
Signed-off-by: arekkas <aeneas@ory.am>
@PeterKottas
Bump flow-bin and update typdefs
9c7849f 
Signed-off-by: arekkas <aeneas@ory.am>
@PeterKottas
Merge remote-tracking branch 'ory/0.4.0' into 0.4.0
86dbe2f
PeterKottas and others added 13 commits August 22, 2018 15:33
@PeterKottas
Changed padding to switch
e991841 
Signed-off-by: Peter Kottas <petokottas@gmail.com>
@PeterKottas
Deprecated parallax, renamed to background
7496785 
Signed-off-by: Peter Kottas <petokottas@gmail.com>
@PeterKottas
Fixed merge issue
e4b9955
@PeterKottas
Prettier
a3fcff5 
Signed-off-by: Peter Kottas <petokottas@gmail.com>
@PeterKottas
Switched to tabs, added enabledModes
256fbd6
@PeterKottas
Revert "Prettier"
85a9d06 
This reverts commit a3fcff5.
@PeterKottas
Prettier again
5ca6b1c 
Signed-off-by: Peter Kottas <petokottas@gmail.com>
@PeterKottas
Merge remote-tracking branch 'origin/background-plugin' into backgrou…
99e4a39 
…nd-plugin
Merge remote-tracking branch 'origin/master' into background-plugin2
a132d04 
# Conflicts:
#	examples/src/index.js
#	packages/core/src/service/plugin/classes.js
#	packages/plugins/content/image/src/Component/Display/index.js
#	packages/plugins/content/image/src/Component/Form/index.js
#	packages/plugins/content/slate/src/index.js
#	packages/plugins/content/slate/src/plugins/code/index.js
#	packages/plugins/content/slate/src/plugins/link/index.js
#	packages/plugins/content/slate/src/plugins/lists.js
#	packages/plugins/content/slate/src/plugins/paragraph/index.js
#	packages/plugins/content/slate/yarn.lock
#	packages/plugins/layout/background/src/index.css
merge
533fbec 
Signed-off-by: arekkas <aeneas@ory.am>
merge
ca2a627 
Signed-off-by: arekkas <aeneas@ory.am>
merge
5440afe 
Signed-off-by: arekkas <aeneas@ory.am>
u
451d6ba
@aeneasr aeneasr merged commit fa6e79c into master Aug 30, 2018
@coveralls
Copy link

coveralls commented Aug 30, 2018 •
edited

Coverage Status

Coverage decreased (-0.07%) to 49.053% when pulling 451d6ba on background-plugin-merge into 2bc628c on master.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@aeneasr @coveralls @PeterKottas