Skip to content

Commit 096ad11

Browse files
committed
Merge branch 'master' into production
# Conflicts: # package-lock.json
2 parents e6ab790 + e7f4878 commit 096ad11

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+21475
-22189
lines changed

README.md

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,40 @@
99
[![code with hearth by NHN](https://img.shields.io/badge/%3C%2F%3E%20with%20%E2%99%A5%20by-NHN-ff1414.svg)](https://github.com/nhn)
1010
[![lerna](https://img.shields.io/badge/maintained%20with-lerna-cc00ff.svg)](https://lerna.js.org/)
1111

12-
## Packages
12+
## 📦 Packages
1313

14-
- [toast-ui.image-editor](https://github.com/nhn/tui.image-editor/tree/main/apps/image-editor) - Plain JavaScript component implemented by [NHN](https://github.com/nhn).
15-
- [toast-ui.vue-image-editor](https://github.com/nhn/tui.image-editor/tree/main/apps/vue-image-editor) - **Vue** wrapper component is powered by [NHN](https://github.com/nhn).
16-
- [toast-ui.react-image-editor](https://github.com/nhn/tui.image-editor/tree/main/apps/react-image-editor) - **React** wrapper component is powered by [NHN](https://github.com/nhn).
14+
- [toast-ui.image-editor](https://github.com/nhn/tui.image-editor/tree/master/apps/image-editor
15+
) - Plain JavaScript component implemented by [NHN](https://github.com/nhn).
16+
- [toast-ui.vue-image-editor](https://github.com/nhn/tui.image-editor/tree/master/apps/vue-image-editor
17+
) - **Vue** wrapper component is powered by [NHN](https://github.com/nhn).
18+
- [toast-ui.react-image-editor](https://github.com/nhn/tui.image-editor/tree/master/apps/react-image-editor
19+
) - **React** wrapper component is powered by [NHN](https://github.com/nhn).
1720

1821
![6 -20-2018 17-45-54](https://user-images.githubusercontent.com/35218826/41647896-7b218ae0-74b2-11e8-90db-d7805cc23e8c.gif)
1922

2023
## 🚩 Table of Contents
2124

22-
- [Browser Support](#-browser-support)
23-
- [Has full features that stick to the basic.](#-has-full-features-that-stick-to-the-basic)
24-
- [Photo manipulation](#photo-manipulation)
25-
- [Integration function](#integration-function)
26-
- [Powerful filter function](#powerful-filter-function)
27-
- [Easy to apply the size and design you want](#-easy-to-apply-the-size-and-design-you-want)
28-
- [Can be used everywhere](#can-be-used-everywhere)
29-
- [Nice default & Fully customizable Themes](#nice-default--fully-customizable-themes)
30-
- [Features](#-features)
31-
- [Pull Request Steps](#-pull-request-steps)
32-
- [Documents](#-documents)
33-
- [Contributing](#-contributing)
34-
- [Dependency](#-dependency)
35-
- [TOAST UI Family](#-toast-ui-family)
36-
- [Used By](#-used-by)
37-
- [License](#-license)
25+
- [!Toast UI ImageEditor](#)
26+
- [📦 Packages](#packages)
27+
- [🚩 Table of Contents](#-table-of-contents)
28+
- [🌏 Browser Support](#-browser-support)
29+
- [💪 Has full features that stick to the basic.](#-has-full-features-that-stick-to-the-basic)
30+
- [Photo manipulation](#photo-manipulation)
31+
- [Integration function](#integration-function)
32+
- [Powerful filter function](#powerful-filter-function)
33+
- [🙆 Easy to apply the size and design you want](#-easy-to-apply-the-size-and-design-you-want)
34+
- [Can be used everywhere.](#can-be-used-everywhere)
35+
- [Nice default & Fully customizable Themes](#nice-default--fully-customizable-themes)
36+
- [🎨 Features](#-features)
37+
- [🔧 Pull Request Steps](#-pull-request-steps)
38+
- [Setup](#setup)
39+
- [Pull Request](#pull-request)
40+
- [📙 Documents](#-documents)
41+
- [💬 Contributing](#-contributing)
42+
- [🔩 Dependency](#-dependency)
43+
- [🍞 TOAST UI Family](#-toast-ui-family)
44+
- [🚀 Used By](#-used-by)
45+
- [📜 License](#-license)
3846

3947
## 🌏 Browser Support
4048

@@ -127,6 +135,7 @@
127135
- Crop
128136
- Flip
129137
- Rotation
138+
- Resize
130139
- Free drawing
131140
- Line drawing
132141
- Shape

apps/image-editor/examples/example01-includeUi.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<div id="tui-image-editor-container"></div>
2323
<script
2424
type="text/javascript"
25-
src="https://api-storage.cloud.toast.com/v1/AUTH_e18353c4ea5746c097143946d0644e61/toast-ui-cdn/tui-image-editor/v3.11.0/example/fabric-v4.2.0.js"
25+
src="https://cdnjs.cloudflare.com/ajax/libs/fabric.js/4.4.0/fabric.js"
2626
></script>
2727
<script
2828
type="text/javascript"

apps/image-editor/index.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Type definitions for TOAST UI Image Editor v3.14.3
1+
// Type definitions for TOAST UI Image Editor v3.15.0
22
// TypeScript Version: 3.2.2
33

44
declare namespace tuiImageEditor {

0 commit comments

Comments
 (0)