Commit graph

398 commits

Author SHA1 Message Date
yflory
ecd8ef6418 improve thumbnails creation performances in code 2018-01-09 15:25:11 +01:00
yflory
77dcc1c705 Fix a race condition when switching language in the code app 2018-01-09 12:44:25 +01:00
yflory
f292407c6e Fix present mode in the code app 2017-12-15 15:40:52 +01:00
yflory
c269929319 Fix creation page not displayed in pad and slide 2017-12-11 17:17:06 +01:00
yflory
dcfccf88cd Merge branch 'creationpage' into staging 2017-12-11 12:21:21 +01:00
yflory
353b146644 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-11 12:21:17 +01:00
Caleb James DeLisle
617c4b6044 CSS refactorings and pad-is-not-pinned work 2017-12-07 19:00:13 +01:00
yflory
e96d54e655 Add a pad creation page 2017-12-07 18:51:50 +01:00
yflory
0080dd7624 Fix codemirror width with small screens in the code app 2017-12-07 17:28:05 +01:00
Caleb James DeLisle
c702a23c77 Initial work on the 'pad will expire' logic 2017-12-05 17:48:30 +01:00
yflory
74e59a513a Add the markdown toolbar to the slide and poll apps 2017-11-27 17:55:20 +01:00
yflory
644f6e9985 Use the bounce app to open links from inner 2017-11-27 14:44:44 +01:00
ansuz
812df7de6f Merge branch 'merge-staging' into staging 2017-11-27 12:18:34 +01:00
yflory
b0f553e9ea Add a markdown toolbar to help with the markdown syntax 2017-11-27 12:17:35 +01:00
ansuz
ee6c2097f5 resolve merge conflicts 2017-11-23 16:56:49 +01:00
yflory
80803ad076 Fix empty codemirror after thumbnail creation 2017-11-20 14:17:29 +01:00
yflory
fd258fc277 Fix preview button tooltip in code 2017-11-17 18:19:35 +01:00
yflory
7cfe64fc5b Remove cryptpad-common dependency for some inner apps 2017-11-13 18:09:19 +01:00
yflory
30c8c253dd Remove util and hash from common 2017-11-13 16:32:40 +01:00
Caleb James DeLisle
75130150d5 Refactored out TextPatcher and JsonOT and replaced with new ChainPad 2017-11-09 15:36:49 +01:00
yflory
9060464f37 Create thumbnails only when the tab is not focused 2017-11-06 13:36:54 +01:00
yflory
8de9a596f1 Fix cursor in thumbnails 2017-11-02 19:11:27 +01:00
yflory
6f020b67ca Add thumbnails to framework apps 2017-10-26 12:31:16 +02:00
yflory
f4adbd980e Thumbnails for the code app 2017-10-24 18:49:58 +02:00
yflory
f43606f71d Present mode to display only the parsed markdown in code 2017-10-19 14:39:38 +02:00
Caleb James DeLisle
ae87320408 Preview pane cannot be resized after it has been hidden and then shown again 2017-10-05 16:12:24 +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
fa6938baa8 1. Migrated /slide/ to use framework
2. Fixed CSS not being applied on /slide/
3. Minor changes to /code/ to reuse code which is also used on /slide/
2017-10-02 17:34:37 +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
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
ansuz
db4c3e7e2c Merge branch 'master' into staging 2017-09-20 12:07:01 +02:00
ansuz
b5b84f540e fix preview mode class 2017-09-20 12:02:46 +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
yflory
0a656ca8d6 Fix the splitter in code and add it back 2017-09-18 12:09:18 +02:00
Caleb James DeLisle
5f0383ae99 update version of sframe-boot because it was changed 2017-09-14 10:52:25 +02:00
yflory
47cfa0cf45 Focus the editable content when opening a codemirror pad 2017-09-13 18:09:55 +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
55fe882f64 Fix readonly mode in code 2017-09-11 12:23:04 +02:00
yflory
bd422178c4 Hide the filepicker button in readonly mode 2017-09-11 11:59:09 +02:00
yflory
f2aaaa9751 Move slide to secure iframe 2017-09-07 18:56:58 +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
yflory
204e45dfae Enable templates in pad 2017-09-05 11:57:44 +02:00
yflory
d2787e3eff Make code2 the default code app 2017-09-05 11:36:02 +02:00
yflory
0d008aaa2e Add indent settings to code2 2017-08-30 17:57:10 +02:00
ansuz
595fa4c2e4 Merge branch 'soon' 2017-08-29 12:00:16 +02:00
ansuz
a99eb9365e correctly set indentation preferences when changing languages 2017-08-24 17:31:04 +02:00
Caleb James DeLisle
b081603455 Update requirejs 2017-08-21 18:08:37 +02:00
yflory
e7ef1e1c2b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-16 12:35:13 +02:00
yflory
7c49ca6e3f Fix initial text size in code 2017-08-16 12:34:56 +02:00
ansuz
2a8abc2699 comment out splitter code 2017-08-16 12:15:08 +02:00
ansuz
66cacf08da allow users to write with tabs instead of spaces 2017-08-11 15:21:26 +02:00
Pierre Bondoerffer
c8d7675ede
remove z-index on splitter in code 2017-08-11 12:56:42 +02:00
ansuz
1c526feffb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-10 18:06:58 +02:00
ansuz
fbb880f277 implement customizable indentation widths 2017-08-10 18:06:47 +02:00
Pierre Bondoerffer
9dce40f3af
only add the splitter once 2017-08-10 14:34:48 +02:00
Pierre Bondoerffer
4026994310
make splitter work when scrolling 2017-08-10 14:25:31 +02:00
Pierre Bondoerffer
d47e26efd5
add margin in code 2017-08-09 11:17:14 +02:00
Pierre Bondoerffer
85e383d5c5
add invisible splitter 2017-08-08 14:36:04 +02:00
Pierre Bondoerffer
d15280c6ce
prevent pdfs from being huge 2017-08-08 11:52:16 +02:00
Pierre Bondoerffer
c427f375dd
add bootstrap css to /code for image uploader 2017-08-08 11:48:17 +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
yflory
c33d2a2db0 New tooltips 2017-07-19 17:14:10 +02:00
yflory
5d5f936682 Hide the upload table in code 2017-07-11 14:38: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
9f6ecea5d9 fix nacl reference error in media tag 2017-07-05 11:57:53 +02:00
ansuz
ac8da0d52d load codemirror in the correct context. fix selection events 2017-07-04 12:37:24 +02:00
ansuz
f09ae9b19c jshint compliance 2017-07-03 11:51:47 +02:00
yflory
5694505719 Fix syntax highlighting 2017-07-03 11:16:28 +02:00
yflory
b9320e6005 Toolbar improvements 2017-06-30 11:42:54 +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
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
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
19cb920a7c Don't redraw a media-tag everytime the content has changed 2017-06-13 17:21:22 +02:00
yflory
d1f4617419 Fix a race condition causing the preview part to be empty 2017-06-12 14:37:12 +02:00
yflory
5d6a0dcc1b Fix width transition when dragging preview 2017-06-12 12:27:24 +02:00
ansuz
ec9a4dec5e Merge branch 'soon' into staging 2017-06-05 11:43:26 +02:00
ansuz
77d4ffba86 animate preview mode sidebar 2017-06-02 17:39:45 +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
ansuz
cf658c1b3a backport live changes 2017-05-26 12:41:30 +02:00
ansuz
a04f179d8b hide preview mode on phones 2017-05-24 19:00:14 +02:00
ansuz
dc2b0ae6b4 jshint compliance 2017-05-24 18:45:48 +02:00
ansuz
b32c329269 remember whether you were using preview mode for a pad 2017-05-24 18:41:19 +02:00
ansuz
a5ffd278a7 write styles for code in .less 2017-05-24 17:27:03 +02:00
ansuz
3803f6a20f only render preview if preview container is visible 2017-05-24 17:25:33 +02:00
ansuz
617e027f12 catch markdown preview errors 2017-05-24 15:50:35 +02:00
ansuz
c5bb830757 don't preview if hightlight mode is not markdown 2017-05-24 14:21:31 +02:00
ansuz
378bf2aa94 yflory's word wrap fix 2017-05-24 11:27:31 +02:00
ansuz
dc80b6b11f throttle markdown preview 2017-05-24 11:27:16 +02:00
ansuz
97cc4a6d54 add styling for tables in markdown preview 2017-05-23 18:03:35 +02:00
ansuz
6faca87e73 set preview content in read only mode 2017-05-23 15:54:04 +02:00
ansuz
0a54f0cf2d better alignment of preview and code entry 2017-05-19 16:21:26 +02:00
yflory
620f4dc512 Add translations for the markdown preview button title 2017-05-18 15:05:37 +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
c00158d23a Move code to common-history 2017-05-10 13:39:14 +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
63710e1ccc Move the code related to the title in another file 2017-05-09 14:32:41 +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
yflory
6847906ac9 Move the userlist code in a separate file 2017-05-05 15:47:46 +02:00
ansuz
a0c420af8e jshint compliance 2017-05-04 16:37:25 +02:00
yflory
a190c99426 Toolbar refactoring 2017-05-04 16:08:12 +02:00
yflory
bf7c7c45d0 Add the storage limit warning in the toolbar 2017-04-27 18:46:46 +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
yflory
43c045721c Get the channel history 2017-04-14 18:36:36 +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
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
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
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
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
868161a8a8 fix undefined reference in code 2017-03-02 17:59:59 +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
2851ceb95a Merge branch 'soon' into staging 2017-02-13 11:59:49 +01:00
ansuz
a995df25f6 disable new OT in pad and code app 2017-02-09 17:20:13 +01:00