Commit Graph

314 Commits (d77b9c4ffdc53bf530a4ae319d348288c62ec464)

Author SHA1 Message Date
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
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
yflory 2ad0a65b71 Remove shortcuts that override browser actions 2017-04-13 16:43:07 +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 18469edf18 extend list item rendering to support gfm task lists 2017-03-30 12:02:31 +02:00
ansuz 055bc03092 strip carriage return 2017-03-30 12:00:46 +02:00
yflory 4ddf9b4e04 Improve whiteboard UI 2017-03-27 18:12:11 +02:00
yflory 71c59d7ae2 Remove unnecessary TODOs 2017-03-27 11:53:13 +02:00
yflory a8ffac5dcd Remove old code 2017-03-27 11:30:09 +02:00
yflory 5322eff607 Use the current values for the checkboxes in the print options dialog 2017-03-27 11:23:51 +02:00
ansuz 912215185f add uid to userdata for better notifications 2017-03-24 13:32:42 +01:00
yflory 26edb77cf0 Fix style and usability issues in slides 2017-03-20 15:20:42 +01:00
yflory cd77f50717 Fix transitions in slides, add swipe event handlers, and fix print in firefox 2017-03-20 12:50:46 +01:00
yflory e139295d7e Add transitions in present mode 2017-03-17 18:39:39 +01:00
yflory 45ac3e40a2 Copy print options to present mode 2017-03-17 18:03:00 +01:00
yflory a5f11d0d0d Uniform the slides rendering in present and print mode 2017-03-17 15:30:27 +01:00
yflory 15e9af77bb Remove the langauge selector from toolbar and add it in settings 2017-03-15 17:14:49 +01:00
yflory 13d7b3cadc Merge branch 'd' into staging 2017-03-15 16:01:29 +01:00
yflory a286599f93 Fix fast reconnect, and add support for reconnecting ws in polls 2017-03-15 16:01:00 +01:00
yflory fe5e33a0ee Fix loss of presentation position when updating slides 2017-03-14 15:42:42 +01:00
yflory ca9faa0056 Fix wrong translation keys 2017-03-13 11:52:48 +01:00
yflory f94db93897 Improve the slides layout in print mode 2017-03-10 16:46:36 +01:00
yflory 2392167996 Export slides as PDF 2017-03-09 19:05:44 +01:00
yflory 4bac8ea0c7 Draw all the slides at once to allow reference links (fix #77) 2017-03-09 12:41:23 +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
yflory cb88227e2b Autocomplete on key press in some dropdown menus 2017-03-06 12:20:23 +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
ansuz c884782d57 here are some changes 2017-03-02 17:08:50 +01:00
yflory 6b8d0c8bc7 Merge branch 'security2' of git.xwikisas.com:xwiki-labs/cryptpad into security2 2017-03-02 10:53:48 +01:00
yflory b32d698291 Fix issue with present mode in slide (readonly) 2017-03-02 10:53:45 +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
ansuz 86adfbf27d update cache-busting directive in all supported apps 2017-02-28 10:47:18 +01:00
yflory 2ad9debe58 Remove the placeholders in /code and /slide 2017-02-27 11:45:23 +01:00
yflory e15a6a347f Fix the forget pad button 2017-02-24 15:22:26 +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 d54262c8df Use the same disconnecter error translation key for all the apps 2017-02-09 15:34:14 +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 7e7d1f7a16 Display the error when opening a document with the wrong app 2017-02-06 12:43:56 +01:00
yflory 6f0d33dc1d Fix missing placeholder in the Slide app 2017-02-06 12:14:33 +01:00
yflory 7d6e15e465 Throw an error when trying to open a document with the wrong app 2017-02-06 12:06:39 +01:00
yflory fbbf8a2829 Replace initialState by a placeholder in slide and code 2017-02-03 18:45:30 +01:00
ansuz 72c4175b6f remove slide/oldmain.js 2017-02-02 14:44:43 +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 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 3338000018 Add Esc and Arrow icons in the slide's present mode 2017-01-19 12:49:40 +01:00
yflory efdae19f0c Update the lists in the code and slide toolbars to use the new dropdown 2017-01-19 12:14:14 +01:00
yflory 88d5b4cc9c Add a 'New pad' button in the toolbar 2017-01-18 11:00:46 +01:00