Commit graph

468 commits

Author SHA1 Message Date
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
yflory
0893bcc0e5 Merge branch 'staging' into code2 2017-08-30 14:57:19 +02:00
ansuz
9a23b77b46 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-30 11:31:59 +02:00
ansuz
be8ea4102e keep trying to parse the hash until it works 2017-08-30 11:26:51 +02:00
yflory
4db4f66786 Remove an unnecessary fix for Safari 2017-08-30 11:14:58 +02:00
yflory
a2ed266048 Move the code app in a secure iframe 2017-08-30 11:10:57 +02:00
Caleb James DeLisle
1044531806 Fix Safari iframe size issue 2017-08-30 11:04:52 +02:00
yflory
51fa6287c1 Enable notifications in secure pads 2017-08-29 11:20:02 +02:00
ansuz
40f062abda restore app usage report in new pad 2017-08-29 10:50:02 +02:00
Caleb James DeLisle
fe03e6ae83 bad code, lint 2017-08-28 17:53:23 +02:00
Caleb James DeLisle
190dff1c9b Use the bounce app for opening a link with the right click 2017-08-28 17:50:55 +02:00
yflory
0b4e044540 Fix the plugin to open a link in a new tab in pad 2017-08-28 17:26:51 +02:00
yflory
88cb4fd83c Enable friend requests from secure pads 2017-08-28 16:21:05 +02:00
yflory
f89015d9ed Update the tab title to match the pad title in pad2 2017-08-28 14:49:33 +02:00
Caleb James DeLisle
056285a7b6 Move pad2 to pad and create bounce app 2017-08-28 12:25:05 +02:00
Caleb James DeLisle
b081603455 Update requirejs 2017-08-21 18:08:37 +02:00
Caleb James DeLisle
3315449114 Lets try this... 2017-08-16 14:30:17 +02:00
Caleb James DeLisle
6b174934c8 Try waiting for iframe document.onload instead of looping and waiting for document.body to exist. 2017-08-16 12:40:15 +02:00
Caleb James DeLisle
725e19925c Yeah, that was silly... 2017-08-16 12:11:25 +02:00
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. 2017-08-16 10:19:24 +02:00
Caleb James DeLisle
638a94785f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-14 16:24:17 +02:00
Caleb James DeLisle
7ca60e55a7 Lock the pad's inner-iframe down with CSP 2017-08-14 16:23:38 +02:00
ansuz
5e6e76dfc1 make regex case insensitive 2017-08-14 14:41:23 +02:00
Pierre Bondoerffer
2cc6c636db
Add some missing titles 2017-08-08 16:20:31 +02:00
ansuz
dc7db074e8 open pad links when clicking in readOnly mode 2017-08-03 11:04:38 +02:00
yflory
331b4dddea Clean debugging code 2017-07-19 17:50:08 +02:00
yflory
c33d2a2db0 New tooltips 2017-07-19 17:14:10 +02:00
yflory
88813aee02 Show that only html can be imported in pads 2017-07-19 16:36:10 +02:00
ansuz
7be1e249e1 add fa-share-alt to pad initialText 2017-07-13 15:48:03 +02:00
yflory
fa2d857d70 Fix css issues with Safari 2017-07-03 16:11:41 +02:00
yflory
5a3e9c785c Fix ckeditor toolbar 2017-06-29 18:15:41 +02:00
yflory
ed0121d172 Lint errors 2017-06-29 18:05:34 +02:00
yflory
8279ef3130 Fix conflict between ckeditor toolbar and userlist on small screens 2017-06-29 17:51:30 +02:00
ansuz
7a5c5ce0a3 load scripts asynchronously 2017-06-29 12:17:08 +02:00
ansuz
5e56ad912e remove the last bit of compiled css 2017-06-28 14:51:49 +02:00
ansuz
cfc5907237 remove unnecessary style rules 2017-06-28 10:41:08 +02:00
ansuz
7de2683169 make all apps use clientside templates 2017-06-27 18:17:52 +02:00
ansuz
e9bfaa9a60 compile less clientside. remove compiled css 2017-06-27 14:25:02 +02:00
yflory
0d4d104e08 Mobile support for the new toolbar 2017-06-23 17:56:14 +02:00
yflory
a11befaa0f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-22 15:52:31 +02:00
yflory
13288ee18b Update the userlist in code, slide and pad 2017-06-22 15:52:25 +02:00
ansuz
852c028822 don't allow editing if pad type is wrong 2017-06-22 14:31:55 +02:00
yflory
8d956c3de6 New toolbar 2017-06-21 18:04:35 +02:00
yflory
b7a0547b77 New toolbar colors 2017-06-20 17:59:11 +02:00
yflory
59fb5bd8be One toolbar color per app 2017-06-20 12:33:50 +02:00
yflory
5a248db267 Merge branch 'staging' into newCk 2017-06-20 10:57:40 +02:00
yflory
f13d23241c Upgrade CkEditor to version 4.7 2017-06-20 10:03:13 +02:00
ansuz
d5c7eb49a4 send feedback on toolbar hide and CKE buttons 2017-06-14 15:33:12 +02:00
yflory
376b60c21c New toolbar temp 2017-06-12 15:59:24 +02:00
ansuz
ec9a4dec5e Merge branch 'soon' into staging 2017-06-05 11:43:26 +02:00
ansuz
76c530037b enable donate button in all apps 2017-05-30 15:51:07 +02:00
ansuz
99a44f119f don't send referrer headers on pads which may link outward 2017-05-30 10:44:40 +02:00
ansuz
1240b864ef fix misconfigured history 2017-05-29 17:25:06 +02:00
yflory
716245f864 Make all the buttons look the same 2017-05-15 16:16:50 +02:00
yflory
c00158d23a Move code to common-history 2017-05-10 13:39:14 +02:00
yflory
ff16084719 Fix lint errors 2017-05-09 18:10:02 +02:00
yflory
c79a6e3b2b Move Metadata, CodeMirror and title functions in separate files 2017-05-09 17:47:47 +02:00
yflory
5a883d5a57 Use the new toolbar and move the userlist code in a separate file 2017-05-05 17:56:49 +02:00
ansuz
78b11584f8 remove unused variables 2017-05-04 16:16:09 +02:00
yflory
a165332c15 Don't store a pad in the drive if the limit has been reached 2017-04-28 12:08:05 +02:00
ansuz
f7e96b4e8c resolve merge conflicts and jquery errors 2017-04-24 13:43:18 +02:00
yflory
5fc2e4cf71 Remove the toolbar in ckeditor history mode + history configurable 2017-04-24 11:41:00 +02:00
yflory
92ea03d7d9 View and restore the history of a pad 2017-04-21 17:31:47 +02:00
Caleb James DeLisle
c341fa8e94 Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter 2017-04-18 12:14:32 +02:00
ansuz
50277cb0ae don't rely on 'info' in onRemote so we can call it anywhere 2017-04-13 19:46:38 +02:00
ansuz
df4a250359 use feedback api instead of app= 2017-04-13 12:18:08 +02:00
yflory
84d8615cf1 Save and use templates in pad, code and slides 2017-04-07 18:20:03 +02:00
ansuz
233bb7a14f reorganize some html tags for smaller diffs 2017-03-29 18:38:06 +02:00
yflory
71c59d7ae2 Remove unnecessary TODOs 2017-03-27 11:53:13 +02:00
yflory
d92a875ce5 Translate the 'wrong application' error message 2017-03-27 11:34:54 +02:00
yflory
a8ffac5dcd Remove old code 2017-03-27 11:30:09 +02:00
ansuz
912215185f add uid to userdata for better notifications 2017-03-24 13:32:42 +01:00
ansuz
4a173e30dc set user's cursor to either the beginning or end of the document 2017-03-20 17:51:56 +01:00
yflory
15e9af77bb Remove the langauge selector from toolbar and add it in settings 2017-03-15 17:14:49 +01:00
yflory
a286599f93 Fix fast reconnect, and add support for reconnecting ws in polls 2017-03-15 16:01:00 +01:00
ansuz
6e733b1329 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-13 10:59:20 +01:00
yflory
459b18c97b Add the loading screen in the HTML so that it is displayed before JS is loaded 2017-03-08 18:05:15 +01:00
ansuz
8a48612de2 add some notes for later 2017-03-07 14:40:06 +01:00
ansuz
c04819538b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-03 18:16:39 +01:00
ansuz
fcb9848b3a hide toolbar when in read-only mode 2017-03-03 18:16:34 +01:00
yflory
2a1b241592 Display a button to open the editing link while in read-only mode if we know it 2017-03-03 18:14:53 +01:00
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.
2017-03-01 21:06:53 +01:00
ansuz
7db0e14bc0 add 'force' flag to override removal of html elements 2017-03-01 17:05:57 +01:00
yflory
412815b042 Merge branch 'security' of git.xwikisas.com:xwiki-labs/cryptpad into security 2017-03-01 13:10:55 +01:00
yflory
11d54256da Make sure the display name is displayed in the same way everywhere 2017-03-01 13:10:06 +01:00
ansuz
639376f1cb don't use hyperjson.toString 2017-03-01 12:36:10 +01:00
ansuz
86adfbf27d update cache-busting directive in all supported apps 2017-02-28 10:47:18 +01:00
yflory
8741b50f5b Set the file name as default title if a pad is created from the drive 2017-02-27 18:15:18 +01:00
yflory
e38df7ce47 Fix creation of new pads in /pad 2017-02-27 17:47:11 +01:00
yflory
f8d653406a Add the new content for the default pad and add french translation 2017-02-27 17:23:28 +01:00
yflory
d4bf7cf9aa Send the initial state only if it is a new pad in /pad 2017-02-27 14:29:38 +01:00
yflory
fadddb297c Readonly mode in /pad had contenteditable set to true 2017-02-27 12:41:29 +01:00
yflory
88b29e8bdd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-24 18:55:48 +01:00
yflory
5303e76ece Make sure the content is correctly applied in onReady 2017-02-24 18:55:41 +01:00
ansuz
cc829d51f8 jshint compliance 2017-02-24 18:23:43 +01:00
yflory
e15a6a347f Fix the forget pad button 2017-02-24 15:22:26 +01:00
yflory
a0340f1419 Open link in a new tab in /pad 2017-02-23 14:27:18 +01:00
yflory
0ce17ebbad CryptDrive usability improvements (new file in drive + context menu) 2017-02-22 12:25:29 +01:00
ansuz
3d0e7cb9a7 pull ckeditor config out of main.js 2017-02-21 18:21:30 +01:00
yflory
c72bbd4c37 Use the file name as initial title 2017-02-21 17:42:58 +01:00
yflory
47b8fefd9e Load messages.js only once, in cryptpad-common 2017-02-21 14:16:23 +01:00
yflory
c17f28e5fe Fix race condition #2 2017-02-17 15:39:34 +01:00
ansuz
8167ed9048 implement cache-busting everywhere 2017-02-17 12:39:01 +01:00
yflory
e4dbe97d71 Update display name in realtime across tabs and remember 'anonymous' name 2017-02-16 15:35:03 +01:00
yflory
2851ceb95a Merge branch 'soon' into staging 2017-02-13 11:59:49 +01:00
ansuz
1232aa8a79 jshint compliance 2017-02-10 14:25:02 +01:00
ansuz
a995df25f6 disable new OT in pad and code app 2017-02-09 17:20:13 +01:00
yflory
d54262c8df Use the same disconnecter error translation key for all the apps 2017-02-09 15:34:14 +01:00
yflory
3af7c9cff8 Replace the expand/collapse ckeditor button by our own to save space 2017-02-08 15:32:55 +01:00
yflory
914c442615 Do not redirect to home page when logging out from another tab 2017-02-08 12:54:07 +01:00
yflory
02439e0f61 Improve the homepage with new images and translations 2017-02-03 16:03:36 +01:00
yflory
a4286f1c83 Merge branch 'soon' into newtoolbar 2017-01-27 16:52:49 +01:00
yflory
373b07ed28 Fix lint errors 2017-01-25 10:21:31 +01:00
yflory
ce1e792419 Merge branch 'soon' into newtoolbar 2017-01-24 12:54:07 +01:00
yflory
69fb8b4d2f Merge branch 'master' into soon 2017-01-23 15:13:26 +01:00
yflory
f8455875a9 Fix the NoScript (iframe not loaded) bug with inner iframes 2017-01-23 15:07:38 +01:00
yflory
1e1bfd275c Don't show the tab notification when someone has joined the pad 2017-01-19 15:17:21 +01:00
yflory
88d5b4cc9c Add a 'New pad' button in the toolbar 2017-01-18 11:00:46 +01:00
yflory
a9063e0459 Reload all tabs when the user logs in or out 2017-01-16 14:08:44 +01:00
yflory
efed1f5efe Add handlers to login and logout buttons 2017-01-13 17:39:41 +01:00
yflory
767ba8b549 Select what we want to display in the toolbar 2017-01-13 17:14:44 +01:00
yflory
2afdc11327 Replace the username button by a dropdown menu 2017-01-13 17:11:12 +01:00
yflory
4adde0f0c0 Use the new dropdown for userlist and share 2017-01-13 15:05:00 +01:00
Brandon Istenes
b5acdb8cc0 Disable zooming on mobile 2017-01-12 18:50:39 +03:00
Brandon Istenes
40985f1811 Dubious height setting for iOS 2017-01-12 18:49:46 +03:00
Brandon Istenes
52d8d8db1d Get rid of margins on mobile 2017-01-12 18:49:46 +03:00
Brandon Istenes
cd0931c951 UI improvements for mobile browsers 2017-01-12 18:49:46 +03:00
yflory
605072cfbf Fix empty title with new documents 2017-01-12 15:15:10 +01:00
yflory
4963c77b61 Fix the title reset bug 2017-01-12 14:29:40 +01:00
Caleb James DeLisle
6c5e8d3118 Safari is really the best browser in the world, even though you have to stick a screwdriver in it to get it to start up 2017-01-11 18:00:41 +01:00
yflory
569ea21705 Replace the language selector by our custom dropdown menu 2017-01-11 10:59:09 +01:00
yflory
4278ac7637 Merge branch 'soon' into fileManager 2017-01-10 15:07:48 +01:00
ansuz
b39067d2a1 jshint compliance 2017-01-09 18:07:45 +01:00
ansuz
1c3f1a15cd make sure that /pad is resized after loading 2017-01-09 17:02:01 +01:00
yflory
5b08fed7fa Ability to add files from the drive toolbar
Fix CSS issues with the different toolbars
Translate the backup URL button alert
2017-01-09 16:29:16 +01:00
ansuz
a3cd100c94 apply yflory's safari patch 2017-01-09 11:46:51 +01:00
yflory
1e70af0c16 Use the same network for the apps and the file store 2017-01-06 13:52:53 +01:00
ansuz
b33661d9d5 don't toggle maximization state after setting 2017-01-05 15:21:17 +01:00
ansuz
f020fd5a75 remove /customize/pad.js from main apps 2016-12-28 15:12:22 +01:00
ansuz
e9376a66c2 apply 'cp' class for unified styles 2016-12-27 14:29:20 +01:00
yflory
1772cc93c8 Fix the taildoc bug 2016-12-22 11:02:12 +01:00
yflory
87abfff66b Fix Flash Of Unstyled Content (fouc) 2016-12-21 18:33:21 +01:00
yflory
4aed585574 Fix style issues in the toolbar 2016-12-20 14:40:00 +01:00
ansuz
8a7fda6341 Merge branch 'soon' into login 2016-12-16 18:10:35 +01:00
ansuz
a220742f68 fix reversed color settings 2016-12-16 15:31:22 +01:00
ansuz
308db7fa79 fix uncolored /pad/ content in IE 2016-12-16 15:25:06 +01:00
ansuz
f36d15d0db Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager 2016-12-12 18:03:00 +01:00
yflory
ee56f5608f Fix the infinite spinner bug with the file manager store 2016-12-08 18:52:36 +01:00
yflory
05fd6c1563 Fix the infinite spinner problem 2016-12-08 16:01:46 +01:00
ansuz
de0863e232 use new ot 2016-12-06 16:22:42 +01:00
ansuz
4cd9bd5534 strip listeners 2016-12-06 16:21:11 +01:00
ansuz
4c5cb79c20 Merge pull request #58 from xwiki-labs/replaceState
use replaceState if available
2016-11-07 15:08:49 +01:00
ansuz
c2770a7a74 set correct hash even if browser does not implement replaceState 2016-11-07 15:03:17 +01:00
ansuz
d009b7400c fall back to default title if one is not suggested 2016-11-07 12:29:57 +01:00
ansuz
303c65f2c3 use replaceState if available, instead of setting the hash 2016-11-07 11:20:30 +01:00
yflory
3de4e5709b Clean the code 2016-10-26 17:50:59 +02:00
yflory
ab1d3958ce Add a pencil icon when hovering the title 2016-10-26 17:49:16 +02:00
yflory
6d1e06cca3 Add notifications when a user joins or leaves the channel 2016-10-26 15:02:30 +02:00
yflory
54a63267cd Add a share button and merge the viewers and editors buttons 2016-10-25 18:34:23 +02:00
yflory
87d86384ac Fix broken elements in the new toolbar 2016-10-25 17:29:13 +02:00
yflory
6351d1856f Remove the top bar and move its content in the applications' toolbars 2016-10-25 15:22:35 +02:00