ansuz
|
812df7de6f
|
Merge branch 'merge-staging' into staging
|
7 years ago |
|
yflory
|
b0f553e9ea
|
Add a markdown toolbar to help with the markdown syntax
|
7 years ago |
|
ansuz
|
2e00214783
|
drop unreachable code
|
7 years ago |
|
ansuz
|
ee6c2097f5
|
resolve merge conflicts
|
7 years ago |
|
yflory
|
cf26c4c286
|
Improve the toolbar UI for smaller screens
|
7 years ago |
|
Caleb James DeLisle
|
7b62a8042e
|
Remove TextPatcher and begin to include ChainPad directly using requirejs instead of sniffing off the window
|
7 years ago |
|
Caleb James DeLisle
|
75130150d5
|
Refactored out TextPatcher and JsonOT and replaced with new ChainPad
|
7 years ago |
|
ansuz
|
e07bb0f7b3
|
roll back to old transform function, except in pad
|
7 years ago |
|
yflory
|
8de9a596f1
|
Fix cursor in thumbnails
|
7 years ago |
|
Evilham
|
5dcfbd07ab
|
Merge branch 'theming-improvement' into staging
|
7 years ago |
|
Evilham
|
4933aafbc8
|
Added default values to avoid breaking existing themes.
|
7 years ago |
|
Evilham
|
735f0a7e30
|
Merge branch 'theming-improvement' into staging
|
7 years ago |
|
Evilham
|
83da9cf752
|
Moved colours to colortheme.less to enable theming
|
7 years ago |
|
yflory
|
6f020b67ca
|
Add thumbnails to framework apps
|
7 years ago |
|
yflory
|
c1d05a00ba
|
Improve media-tag export in pad to work with existing CSP
|
7 years ago |
|
yflory
|
6d080bcb45
|
Ability to export mediatag images in pad
|
7 years ago |
|
Caleb James DeLisle
|
a6b34491fc
|
freeze the editor when reconnecting
|
7 years ago |
|
Caleb James DeLisle
|
c773b5d076
|
Remove a brittle test which can make a pad inaccessible, switch from transformFunction to (new) patchTransformer and add another DOM.normalize() which is needed
|
7 years ago |
|
Caleb James DeLisle
|
36aee2d174
|
lets try normalizing the dom before applying a patch
|
7 years ago |
|
Caleb James DeLisle
|
9509d538e0
|
Cursor not being updated at the right times before applying a patch.
|
7 years ago |
|
Caleb James DeLisle
|
d6570ad9f2
|
Standardize media-tag embedder and make media tags always absolute URL, Standardize import/export logic for codemirror apps, fix arrow key navigation in presentation fullscreen mode before first click.
|
7 years ago |
|
Caleb James DeLisle
|
7230c780a1
|
Get rid of last usages of cryptpad-common in pad/inner
|
7 years ago |
|
Caleb James DeLisle
|
f95acda758
|
Minor refactoring of /pad/ ; moved /*/main.js into a common file ; framework'd /code/
|
7 years ago |
|
Caleb James DeLisle
|
6dbc02e81a
|
Merge branch 'staging' into framework
|
7 years ago |
|
Caleb James DeLisle
|
1c791b5b51
|
Fix framework by removing some async and also fix media tags
|
7 years ago |
|
yflory
|
b4de31c827
|
Merge branch 'newdrive' into staging
|
7 years ago |
|
Caleb James DeLisle
|
342b6012f7
|
manual merge of staging into framework
|
7 years ago |
|
yflory
|
69014e5fde
|
Fix mediatags in pad not cached
|
7 years ago |
|
Caleb James DeLisle
|
77fe6a9bba
|
small bug fixes
|
7 years ago |
|
Caleb James DeLisle
|
368a6b2406
|
manual merge, still wip
|
7 years ago |
|
Caleb James DeLisle
|
0eb2165f31
|
Implement a new pad framework and make it work (seemingly) with /pad/
|
7 years ago |
|
yflory
|
456370b1aa
|
Base for Drive in sandboxed iframe
|
7 years ago |
|
yflory
|
95542bcdaf
|
Lint
|
7 years ago |
|
yflory
|
8a09e39f46
|
Enable tags in pads
|
7 years ago |
|
yflory
|
72f0952835
|
Make sure we can't open a pad using the wrong app
|
7 years ago |
|
yflory
|
a78b597ebb
|
lint errors
|
7 years ago |
|
yflory
|
1131ef0172
|
Fix language selection in sandboxed iframes
|
7 years ago |
|
yflory
|
018f71df04
|
Add drop handlers for mediatags in ckeditor
|
7 years ago |
|
yflory
|
c00d295466
|
Add missing translations
|
7 years ago |
|
yflory
|
974658453c
|
Mediatag integration in pads
|
7 years ago |
|
Caleb James DeLisle
|
5f0383ae99
|
update version of sframe-boot because it was changed
|
7 years ago |
|
Caleb James DeLisle
|
710418f42f
|
Make LessLoader able to cache even inside of the sandbox iframe and don't load less compiler unless needed
|
7 years ago |
|
Caleb James DeLisle
|
789a923792
|
Change font-awesome to be pulled through LessLoader which will rewrite the font file URLs to use ver= parameter
|
7 years ago |
|
Caleb James DeLisle
|
041071e61c
|
manual merge
|
7 years ago |
|
Caleb James DeLisle
|
7334173b4a
|
Hopefully fix infinite spinner whenever there is a disconnect (pad)
|
7 years ago |
|
yflory
|
8ef27dca08
|
Lint
|
7 years ago |
|
yflory
|
757d0a2800
|
Save the state of CKEditor's toolbar (visible or hidden)
|
7 years ago |
|
yflory
|
0423a5f4e2
|
Clean secure iframe code
|
7 years ago |
|
yflory
|
04a04aef2b
|
Add setAttribute/getAttribute in secure iframes. Store attributes in settings
|
7 years ago |
|
ansuz
|
47ec959032
|
make sure contenteditable is not set in read only mode
|
7 years ago |