Commit graph

271 commits

Author SHA1 Message Date
ansuz
0a99478d9f catch diffdom errors and plow through 2017-09-28 11:50:35 +02:00
yflory
cdeac00633 Merge branch 'staging' into newdrive 2017-09-25 17:35:06 +02:00
yflory
b871faffc9 Enable tags in code and slide 2017-09-25 14:47:31 +02:00
yflory
456370b1aa Base for Drive in sandboxed iframe 2017-09-21 17:59:26 +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
483160a96a Fix tab notifications in code and slides 2017-09-18 14:31:58 +02:00
yflory
1131ef0172 Fix language selection in sandboxed iframes 2017-09-18 14:26:54 +02:00
Caleb James DeLisle
5f0383ae99 update version of sframe-boot because it was changed 2017-09-14 10:52:25 +02:00
yflory
fa64adbbe5 Hide visible elements while loading the slide app 2017-09-13 17:22:43 +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
671c893e8a Duplicating code like a moron, this should hopefully get fixed later. 2017-09-11 17:52:34 +02:00
yflory
9271b0c1a8 Try to fix half-codemirror bug 2017-09-11 14:42:43 +02:00
yflory
bd422178c4 Hide the filepicker button in readonly mode 2017-09-11 11:59:09 +02:00
yflory
642511dc3b Disable exiting present mode when in embed mode 2017-09-11 11:38:40 +02:00
yflory
514bff7065 Add slide number in the title in slide2 2017-09-08 18:21:11 +02:00
yflory
05793c220c Fix secure iframes on Edge 2017-09-08 15:55:01 +02:00
yflory
f2aaaa9751 Move slide to secure iframe 2017-09-07 18:56:58 +02:00
yflory
8b2733e2da Fix typo 2017-09-06 11:37:19 +02:00
yflory
e85b34f127 Add embed options in the secure pad hashes 2017-09-05 18:38:51 +02:00
Caleb James DeLisle
b081603455 Update requirejs 2017-08-21 18:08:37 +02:00
yflory
7c49ca6e3f Fix initial text size in code 2017-08-16 12:34:56 +02:00
Pierre Bondoerffer
90075cd48e
media-tag to less file 2017-08-08 12:01:39 +02:00
Pierre Bondoerffer
f585ddccdf
fix image sizes in /slide/ 2017-08-08 11:44:01 +02:00
ansuz
66d81429bd integrate file embed into code editor 2017-08-03 11:47:54 +02:00
ansuz
fe826133b3 make some markdown styles reusable 2017-08-02 11:03:06 +02:00
ansuz
1c238100c8 don't throw alerts in the middle of someone's presentation 2017-07-31 15:07:34 +02:00
yflory
a80b00a765 Move the file picker in common 2017-07-20 18:32:03 +02:00
yflory
a5a73ce326 Fix print button in slide 2017-07-20 14:41:51 +02:00
yflory
3bd5f01e53 Fix slide ratio in preview mode 2017-07-20 09:55:18 +02:00
ansuz
7a225af11e fix some minor slide navigation bugs 2017-07-13 10:57:27 +02:00
yflory
d09f5b70c7 Fix slides CSS 2017-07-11 17:39:26 +02:00
yflory
e732284845 Lint 2017-07-11 12:50:16 +02:00
yflory
8f5a244999 Replace mediatag markdown syntax by html. Enable file upload in /code. 2017-07-11 11:56:06 +02:00
ansuz
29c6ed6e9b hide slide arrows when there are no more slides in that direction 2017-07-10 09:51:15 +02:00
ansuz
9f6ecea5d9 fix nacl reference error in media tag 2017-07-05 11:57:53 +02:00
ansuz
9c1eaf9c1a lint compliance 2017-07-04 15:48:20 +02:00
ansuz
42375190e6 style buttons for long titles 2017-07-04 14:24:07 +02:00
ansuz
c27c140130 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-04 12:37:50 +02:00
ansuz
ac8da0d52d load codemirror in the correct context. fix selection events 2017-07-04 12:37:24 +02:00
yflory
789274fd4f Fix font-size in slides 2017-07-04 12:32:14 +02:00
ansuz
7377d39b39 hide print button 2017-07-04 10:35:55 +02:00
ansuz
43b877ad27 fix styling on media tag download button 2017-07-04 10:28:50 +02:00
ansuz
efedfe0667 show preview pane by default in /slide/ 2017-07-03 14:53:50 +02:00
yflory
81c8949aee Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-03 14:43:17 +02:00
yflory
70c9f3df75 Fix avatar size 2017-07-03 12:13:37 +02:00
ansuz
f09ae9b19c jshint compliance 2017-07-03 11:51:47 +02:00
yflory
9b131dc49c Fix CSS in the slide app 2017-07-03 11:34:30 +02:00
yflory
5694505719 Fix syntax highlighting 2017-07-03 11:16:28 +02:00
yflory
4ab82710ab Remove the background color from the text-color button in the slide app 2017-06-30 11:55:29 +02:00
yflory
26193aeaa7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-30 11:42:59 +02:00
yflory
b9320e6005 Toolbar improvements 2017-06-30 11:42:54 +02:00
ansuz
ecff05425f feedback for slide printing 2017-06-30 11:21:19 +02:00
ansuz
7a5c5ce0a3 load scripts asynchronously 2017-06-29 12:17:08 +02:00
ansuz
fca1ef4d36 hide unstyled content until the loading screen is displayed 2017-06-29 10:49:35 +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
ansuz
ffcbde4325 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-26 14:32:42 +02:00
ansuz
48ece55ed5 style fixes, and dynamic less compilation 2017-06-26 14:32:37 +02:00
yflory
38f568635d Fix duplicate media-tag in slides when adding or removing a slide 2017-06-26 14:08: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
92b6e60573 Small improvements for the new toolbar 2017-06-22 11:13:53 +02:00
yflory
dbfad9d227 Lint 2017-06-19 16:02:27 +02:00
yflory
d3b9ac2511 Update the preview and present content on Ready in slides 2017-06-19 15:58:10 +02:00
yflory
54adb680e7 Hide the slide number in the title outside of present mode 2017-06-19 15:26:27 +02:00
ansuz
06ca70d11e lint compliance 2017-06-19 14:05:40 +02:00
yflory
928dadcf77 Fix toolbar dropdown menus not visible in slide 2017-06-19 10:37:01 +02:00
yflory
1df11f2813 Update the font-size when entering/leaving present mode 2017-06-19 10:26:14 +02:00
yflory
66d8c0ed11 Add a preview mode to the slide app 2017-06-16 15:11:32 +02:00
yflory
a5924cb803 Make sure the initial title is set in the userDoc when creating a new pad 2017-06-15 18:50:39 +02:00
yflory
66b076111e Add an upload button to the slide's file picker 2017-06-15 12:32:44 +02:00
yflory
f3f1cf9e6d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-15 11:05:07 +02:00
yflory
a237eec41e Add a file picker in the slide app 2017-06-15 11:04:58 +02:00
ansuz
20874c76f1 prevent code blocks from overflowing slides 2017-06-14 18:56:44 +02:00
yflory
497ddeee6d Upload files with drag&drop in the drive 2017-06-14 12:47:37 +02:00
yflory
494b44e2b1 fix lint errors 2017-06-14 10:04:54 +02:00
yflory
19cb920a7c Don't redraw a media-tag everytime the content has changed 2017-06-13 17:21:22 +02:00
yflory
f9c26645cf Upload images using the slide app 2017-06-13 16:15:04 +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
0bd4caeb7e Add the task list code to the markdown renderer 2017-05-18 14:57:04 +02:00
yflory
56bcdff890 Add a preview of the markdown content in the code editor 2017-05-18 12:16:26 +02:00
yflory
5d0535966c Center vertically slides in present mode and checkbox to disable transitions 2017-05-11 10:58:33 +02:00
yflory
1e4fc5a979 lint 2017-05-10 14:56:50 +02:00
yflory
c00158d23a Move code to common-history 2017-05-10 13:39:14 +02:00
yflory
a6c49cd65c Fix undefined title in slides present mode 2017-05-10 10:49:59 +02:00
yflory
ff16084719 Fix lint errors 2017-05-09 18:10:02 +02:00
yflory
50c8a859e6 Move the CodeMirror cursor code to common-codemirror 2017-05-09 17:57:27 +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
1d3b8188b3 Add mobile support in the slide app 2017-05-02 14:17:17 +02:00
ansuz
841c9ee9de don't close popup dialog when hitting enter if textarea has focus 2017-04-28 16:11:22 +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