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

Replace tinymce with tiptap #2890

Merged
merged 106 commits into from
Jul 15, 2024
Merged
Show file tree
Hide file tree
Changes from 99 commits
Commits
Show all changes
106 commits
Select commit Hold shift + click to select a range
0842e9b
Rename os-editor to os-legacy-editor
bastianjoel Oct 13, 2023
16e8d21
Add tiptap editor
bastianjoel Oct 13, 2023
a4bdf64
Merge branch 'main' into 1046-replace-tinymce
bastianjoel Oct 24, 2023
70667f3
Add needed tiptap extensions
bastianjoel Oct 24, 2023
7b66da8
Menu improvements
bastianjoel Oct 24, 2023
1f754ab
Merge branch 'main' into 1046-replace-tinymce
bastianjoel Oct 24, 2023
6e5c11a
Fix tests
bastianjoel Oct 24, 2023
0d05ca4
Styling
bastianjoel Oct 24, 2023
13dc2cb
Cleanup
bastianjoel Oct 24, 2023
0480139
Disable shift enter save in motion
bastianjoel Oct 25, 2023
eecbeb5
Update border and remove outline
bastianjoel Oct 25, 2023
2c8bf82
Update baseform control constructor
bastianjoel Oct 25, 2023
2c7ce92
Link dialog
bastianjoel Oct 25, 2023
f686310
Add new mdc component styles
bastianjoel Oct 25, 2023
f6a2612
Use tiptap for amendments
bastianjoel Oct 25, 2023
9538908
Cleanup
bastianjoel Oct 25, 2023
2e437fa
Fix lists created with tiptap
bastianjoel Oct 27, 2023
060fbde
Fix editor init errors
bastianjoel Oct 27, 2023
eea8f3e
Add buttons for missing format functionality
bastianjoel Oct 27, 2023
86603fd
Cleanup
bastianjoel Oct 27, 2023
3c6e817
Implement links
bastianjoel Oct 27, 2023
1d403fc
Table support
bastianjoel Oct 27, 2023
d32cc4c
Add html editing
bastianjoel Oct 27, 2023
8e601c2
Cleanup
bastianjoel Oct 27, 2023
d9f74ca
Fix dark theme button color
bastianjoel Nov 1, 2023
7450fe8
Support TinyMCE text highlight
bastianjoel Nov 1, 2023
e16c22d
Button groups
bastianjoel Nov 1, 2023
53092aa
Highlight color selection
bastianjoel Nov 1, 2023
75e963d
Enable openOnClick
bastianjoel Nov 9, 2023
361927a
Add box border and height
bastianjoel Nov 9, 2023
df725d0
Make editor resizable
bastianjoel Nov 9, 2023
60f67ba
Add mark to inline elements
bastianjoel Nov 21, 2023
f13e9b3
Add option for link target
bastianjoel Nov 21, 2023
f9276f8
Add image dialog
bastianjoel Nov 21, 2023
690ccaa
Merge branch 'main' into 1046-replace-tinymce
bastianjoel Nov 21, 2023
5c5c57f
Merge branch 'main' into 1046-replace-tinymce
bastianjoel Nov 27, 2023
141e922
Fix marked text and color parsing
bastianjoel Nov 27, 2023
27704bf
Merge branch 'main' into 1046-replace-tinymce
bastianjoel Feb 15, 2024
cef796e
Increase max bundle size
bastianjoel Feb 15, 2024
829c0e2
Update tiptap
bastianjoel Feb 15, 2024
863f143
Word paste parse prototype
bastianjoel Feb 16, 2024
8b953d7
Parse ordered list prefixes from office
bastianjoel Feb 21, 2024
08b4eaf
Parse single item lists
bastianjoel Feb 21, 2024
5f71534
Cleanup
bastianjoel Feb 21, 2024
a39e4a2
Move headings into dropdown menu
bastianjoel Feb 21, 2024
c61734a
Move extended plugins into files
bastianjoel Feb 21, 2024
8438fad
Two line menu
bastianjoel Feb 21, 2024
9d66941
Styling
bastianjoel Feb 21, 2024
5716d67
Tooltips
bastianjoel Feb 21, 2024
24a2cf4
Cleanup
bastianjoel Feb 21, 2024
3bd4696
Improve office list parsing
bastianjoel Mar 12, 2024
d785daa
mso-bookmark cleanup
bastianjoel Mar 13, 2024
d8739b1
Additional mso cleanup
bastianjoel Mar 13, 2024
86e8690
Update tiptap
bastianjoel Mar 13, 2024
ba8d961
Fix list type parsing
bastianjoel Mar 13, 2024
05c10a5
Fix list parsing
bastianjoel Mar 13, 2024
337d42c
Use ngFor for heading levels
bastianjoel Mar 13, 2024
f0d2312
Merge branch 'main' into 1046-replace-tinymce
bastianjoel Mar 13, 2024
f014dd8
Fix linter
bastianjoel Mar 13, 2024
779b894
Fix change reco editor buttons
bastianjoel Mar 13, 2024
8146f81
Fix office ol start index
bastianjoel Mar 13, 2024
08605e3
Embed support
bastianjoel Mar 14, 2024
fb277b9
Remove tinymce
bastianjoel Mar 14, 2024
56aab89
Add leaveFocus event to editor
bastianjoel Mar 14, 2024
828c74e
Styling
bastianjoel Mar 14, 2024
f9b6e8a
Add tables dash border
bastianjoel Mar 14, 2024
c2f1f04
Refactoring MSO paste
bastianjoel Mar 14, 2024
acb2101
Editor menu layout
bastianjoel Mar 15, 2024
1c3ad1e
Office Plugin refactoring
bastianjoel Mar 15, 2024
9905a20
Add tests
bastianjoel Mar 18, 2024
40471f8
Cleanup
bastianjoel Mar 18, 2024
6d897c5
Merge branch 'main' into 1046-replace-tinymce
bastianjoel Mar 28, 2024
fc7e2f2
Add http to links
bastianjoel Apr 2, 2024
fc34bc8
Add color paletes
bastianjoel Apr 2, 2024
3fb7138
Improve dialogs
bastianjoel Apr 2, 2024
b804f79
Heading menu checkmarks
bastianjoel Apr 2, 2024
a7808dd
Merge branch 'main' into 1046-replace-tinymce
bastianjoel Apr 5, 2024
9b48b42
Update menu
bastianjoel Apr 5, 2024
49a6499
Update default color palete
bastianjoel Apr 16, 2024
2f72a34
Update menu bar
bastianjoel Apr 16, 2024
249e0de
Remove black text color on paste
bastianjoel Apr 16, 2024
d7ab2d4
Make menu smaller
bastianjoel Apr 16, 2024
f827f20
Merge branch 'main' into 1046-replace-tinymce
bastianjoel Apr 24, 2024
9c6325e
Fix lists diff
bastianjoel Apr 24, 2024
4f4668e
Merge branch 'main' into 1046-replace-tinymce
bastianjoel Apr 24, 2024
2cc2d08
Fix test
bastianjoel Apr 24, 2024
e9aa810
Revert "Fix test"
bastianjoel May 22, 2024
d611b6e
Revert "Fix lists diff"
bastianjoel May 22, 2024
4740ad0
Merge branch 'main' into 1046-replace-tinymce
bastianjoel May 22, 2024
8d63765
Merge branch 'main' into 1046-replace-tinymce
bastianjoel Jun 25, 2024
ae04d53
Fix images getting removed
bastianjoel Jun 25, 2024
5ef2a43
Remove list text surrounding p tags
bastianjoel Jun 25, 2024
f28f731
Update tiptap
bastianjoel Jun 25, 2024
570cfbf
Add image resize
bastianjoel Jul 3, 2024
736b5f1
Use image resize inline
bastianjoel Jul 3, 2024
4e30acc
Merge branch 'main' into 1046-replace-tinymce
bastianjoel Jul 10, 2024
624bc61
Fix lint errors
bastianjoel Jul 10, 2024
0982b1d
Fix html editor font size
bastianjoel Jul 10, 2024
cd2ea08
Merge branch 'main' into 1046-replace-tinymce
bastianjoel Jul 11, 2024
9e6825e
Merge branch 'main' into 1046-replace-tinymce
bastianjoel Jul 12, 2024
3d62d8d
Undo rxjs change
bastianjoel Jul 12, 2024
df8d2dd
Custom image resize plugin
bastianjoel Jul 12, 2024
cbb3349
Image resize
bastianjoel Jul 15, 2024
599fc2a
Merge branch 'main' into 1046-replace-tinymce
bastianjoel Jul 15, 2024
426c89e
Cleanup
bastianjoel Jul 15, 2024
9252b1c
Merge branch 'main' into 1046-replace-tinymce
bastianjoel Jul 15, 2024
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
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ OpenSlides Client uses the following software or parts of them:
- [@pebula/[email protected]](undefined), License: UNKNOWN
- [@pebula/[email protected]](https://github.com/shlomiassaf/ngrid), License: MIT
- [@pebula/[email protected]](undefined), License: UNKNOWN
- [@tinymce/[email protected]](https://github.com/tinymce/tinymce-angular), License: Apache-2.0
- [@videojs/[email protected]](https://github.com/videojs/http-streaming), License: Apache-2.0
- [[email protected]](https://github.com/acornjs/acorn), License: MIT
- [[email protected]](https://github.com/pubkey/broadcast-channel), License: MIT
Expand All @@ -154,7 +153,6 @@ OpenSlides Client uses the following software or parts of them:
- [[email protected]](https://github.com/bpampuch/pdfmake), License: MIT
- [[email protected]](https://github.com/reactivex/rxjs), License: Apache-2.0
- [[email protected]](https://github.com/bgrins/TinyColor), License: MIT
- [[email protected]](https://github.com/tinymce/tinymce), License: LGPL-2.1
- [[email protected]](https://github.com/tamino-martinius/node-ts-dedent), License: MIT
- [[email protected]](https://github.com/Microsoft/tslib), License: 0BSD
- [[email protected]](https://github.com/matteobruni/tsparticles), License: MIT
Expand Down
2 changes: 0 additions & 2 deletions client/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ OpenSlides uses the following software or parts of them:
- [@pebula/[email protected]](undefined), License: UNKNOWN
- [@pebula/[email protected]](https://github.com/shlomiassaf/ngrid), License: MIT
- [@pebula/[email protected]](undefined), License: UNKNOWN
- [@tinymce/[email protected]](https://github.com/tinymce/tinymce-angular), License: Apache-2.0
- [@videojs/[email protected]](https://github.com/videojs/http-streaming), License: Apache-2.0
- [[email protected]](https://github.com/acornjs/acorn), License: MIT
- [[email protected]](https://github.com/pubkey/broadcast-channel), License: MIT
Expand All @@ -63,7 +62,6 @@ OpenSlides uses the following software or parts of them:
- [[email protected]](https://github.com/bpampuch/pdfmake), License: MIT
- [[email protected]](https://github.com/reactivex/rxjs), License: Apache-2.0
- [[email protected]](https://github.com/bgrins/TinyColor), License: MIT
- [[email protected]](https://github.com/tinymce/tinymce), License: LGPL-2.1
- [[email protected]](https://github.com/tamino-martinius/node-ts-dedent), License: MIT
- [[email protected]](https://github.com/Microsoft/tslib), License: 0BSD
- [[email protected]](https://github.com/matteobruni/tsparticles), License: MIT
Expand Down
7 changes: 1 addition & 6 deletions client/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@
"src/manifest.webmanifest",
"src/sw.js",
"src/ngsw-safety.json",
{
"glob": "**/*",
"input": "node_modules/tinymce",
"output": "/tinymce/"
},
{
"glob": "**/*",
"input": "node_modules/cm-chessboard/assets/",
Expand All @@ -55,7 +50,7 @@
{
"type": "initial",
"maximumWarning": "1500kb",
"maximumError": "3500kb"
"maximumError": "4mb"
},
{
"type": "anyComponentStyle",
Expand Down
Loading
Loading