infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity
5,040 Commits
1 Branch
3 Tags
274 MiB
Commit Graph

368 Commits (9b37d58f9575a74160d6a560fac8d79cf9026f2d)

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