yflory
|
ab07554d0b
|
Fix initial size of the image preview in the mediatag dialog
|
6 years ago |
|
yflory
|
ee1027ceb9
|
Ability to import mediatags to the drive
|
6 years ago |
|
yflory
|
264f7dc6a1
|
Move base64 migration prompt to corner and only when the pad is stored
|
6 years ago |
|
yflory
|
90c96bfb70
|
Prompt users to migrate base64 images to mediatags in the pad app
|
6 years ago |
|
yflory
|
5cd3cdc208
|
Don't handle drop events in the blockbase64 plugin
|
6 years ago |
|
yflory
|
3f89dd9908
|
Disable pasting base64 images in ckeditor
|
6 years ago |
|
ansuz
|
2259d1b6ac
|
Merge branch 'soon' into staging
|
6 years ago |
|
ansuz
|
8a113d742e
|
Merge pull request #245 from xwiki-labs/issue-169-anchors-should-output-anchors
#169: First anchor test and restore of the CKEditor anchor function.
|
6 years ago |
|
ansuz
|
fb9cf2c81e
|
lint compliance
|
6 years ago |
|
Paul Libbrecht
|
0dc1500784
|
This should solve issue #169: The test now completes with the insertion of a random anchor (menu-driven) and some text, the export is then checked to contain <a name="..." id="..."> as expected, then cleans up.
paul
|
6 years ago |
|
Caleb James DeLisle
|
0d5ac05866
|
refactoring of the less infrastructure
|
7 years ago |
|
Caleb James DeLisle
|
a6d3dbf94f
|
Wrapped modal.less into a mixin which gets rid of the last file which emitted CSS
|
7 years ago |
|
yflory
|
bc57f8c274
|
Replace media-tag.js with the new one
|
7 years ago |
|
yflory
|
c7e08fedfb
|
Password-protected files
|
7 years ago |
|
Paul Libbrecht
|
372f1dfeb4
|
First anchor test and restore of the CKEditor anchor function.
|
7 years ago |
|
yflory
|
10ce95087a
|
Merge branch 'password' into staging
|
7 years ago |
|
ansuz
|
123612b893
|
Merge branch 'de-translation-pl' into staging
|
7 years ago |
|
yflory
|
a66d33e5ca
|
Improve export for pads with mediatags
|
7 years ago |
|
yflory
|
b26ae67df5
|
Fix issues with channel ID when using a password
|
7 years ago |
|
yflory
|
7384568f77
|
Lint compliance
|
7 years ago |
|
yflory
|
9d30e48a44
|
Fix mediatag redrawn on content update
|
7 years ago |
|
yflory
|
2d08924462
|
Fix CkEditor issues
|
7 years ago |
|
yflory
|
cf549eeaef
|
Clean the code
|
7 years ago |
|
yflory
|
41afc28802
|
Fix conflicts, clean the code, add migration from old mediatags
|
7 years ago |
|
yflory
|
6a4f25bc9f
|
Test widget filters
|
7 years ago |
|
yflory
|
fd89811479
|
Clean mediatag plugin
|
7 years ago |
|
yflory
|
5eab39ad75
|
Tets mediatag plugin using widgets
|
7 years ago |
|
Paul Libbrecht
|
5747e1a492
|
Merge branch 'master' of https://github.com/xwiki-labs/cryptpad
|
7 years ago |
|
yflory
|
4288f536f1
|
Use requireCSS to load FontAwesome
|
7 years ago |
|
yflory
|
01dd6953b9
|
Fix the previous fix...
|
7 years ago |
|
yflory
|
c3f7b74baf
|
Fix CkEditor's toolbar initial state
|
7 years ago |
|
yflory
|
442f15df98
|
Add help text in all the apps + french translation
|
7 years ago |
|
yflory
|
7a70d69d8e
|
Hide editor toolbars by default when using a small screen
|
7 years ago |
|
yflory
|
b0dba481d8
|
Fix small UI issues and IE issues
|
7 years ago |
|
yflory
|
ee3b926e84
|
Get rid of ckeditor's reset_all class...
|
7 years ago |
|
yflory
|
2c90cb5907
|
Move help button in drawer and fix drawer style
|
7 years ago |
|
yflory
|
d975bb9cc0
|
Fix focus after pad creation screen
|
7 years ago |
|
yflory
|
60b2384885
|
Move initial state into a help block
|
7 years ago |
|
yflory
|
80df45f257
|
Get text from ckeditor
|
7 years ago |
|
yflory
|
fb192a2c45
|
Add a configurable background color in the file app in view mode
|
7 years ago |
|
yflory
|
c460e2820e
|
Fix a 1px offset for the userlist in Firefox/Windows
|
7 years ago |
|
yflory
|
f329d65bc8
|
Ability to reduce the width of ckeditor
|
7 years ago |
|
yflory
|
edc236e17b
|
Disable edition in pad read-only mode
|
7 years ago |
|
yflory
|
c269929319
|
Fix creation page not displayed in pad and slide
|
7 years ago |
|
Caleb James DeLisle
|
617c4b6044
|
CSS refactorings and pad-is-not-pinned work
|
7 years ago |
|
Caleb James DeLisle
|
c702a23c77
|
Initial work on the 'pad will expire' logic
|
7 years ago |
|
yflory
|
644f6e9985
|
Use the bounce app to open links from inner
|
7 years ago |
|
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 |
|
Paul Libbrecht
|
1ae7076790
|
Merge branch 'master' of https://github.com/xwiki-labs/cryptpad
|
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 |
|
ansuz
|
6a735b441f
|
use paul's print styles
|
7 years ago |
|
Paul Libbrecht
|
e7de9229a8
|
Do not print toolbar and collaboration (#178).
paul
|
7 years ago |
|
yflory
|
204e45dfae
|
Enable templates in pad
|
7 years ago |
|
yflory
|
86e23ac19f
|
Use less2 in secure iframes
|
7 years ago |
|
yflory
|
0d008aaa2e
|
Add indent settings to code2
|
7 years ago |
|
yflory
|
0893bcc0e5
|
Merge branch 'staging' into code2
|
7 years ago |
|
ansuz
|
9a23b77b46
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
be8ea4102e
|
keep trying to parse the hash until it works
|
7 years ago |
|
yflory
|
4db4f66786
|
Remove an unnecessary fix for Safari
|
7 years ago |
|
yflory
|
a2ed266048
|
Move the code app in a secure iframe
|
7 years ago |
|
Caleb James DeLisle
|
1044531806
|
Fix Safari iframe size issue
|
7 years ago |
|
yflory
|
51fa6287c1
|
Enable notifications in secure pads
|
7 years ago |
|
ansuz
|
40f062abda
|
restore app usage report in new pad
|
7 years ago |
|
Caleb James DeLisle
|
fe03e6ae83
|
bad code, lint
|
7 years ago |
|
Caleb James DeLisle
|
190dff1c9b
|
Use the bounce app for opening a link with the right click
|
7 years ago |
|
yflory
|
0b4e044540
|
Fix the plugin to open a link in a new tab in pad
|
7 years ago |
|
yflory
|
88cb4fd83c
|
Enable friend requests from secure pads
|
7 years ago |
|
yflory
|
f89015d9ed
|
Update the tab title to match the pad title in pad2
|
7 years ago |
|
Caleb James DeLisle
|
056285a7b6
|
Move pad2 to pad and create bounce app
|
7 years ago |
|
Caleb James DeLisle
|
b081603455
|
Update requirejs
|
7 years ago |
|
Caleb James DeLisle
|
3315449114
|
Lets try this...
|
7 years ago |
|
Caleb James DeLisle
|
6b174934c8
|
Try waiting for iframe document.onload instead of looping and waiting for document.body to exist.
|
7 years ago |
|
Caleb James DeLisle
|
725e19925c
|
Yeah, that was silly...
|
7 years ago |
|
Caleb James DeLisle
|
b0b1ed037c
|
Add a filter to catch XSS-like entities and also stub a on-load test which would otherwise make pads inaccessable.
|
7 years ago |
|
Caleb James DeLisle
|
638a94785f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
Caleb James DeLisle
|
7ca60e55a7
|
Lock the pad's inner-iframe down with CSP
|
7 years ago |
|
ansuz
|
5e6e76dfc1
|
make regex case insensitive
|
7 years ago |
|
Pierre Bondoerffer
|
2cc6c636db
|
Add some missing titles
|
7 years ago |
|
ansuz
|
dc7db074e8
|
open pad links when clicking in readOnly mode
|
8 years ago |
|
yflory
|
331b4dddea
|
Clean debugging code
|
8 years ago |
|
yflory
|
c33d2a2db0
|
New tooltips
|
8 years ago |
|
yflory
|
88813aee02
|
Show that only html can be imported in pads
|
8 years ago |
|
ansuz
|
7be1e249e1
|
add fa-share-alt to pad initialText
|
8 years ago |
|
yflory
|
fa2d857d70
|
Fix css issues with Safari
|
8 years ago |
|
yflory
|
5a3e9c785c
|
Fix ckeditor toolbar
|
8 years ago |
|
yflory
|
ed0121d172
|
Lint errors
|
8 years ago |
|
yflory
|
8279ef3130
|
Fix conflict between ckeditor toolbar and userlist on small screens
|
8 years ago |
|
ansuz
|
7a5c5ce0a3
|
load scripts asynchronously
|
8 years ago |
|
ansuz
|
5e56ad912e
|
remove the last bit of compiled css
|
8 years ago |
|
ansuz
|
cfc5907237
|
remove unnecessary style rules
|
8 years ago |
|
ansuz
|
7de2683169
|
make all apps use clientside templates
|
8 years ago |
|
ansuz
|
e9bfaa9a60
|
compile less clientside. remove compiled css
|
8 years ago |
|
yflory
|
0d4d104e08
|
Mobile support for the new toolbar
|
8 years ago |
|
yflory
|
a11befaa0f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
13288ee18b
|
Update the userlist in code, slide and pad
|
8 years ago |
|
ansuz
|
852c028822
|
don't allow editing if pad type is wrong
|
8 years ago |
|
yflory
|
8d956c3de6
|
New toolbar
|
8 years ago |
|
yflory
|
b7a0547b77
|
New toolbar colors
|
8 years ago |
|
yflory
|
59fb5bd8be
|
One toolbar color per app
|
8 years ago |
|
yflory
|
5a248db267
|
Merge branch 'staging' into newCk
|
8 years ago |
|
yflory
|
f13d23241c
|
Upgrade CkEditor to version 4.7
|
8 years ago |
|
ansuz
|
d5c7eb49a4
|
send feedback on toolbar hide and CKE buttons
|
8 years ago |
|
yflory
|
376b60c21c
|
New toolbar temp
|
8 years ago |
|
ansuz
|
ec9a4dec5e
|
Merge branch 'soon' into staging
|
8 years ago |
|
ansuz
|
76c530037b
|
enable donate button in all apps
|
8 years ago |
|
ansuz
|
99a44f119f
|
don't send referrer headers on pads which may link outward
|
8 years ago |
|
ansuz
|
1240b864ef
|
fix misconfigured history
|
8 years ago |
|
yflory
|
716245f864
|
Make all the buttons look the same
|
8 years ago |
|
yflory
|
c00158d23a
|
Move code to common-history
|
8 years ago |
|
yflory
|
ff16084719
|
Fix lint errors
|
8 years ago |
|
yflory
|
c79a6e3b2b
|
Move Metadata, CodeMirror and title functions in separate files
|
8 years ago |
|
yflory
|
5a883d5a57
|
Use the new toolbar and move the userlist code in a separate file
|
8 years ago |
|
ansuz
|
78b11584f8
|
remove unused variables
|
8 years ago |
|
yflory
|
a165332c15
|
Don't store a pad in the drive if the limit has been reached
|
8 years ago |
|
ansuz
|
f7e96b4e8c
|
resolve merge conflicts and jquery errors
|
8 years ago |
|
yflory
|
5fc2e4cf71
|
Remove the toolbar in ckeditor history mode + history configurable
|
8 years ago |
|
yflory
|
92ea03d7d9
|
View and restore the history of a pad
|
8 years ago |
|
Caleb James DeLisle
|
c341fa8e94
|
Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter
|
8 years ago |
|
ansuz
|
50277cb0ae
|
don't rely on 'info' in onRemote so we can call it anywhere
|
8 years ago |
|
ansuz
|
df4a250359
|
use feedback api instead of app=
|
8 years ago |
|
yflory
|
84d8615cf1
|
Save and use templates in pad, code and slides
|
8 years ago |
|
ansuz
|
233bb7a14f
|
reorganize some html tags for smaller diffs
|
8 years ago |
|
yflory
|
71c59d7ae2
|
Remove unnecessary TODOs
|
8 years ago |
|
yflory
|
d92a875ce5
|
Translate the 'wrong application' error message
|
8 years ago |
|
yflory
|
a8ffac5dcd
|
Remove old code
|
8 years ago |
|
ansuz
|
912215185f
|
add uid to userdata for better notifications
|
8 years ago |
|
ansuz
|
4a173e30dc
|
set user's cursor to either the beginning or end of the document
|
8 years ago |
|
yflory
|
15e9af77bb
|
Remove the langauge selector from toolbar and add it in settings
|
8 years ago |
|
yflory
|
a286599f93
|
Fix fast reconnect, and add support for reconnecting ws in polls
|
8 years ago |
|
ansuz
|
6e733b1329
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
459b18c97b
|
Add the loading screen in the HTML so that it is displayed before JS is loaded
|
8 years ago |
|
ansuz
|
8a48612de2
|
add some notes for later
|
8 years ago |
|
ansuz
|
c04819538b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
fcb9848b3a
|
hide toolbar when in read-only mode
|
8 years ago |
|
yflory
|
2a1b241592
|
Display a button to open the editing link while in read-only mode if we know it
|
8 years ago |
|
Caleb James DeLisle
|
91eda5fa83
|
Implement stronger content-security-policy except in /pad/ which does not allow it.
Implement a "loader" which allows for applying a version number to everything.
Added a cache control for anything which has a version.
|
8 years ago |
|
ansuz
|
7db0e14bc0
|
add 'force' flag to override removal of html elements
|
8 years ago |
|
yflory
|
412815b042
|
Merge branch 'security' of git.xwikisas.com:xwiki-labs/cryptpad into security
|
8 years ago |
|
yflory
|
11d54256da
|
Make sure the display name is displayed in the same way everywhere
|
8 years ago |
|
ansuz
|
639376f1cb
|
don't use hyperjson.toString
|
8 years ago |
|
ansuz
|
86adfbf27d
|
update cache-busting directive in all supported apps
|
8 years ago |
|
yflory
|
8741b50f5b
|
Set the file name as default title if a pad is created from the drive
|
8 years ago |
|
yflory
|
e38df7ce47
|
Fix creation of new pads in /pad
|
8 years ago |
|
yflory
|
f8d653406a
|
Add the new content for the default pad and add french translation
|
8 years ago |
|
yflory
|
d4bf7cf9aa
|
Send the initial state only if it is a new pad in /pad
|
8 years ago |
|
yflory
|
fadddb297c
|
Readonly mode in /pad had contenteditable set to true
|
8 years ago |
|
yflory
|
88b29e8bdd
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
5303e76ece
|
Make sure the content is correctly applied in onReady
|
8 years ago |
|
ansuz
|
cc829d51f8
|
jshint compliance
|
8 years ago |
|
yflory
|
e15a6a347f
|
Fix the forget pad button
|
8 years ago |
|
yflory
|
a0340f1419
|
Open link in a new tab in /pad
|
8 years ago |
|
yflory
|
0ce17ebbad
|
CryptDrive usability improvements (new file in drive + context menu)
|
8 years ago |