Commit graph

246 commits

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