yflory
|
90c96bfb70
|
Prompt users to migrate base64 images to mediatags in the pad app
|
2018-08-29 18:20:34 +02:00 |
|
yflory
|
5cd3cdc208
|
Don't handle drop events in the blockbase64 plugin
|
2018-08-27 14:57:16 +02:00 |
|
yflory
|
3f89dd9908
|
Disable pasting base64 images in ckeditor
|
2018-08-27 11:59:18 +02:00 |
|
ansuz
|
2259d1b6ac
|
Merge branch 'soon' into staging
|
2018-08-16 13:33:09 +02:00 |
|
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.
|
2018-08-14 17:32:16 +02:00 |
|
ansuz
|
fb9cf2c81e
|
lint compliance
|
2018-08-14 17:11:08 +02:00 |
|
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
|
2018-08-13 21:04:24 +02:00 |
|
Caleb James DeLisle
|
0d5ac05866
|
refactoring of the less infrastructure
|
2018-07-14 15:15:23 +02:00 |
|
Caleb James DeLisle
|
a6d3dbf94f
|
Wrapped modal.less into a mixin which gets rid of the last file which emitted CSS
|
2018-07-12 19:13:04 +02:00 |
|
yflory
|
bc57f8c274
|
Replace media-tag.js with the new one
|
2018-06-07 14:12:33 +02:00 |
|
yflory
|
c7e08fedfb
|
Password-protected files
|
2018-05-25 18:00:10 +02:00 |
|
Paul Libbrecht
|
372f1dfeb4
|
First anchor test and restore of the CKEditor anchor function.
|
2018-05-11 09:06:22 +02:00 |
|
yflory
|
10ce95087a
|
Merge branch 'password' into staging
|
2018-05-03 15:16:03 +02:00 |
|
ansuz
|
123612b893
|
Merge branch 'de-translation-pl' into staging
|
2018-05-02 11:09:22 +02:00 |
|
yflory
|
a66d33e5ca
|
Improve export for pads with mediatags
|
2018-04-30 11:40:41 +02:00 |
|
yflory
|
b26ae67df5
|
Fix issues with channel ID when using a password
|
2018-04-26 15:10:31 +02:00 |
|
yflory
|
7384568f77
|
Lint compliance
|
2018-04-23 15:38:21 +02:00 |
|
yflory
|
9d30e48a44
|
Fix mediatag redrawn on content update
|
2018-04-23 15:35:55 +02:00 |
|
yflory
|
2d08924462
|
Fix CkEditor issues
|
2018-04-23 14:33:39 +02:00 |
|
yflory
|
cf549eeaef
|
Clean the code
|
2018-04-20 17:57:48 +02:00 |
|
yflory
|
41afc28802
|
Fix conflicts, clean the code, add migration from old mediatags
|
2018-04-20 17:49:40 +02:00 |
|
yflory
|
6a4f25bc9f
|
Test widget filters
|
2018-04-20 17:48:39 +02:00 |
|
yflory
|
fd89811479
|
Clean mediatag plugin
|
2018-04-19 18:29:10 +02:00 |
|
yflory
|
5eab39ad75
|
Tets mediatag plugin using widgets
|
2018-04-19 17:45:08 +02:00 |
|
Paul Libbrecht
|
5747e1a492
|
Merge branch 'master' of https://github.com/xwiki-labs/cryptpad
|
2018-04-10 19:12:30 +02:00 |
|
yflory
|
4288f536f1
|
Use requireCSS to load FontAwesome
|
2018-03-21 18:31:53 +01:00 |
|
yflory
|
01dd6953b9
|
Fix the previous fix...
|
2018-03-20 15:13:00 +01:00 |
|
yflory
|
c3f7b74baf
|
Fix CkEditor's toolbar initial state
|
2018-03-20 15:07:20 +01:00 |
|
yflory
|
442f15df98
|
Add help text in all the apps + french translation
|
2018-03-08 15:39:46 +01:00 |
|
yflory
|
7a70d69d8e
|
Hide editor toolbars by default when using a small screen
|
2018-03-07 17:34:55 +01:00 |
|
yflory
|
b0dba481d8
|
Fix small UI issues and IE issues
|
2018-03-02 18:33:43 +01:00 |
|
yflory
|
ee3b926e84
|
Get rid of ckeditor's reset_all class...
|
2018-03-01 10:33:28 +01:00 |
|
yflory
|
2c90cb5907
|
Move help button in drawer and fix drawer style
|
2018-02-28 17:59:27 +01:00 |
|
yflory
|
d975bb9cc0
|
Fix focus after pad creation screen
|
2018-02-28 13:16:30 +01:00 |
|
yflory
|
60b2384885
|
Move initial state into a help block
|
2018-02-27 17:38:29 +01:00 |
|
yflory
|
80df45f257
|
Get text from ckeditor
|
2018-02-01 10:09:08 +01:00 |
|
yflory
|
fb192a2c45
|
Add a configurable background color in the file app in view mode
|
2018-01-31 14:42:34 +01:00 |
|
yflory
|
c460e2820e
|
Fix a 1px offset for the userlist in Firefox/Windows
|
2018-01-11 16:09:29 +01:00 |
|
yflory
|
f329d65bc8
|
Ability to reduce the width of ckeditor
|
2017-12-22 18:01:15 +01:00 |
|
yflory
|
edc236e17b
|
Disable edition in pad read-only mode
|
2017-12-20 12:15:43 +01:00 |
|
yflory
|
c269929319
|
Fix creation page not displayed in pad and slide
|
2017-12-11 17:17:06 +01:00 |
|
Caleb James DeLisle
|
617c4b6044
|
CSS refactorings and pad-is-not-pinned work
|
2017-12-07 19:00:13 +01:00 |
|
Caleb James DeLisle
|
c702a23c77
|
Initial work on the 'pad will expire' logic
|
2017-12-05 17:48:30 +01:00 |
|
yflory
|
644f6e9985
|
Use the bounce app to open links from inner
|
2017-11-27 14:44:44 +01:00 |
|
ansuz
|
812df7de6f
|
Merge branch 'merge-staging' into staging
|
2017-11-27 12:18:34 +01:00 |
|
yflory
|
b0f553e9ea
|
Add a markdown toolbar to help with the markdown syntax
|
2017-11-27 12:17:35 +01:00 |
|
ansuz
|
2e00214783
|
drop unreachable code
|
2017-11-23 16:57:01 +01:00 |
|
ansuz
|
ee6c2097f5
|
resolve merge conflicts
|
2017-11-23 16:56:49 +01:00 |
|
yflory
|
cf26c4c286
|
Improve the toolbar UI for smaller screens
|
2017-11-17 18:21:45 +01:00 |
|
Caleb James DeLisle
|
7b62a8042e
|
Remove TextPatcher and begin to include ChainPad directly using requirejs instead of sniffing off the window
|
2017-11-09 17:07:04 +01:00 |
|
Caleb James DeLisle
|
75130150d5
|
Refactored out TextPatcher and JsonOT and replaced with new ChainPad
|
2017-11-09 15:36:49 +01:00 |
|
ansuz
|
e07bb0f7b3
|
roll back to old transform function, except in pad
|
2017-11-06 17:18:10 +01:00 |
|
yflory
|
8de9a596f1
|
Fix cursor in thumbnails
|
2017-11-02 19:11:27 +01:00 |
|
Evilham
|
5dcfbd07ab
|
Merge branch 'theming-improvement' into staging
|
2017-10-27 18:32:08 +02:00 |
|
Evilham
|
4933aafbc8
|
Added default values to avoid breaking existing themes.
|
2017-10-27 18:31:52 +02:00 |
|
Evilham
|
735f0a7e30
|
Merge branch 'theming-improvement' into staging
|
2017-10-26 20:44:56 +02:00 |
|
Evilham
|
83da9cf752
|
Moved colours to colortheme.less to enable theming
|
2017-10-26 20:29:14 +02:00 |
|
yflory
|
6f020b67ca
|
Add thumbnails to framework apps
|
2017-10-26 12:31:16 +02:00 |
|
yflory
|
c1d05a00ba
|
Improve media-tag export in pad to work with existing CSP
|
2017-10-23 10:55:40 +02:00 |
|
yflory
|
6d080bcb45
|
Ability to export mediatag images in pad
|
2017-10-20 18:10:08 +02:00 |
|
Caleb James DeLisle
|
a6b34491fc
|
freeze the editor when reconnecting
|
2017-10-13 13:40:51 +03:00 |
|
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
|
2017-10-12 15:42:09 +03:00 |
|
Caleb James DeLisle
|
36aee2d174
|
lets try normalizing the dom before applying a patch
|
2017-10-09 14:13:11 +03:00 |
|
Caleb James DeLisle
|
9509d538e0
|
Cursor not being updated at the right times before applying a patch.
|
2017-10-06 14:49:52 +03:00 |
|
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.
|
2017-10-03 17:57:57 +03:00 |
|
Caleb James DeLisle
|
7230c780a1
|
Get rid of last usages of cryptpad-common in pad/inner
|
2017-10-02 15:06:01 +03:00 |
|
Caleb James DeLisle
|
f95acda758
|
Minor refactoring of /pad/ ; moved /*/main.js into a common file ; framework'd /code/
|
2017-09-27 16:53:16 +02:00 |
|
Caleb James DeLisle
|
6dbc02e81a
|
Merge branch 'staging' into framework
|
2017-09-27 12:01:18 +02:00 |
|
Caleb James DeLisle
|
1c791b5b51
|
Fix framework by removing some async and also fix media tags
|
2017-09-27 11:58:14 +02:00 |
|
yflory
|
b4de31c827
|
Merge branch 'newdrive' into staging
|
2017-09-27 10:28:16 +02:00 |
|
Caleb James DeLisle
|
342b6012f7
|
manual merge of staging into framework
|
2017-09-26 17:11:45 +02:00 |
|
yflory
|
69014e5fde
|
Fix mediatags in pad not cached
|
2017-09-26 11:21:36 +02:00 |
|
Caleb James DeLisle
|
77fe6a9bba
|
small bug fixes
|
2017-09-26 10:23:35 +02:00 |
|
Caleb James DeLisle
|
368a6b2406
|
manual merge, still wip
|
2017-09-25 17:35:25 +02:00 |
|
Caleb James DeLisle
|
0eb2165f31
|
Implement a new pad framework and make it work (seemingly) with /pad/
|
2017-09-25 15:45:08 +02:00 |
|
yflory
|
456370b1aa
|
Base for Drive in sandboxed iframe
|
2017-09-21 17:59:26 +02:00 |
|
yflory
|
95542bcdaf
|
Lint
|
2017-09-19 15:38:19 +02:00 |
|
yflory
|
8a09e39f46
|
Enable tags in pads
|
2017-09-19 15:30:08 +02:00 |
|
yflory
|
72f0952835
|
Make sure we can't open a pad using the wrong app
|
2017-09-19 11:31:45 +02:00 |
|
yflory
|
a78b597ebb
|
lint errors
|
2017-09-18 15:51:47 +02:00 |
|
yflory
|
1131ef0172
|
Fix language selection in sandboxed iframes
|
2017-09-18 14:26:54 +02:00 |
|
yflory
|
018f71df04
|
Add drop handlers for mediatags in ckeditor
|
2017-09-18 10:59:40 +02:00 |
|
yflory
|
c00d295466
|
Add missing translations
|
2017-09-15 17:33:36 +02:00 |
|
yflory
|
974658453c
|
Mediatag integration in pads
|
2017-09-15 13:21:37 +02:00 |
|
Caleb James DeLisle
|
5f0383ae99
|
update version of sframe-boot because it was changed
|
2017-09-14 10:52:25 +02:00 |
|
Caleb James DeLisle
|
710418f42f
|
Make LessLoader able to cache even inside of the sandbox iframe and don't load less compiler unless needed
|
2017-09-13 16:04:01 +02:00 |
|
Caleb James DeLisle
|
789a923792
|
Change font-awesome to be pulled through LessLoader which will rewrite the font file URLs to use ver= parameter
|
2017-09-13 14:47:50 +02:00 |
|
Caleb James DeLisle
|
041071e61c
|
manual merge
|
2017-09-11 15:52:14 +02:00 |
|
Caleb James DeLisle
|
7334173b4a
|
Hopefully fix infinite spinner whenever there is a disconnect (pad)
|
2017-09-11 15:46:21 +02:00 |
|
yflory
|
8ef27dca08
|
Lint
|
2017-09-11 12:25:23 +02:00 |
|
yflory
|
757d0a2800
|
Save the state of CKEditor's toolbar (visible or hidden)
|
2017-09-11 10:10:29 +02:00 |
|
Paul Libbrecht
|
1ae7076790
|
Merge branch 'master' of https://github.com/xwiki-labs/cryptpad
|
2017-09-07 22:08:34 +02:00 |
|
yflory
|
0423a5f4e2
|
Clean secure iframe code
|
2017-09-06 18:26:10 +02:00 |
|
yflory
|
04a04aef2b
|
Add setAttribute/getAttribute in secure iframes. Store attributes in settings
|
2017-09-06 16:05:20 +02:00 |
|
ansuz
|
47ec959032
|
make sure contenteditable is not set in read only mode
|
2017-09-05 18:35:11 +02:00 |
|
ansuz
|
6a735b441f
|
use paul's print styles
|
2017-09-05 18:16:06 +02:00 |
|
Paul Libbrecht
|
e7de9229a8
|
Do not print toolbar and collaboration (#178).
paul
|
2017-09-05 17:29:03 +02:00 |
|
yflory
|
204e45dfae
|
Enable templates in pad
|
2017-09-05 11:57:44 +02:00 |
|
yflory
|
86e23ac19f
|
Use less2 in secure iframes
|
2017-09-04 15:09:54 +02:00 |
|
yflory
|
0d008aaa2e
|
Add indent settings to code2
|
2017-08-30 17:57:10 +02:00 |
|