Commit graph

318 commits

Author SHA1 Message Date
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