6b9ffe8dd1
Make thumbnails more secure
2017-11-07 14:51:53 +01:00
454fc8498c
remove old* apps
2017-11-07 13:50:07 +01:00
e07bb0f7b3
roll back to old transform function, except in pad
2017-11-06 17:18:10 +01:00
a592317e35
lint compliance
2017-11-06 15:49:40 +01:00
fef97ed60e
Fix an creating duplicates mediatags in markdown preview
2017-11-06 15:47:18 +01:00
9060464f37
Create thumbnails only when the tab is not focused
2017-11-06 13:36:54 +01:00
a37e6c7979
lint compliance
2017-11-03 18:39:06 +01:00
2a3a5c4342
Ability to disable thumbnails
2017-11-03 18:38:27 +01:00
5dff9a32b6
Fix comments order in polls
2017-11-03 18:38:04 +01:00
1871749b6f
Fix -1 viewer in the userlist when disconnected
2017-11-03 15:14:23 +01:00
cf3024ef5b
Ability to display an error in the toolbar state
2017-11-03 14:30:59 +01:00
8de9a596f1
Fix cursor in thumbnails
2017-11-02 19:11:27 +01:00
fd7bb3aadb
Make sure the infinite spinner modal is not displayed multiple times
2017-11-02 17:47:19 +01:00
3ebb5ca493
Fix issue in diffMarked creating text nodes for each character
2017-10-31 18:19:30 +01:00
5438970ab4
typo
2017-10-31 11:30:13 +01:00
e0f7df80b3
Fix avatar upload and use less2 everywhere in profile
2017-10-31 11:11:29 +01:00
7f9b21405b
Add missing files for profile
2017-10-31 10:27:41 +01:00
e99836bae2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-30 18:49:43 +01:00
4250688856
Migrate profile to use sframe
2017-10-30 18:49:28 +01:00
744809101c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-30 16:24:55 +01:00
867df1db56
fix '+New' button in drive toolbar
2017-10-30 16:24:41 +01:00
907e2cb517
lint compliance
2017-10-30 15:13:27 +01:00
abc511a56e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-30 15:12:29 +01:00
68accaf653
Todo in sframe with less2
2017-10-30 15:12:15 +01:00
11b8b380fd
Merge branch 'staging' into evilham
2017-10-30 14:50:11 +01:00
04f26ff886
Merge branch 'staging' of github.com:evilham/cryptpad into evilham
2017-10-30 14:41:21 +01:00
0a14c715ad
add test for support of invite urls
2017-10-30 14:40:43 +01:00
5dcfbd07ab
Merge branch 'theming-improvement' into staging
2017-10-27 18:32:08 +02:00
4933aafbc8
Added default values to avoid breaking existing themes.
2017-10-27 18:31:52 +02:00
4c0049ad55
don't log presence of other users as 'joins' when you have first joined
2017-10-27 14:20:31 +02:00
325f685f3e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-27 14:14:25 +02:00
1cbf1aec92
prevent undefined access in non-sframe apps
2017-10-27 14:14:19 +02:00
ac1b67ad67
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-27 13:31:54 +02:00
1245b4d244
Enable thumbnails in poll and whiteboard
2017-10-27 13:31:41 +02:00
d644054e3f
lint compliance
2017-10-27 11:13:26 +02:00
ed253e6c75
Merge branch 'staging' into evilham
2017-10-27 11:03:16 +02:00
df1a700cb2
disable thumbnail test. add test for flat dom
2017-10-27 11:01:22 +02:00
02cd7e5b58
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-27 10:44:53 +02:00
69890ebd8f
prototype alternate datastructure for trees in listmap
2017-10-27 10:43:44 +02:00
23c305f71f
implement removeItem so localForage doesn't complain
2017-10-27 10:37:44 +02:00
735f0a7e30
Merge branch 'theming-improvement' into staging
2017-10-26 20:44:56 +02:00
83da9cf752
Moved colours to colortheme.less to enable theming
2017-10-26 20:29:14 +02:00
8251247da2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-26 12:31:33 +02:00
6f020b67ca
Add thumbnails to framework apps
2017-10-26 12:31:16 +02:00
98c66ef8f6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-25 13:04:08 +02:00
bf817f20ee
Fix file upload in code and slide
2017-10-25 12:31:22 +02:00
f031af4e9d
fix broken media-tags in contacts
2017-10-25 10:50:17 +02:00
24572a40d2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-24 18:50:19 +02:00
f4adbd980e
Thumbnails for the code app
2017-10-24 18:49:58 +02:00
ba97aa7ad2
allow file upload handler to create thumbnails for whiteboard
2017-10-24 18:09:38 +02:00
6157c57a4b
disable color palette when interface is not editable
2017-10-24 17:59:19 +02:00
8359902f6a
fix typo in poll
2017-10-24 17:42:08 +02:00
69f9a7ebf3
make userlist change notifications configurable
2017-10-24 17:29:58 +02:00
027b9fa383
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-24 18:03:31 +03:00
aa37997aa3
Enable JSON-OT again because it is working now that the arguments are passed in the right order <facepalm>
2017-10-24 18:02:03 +03:00
bac608adfe
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-24 16:56:13 +02:00
dc90811090
only call onReady once in sframe-listmap
2017-10-24 16:56:08 +02:00
bac10472f3
lint compliance
2017-10-24 14:32:47 +02:00
39b4cb9226
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-24 14:31:56 +02:00
18b5b20d27
Add thumbnails for PDFs
2017-10-24 14:31:42 +02:00
aee51f1317
lint compliance
2017-10-24 14:02:29 +02:00
447b0a74ee
handle errors for videos when uploading
2017-10-24 13:45:27 +02:00
30a69fae13
Add thumbnails for videos
2017-10-24 12:26:04 +02:00
21f8ae7570
Keep the correct ratio for image thumbnails
2017-10-24 11:45:07 +02:00
2dd3c42fd5
Fix handlers registered again on reconnect in drive and poll
2017-10-24 10:42:08 +02:00
a0bcb901d3
Add titles in poll when options or usernames are overflowing
2017-10-23 15:16:51 +02:00
74985fd0f2
Use text for the addUser button in polls
2017-10-23 15:12:27 +02:00
6db5a34323
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-23 14:53:42 +02:00
c17fc2efe7
improve option order in poll
2017-10-23 14:53:31 +02:00
2be22867c1
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-23 14:39:31 +02:00
13718d0263
Fix recent pads in chrome
2017-10-23 14:38:38 +02:00
2e5fdf709a
Merge branch 'soon' into staging
2017-10-23 14:29:01 +02:00
de8339fea7
hide alertify when you are in presentation mode
2017-10-23 14:25:25 +02:00
9b02b36724
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-23 14:22:54 +03:00
d7e9498143
Fix and then disable the new OT
2017-10-23 14:22:33 +03:00
288e141c1f
add missing sframe method
2017-10-23 12:33:50 +02:00
c1d05a00ba
Improve media-tag export in pad to work with existing CSP
2017-10-23 10:55:40 +02:00
3e4faf1be1
Add new state messages in the toolbar
2017-10-20 18:12:47 +02:00
6d080bcb45
Ability to export mediatag images in pad
2017-10-20 18:10:08 +02:00
a0dd867f33
Fix pending state not removed after friend invite rejected
2017-10-20 18:09:09 +02:00
c25be21138
Fix the upgrade button in the drive
2017-10-20 10:16:01 +02:00
cc6b2192e4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-20 10:26:27 +03:00
a3c7aa67d8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-19 19:07:00 +02:00
094856a511
Fix renaming pad with multiple dots in the name in drive
2017-10-19 18:30:55 +02:00
bf832ba784
fix comment overflow
2017-10-19 17:30:40 +02:00
7bc2f81852
Fix pinned column not always stored in polls
2017-10-19 16:01:56 +02:00
88e7f9a218
Add last access and creation times in the properties window in drive
2017-10-19 15:05:55 +02:00
22e3baed4b
Fix sort issues in drive
2017-10-19 15:00:29 +02:00
f43606f71d
Present mode to display only the parsed markdown in code
2017-10-19 14:39:38 +02:00
515214aed1
Use present mode in embed code
2017-10-19 11:59:07 +02:00
201c974df6
Merge branch 'thumbnails' into staging
2017-10-19 11:43:43 +02:00
7b8490ad20
Use less2 in contacts
2017-10-19 09:58:28 +02:00
dd63cd13d7
Fix profile page title
2017-10-18 16:59:20 +02:00
81d0b3272d
Fix multiple infinite-spinner errors piling up on top of eachother
2017-10-18 14:49:50 +03:00
9e4c48f537
lint errors
2017-10-18 12:25:13 +03:00
a149152f11
Merge branch 'staging' into framework
2017-10-18 11:42:31 +03:00
4197b7b968
Fix missing icon in list mode for files with thumbnail
2017-10-17 17:23:31 +02:00
d941b1098a
Remove selection in whiteboard when uploading to the drive
2017-10-17 17:21:15 +02:00
4116d08dd1
Display thumbnails in the drive and then file picker
2017-10-17 17:17:31 +02:00
6920129126
Embed images from the drive in whiteboard
2017-10-17 12:19:57 +02:00
867b971c33
Compressed images: PNG recompressed pixel identical, JPGs recompressed visually identically. Saving about 9.8%≈580kB overall, to speed up initial and repeating client connections.
2017-10-14 00:31:31 +02:00
2fd120100a
Merge branch 'wb' into staging
2017-10-13 16:58:59 +02:00
15337603bb
Merge branch 'staging' into framework
2017-10-13 13:41:24 +03:00
a6b34491fc
freeze the editor when reconnecting
2017-10-13 13:40:51 +03:00
854c1e94a4
make infinite spinner error message go away if ChainPad settles after it has been popped
2017-10-13 13:39:49 +03:00
a859ab081a
Fix fouc in drive
2017-10-12 18:21:34 +02:00
7b6432f134
Lint
2017-10-12 18:20:33 +02:00
6926d42292
Autoload template picker to make it faster to appear when used
2017-10-12 18:18:01 +02:00
1c8e1a36e8
Add file type in the pad attributes for existing files
2017-10-12 17:43:49 +02:00
b86f8e3f26
Fix uloaded files not moved to the correct folder in drive
2017-10-12 17:33:22 +02:00
88d0a2b8a6
Merge branch 'master' into staging
2017-10-12 17:08:34 +02:00
5ed60a0ad7
Fix image ratio in slides
2017-10-12 16:45:51 +02:00
753e2d797e
Merge branch 'staging' into framework
2017-10-12 17:07:10 +03:00
62bc72847f
Add an error message when trying to tag a deleted pad
2017-10-12 15:06:29 +02:00
c773b5d076
Remove a brittle test which can make a pad inaccessible, switch from transformFunction to (new) patchTransformer and add another DOM.normalize() which is needed
2017-10-12 15:42:09 +03:00
69dd3a60ab
Hide template and fileupload buttons for anonymous users
2017-10-12 14:32:12 +02:00
8e1f15e88d
Get title suggestion based on poll's description
2017-10-12 14:12:26 +02:00
e317265594
Merge branch 'master' of github.com:xwiki-labs/cryptpad
2017-10-12 14:09:55 +02:00
0d912402e5
patch for bug in Firefox ESR
2017-10-12 14:09:48 +02:00
91381ca77d
Fix lint errors
2017-10-12 12:20:27 +02:00
50090a3af6
Add placeholders for the comment form in poll
2017-10-12 12:18:32 +02:00
95ad25973e
Ability to delete a stronger pad from readonly mode
2017-10-12 11:41:53 +02:00
b28c1537e8
Fix history in readonly mode
2017-10-12 10:59:23 +02:00
620ba4ed5d
Fix fouc in drive
2017-10-11 17:15:56 +02:00
b31bbebf7b
Buttons are missing in whiteboard when zoomed in
2017-10-11 17:11:38 +02:00
a5a08176fb
Merge branch 'master' into staging
2017-10-11 16:58:45 +02:00
54b5a2d654
Fix style issues in poll (Chrome)
2017-10-11 16:01:26 +02:00
86767184da
Fix style issues in poll for Edge
2017-10-11 15:38:23 +02:00
00e8d32d60
Fix column position in poll for Chrome
2017-10-11 15:37:47 +02:00
b110e1b8da
Fix style issues in poll for Edge
2017-10-11 15:37:11 +02:00
ecb537ac7f
Move code to render.js in poll
2017-10-10 18:19:49 +02:00
75b3ff9c60
CSS issue in polls
2017-10-10 11:35:24 +02:00
c46280d032
Fix style issues for Edge
2017-10-10 11:32:52 +02:00
128c9c2f4e
Merge branch 'staging' of github.com:CatalinScr/cryptpad into catalin
2017-10-09 17:20:23 +02:00
f0bdc3b26f
second try
2017-10-09 16:57:30 +02:00
d50a692986
add note about tags to prompt
2017-10-09 16:51:57 +02:00
c8928a0811
Switch the transform function and also stop calling textPatcher without the metadata
2017-10-09 17:07:26 +03:00
035150614d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-09 15:38:08 +02:00
484e216054
Fix hashtag button in the toolbar
2017-10-09 15:37:37 +02:00
4c19375f4d
Avoid missing characters in poll's inputs
2017-10-09 15:11:02 +02:00
a12239405b
fix toolbar 'home link' to visit home page from drive
2017-10-09 15:10:38 +02:00
dd141b5c9f
Disable comments when a poll is not published
2017-10-09 14:08:54 +02:00
36aee2d174
lets try normalizing the dom before applying a patch
2017-10-09 14:13:11 +03:00
828a685ba8
Fix broken browser fight logging
2017-10-09 14:12:55 +03:00
aa744567ed
Fix thumbnails in sframe apps
2017-10-09 11:52:34 +02:00
5e7bf0cfb8
Embed an image in whiteboard
2017-10-09 10:32:24 +02:00
f0eb58ee95
Merge branch 'staging' into framework
2017-10-06 14:50:35 +03:00
9509d538e0
Cursor not being updated at the right times before applying a patch.
2017-10-06 14:49:52 +03:00
888028c542
Lint
2017-10-05 18:13:28 +02:00
e5a54b5978
Fix folder highlighting with drag&drop in the drive
2017-10-05 18:12:23 +02:00
1c7c37c121
Add the file class to pads in 'template' and 'recent' categories in the drive
2017-10-05 18:07:05 +02:00
ab3648a30a
Merge branch 'newpoll' into staging
2017-10-05 17:56:17 +02:00
1c4f1c785d
Improve stability and UI in poll and its comments
2017-10-05 17:54:07 +02:00
7559bc062e
lint compliance
2017-10-05 17:06:02 +02:00
503111d26a
use recompiled media-tag
2017-10-05 17:00:47 +02:00
427afc3954
override modified file name in pdfjs
2017-10-05 16:59:55 +02:00
d85db64939
add tags from drive
2017-10-05 16:58:34 +02:00
0aecfad854
Occasionally the language selector only says "Mode" rather than the language
2017-10-05 16:12:49 +03:00
ae87320408
Preview pane cannot be resized after it has been hidden and then shown again
2017-10-05 16:12:24 +03:00
1f35798194
stop event propagation from tag prompt
2017-10-05 15:08:34 +02:00
c936e5ae73
make context menu open correct app on correct port
2017-10-05 11:14:47 +02:00
d9e97b86e6
Merge branch 'staging' into framework
2017-10-05 12:14:37 +03:00
383c2f54cb
1. Add a class cp-hidden-if-readonly which is display:none if the pad is in read-only mode. 2. Don't show color pickers or options when in read-only on presentation.
2017-10-05 12:14:03 +03:00
deed04108b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-05 10:22:07 +02:00
a90c078e84
correct reference to undefined
2017-10-05 10:21:59 +02:00
26dfc65c25
Comments in polls
2017-10-04 19:06:16 +02:00
5304dc319f
Enable redirection to the previous page after registration
2017-10-04 15:55:57 +02:00
ceb8ff18bd
Fix ghost icon in drive
2017-10-04 15:52:09 +02:00
846b1a9fb3
Improve description UI in poll. Enable tags and mediatag
2017-10-04 15:39:18 +02:00
68bda92291
Use codemirror for description in poll
2017-10-03 19:04:29 +02:00
b8ce149db6
add hint about tag usage
2017-10-03 18:36:34 +02:00
f15ec4efe9
add tagging to whiteboard and file apps
2017-10-03 18:05:28 +02:00
f90742603e
style fixes
2017-10-03 17:53:28 +02:00
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
707d3b3e94
Ability to export polls as csv
2017-10-03 16:50:59 +02:00
5cf86bf74a
Update UI in poll and remove old code
2017-10-03 14:11:11 +02:00
09c0a473e2
fix function signatures
2017-10-03 14:08:40 +02:00
3337689630
Wrong translation key in toolbar
2017-10-03 14:04:07 +02:00
94d2f4472b
Stop using presentSuccess because it is hidden behind the modal in slide
2017-10-03 12:10:16 +03:00
126742a1c3
Fix bugs in sframe poll and update UI
2017-10-02 19:02:31 +02:00
351b95d6a9
resolve merge conflicts
2017-10-02 18:59:47 +02:00
6c7b135f91
lint compliance
2017-10-02 18:58:18 +02:00
94c392b79f
secure messaging
2017-10-02 18:57:17 +02:00
53f65f6a87
Merge branch 'staging' into framework
2017-10-02 17:46:27 +03:00
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
1e5bc5da14
onReady should only be called once, onContentUpdate should be able to throw and there should be a generic normalizer
2017-10-02 15:09:25 +03:00
7230c780a1
Get rid of last usages of cryptpad-common in pad/inner
2017-10-02 15:06:01 +03:00
12e82e80ec
When changing the title of a presentation, the title in the bottom of the slide should also change
2017-10-02 15:04:44 +03:00
0a99478d9f
catch diffdom errors and plow through
2017-09-28 11:50:35 +02:00
0f9e93e1de
make tests pass again
2017-09-28 10:36:40 +02:00
48c49e5a75
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-28 10:23:59 +02:00
19e58cec94
prevent typeError
2017-09-28 10:23:48 +02:00
66da349ee4
Sandboxed Poll app with less2
2017-09-27 18:52:04 +02:00
f95acda758
Minor refactoring of /pad/ ; moved /*/main.js into a common file ; framework'd /code/
2017-09-27 16:53:16 +02:00
6dbc02e81a
Merge branch 'staging' into framework
2017-09-27 12:01:18 +02:00
1c791b5b51
Fix framework by removing some async and also fix media tags
2017-09-27 11:58:14 +02:00
90d00c10b1
Make metadata-manager a bit more robust
2017-09-27 11:56:25 +02:00
9b2251005c
Merge branch 'staging' into newpoll
2017-09-27 10:36:33 +02:00
8de1852ab9
Lint compliance
2017-09-27 10:36:16 +02:00
2c10f9b07b
Merge branch 'staging' into newpoll
2017-09-27 10:32:03 +02:00
e02a779c14
Use secure drive as default drive
2017-09-27 10:31:35 +02:00
b4de31c827
Merge branch 'newdrive' into staging
2017-09-27 10:28:16 +02:00
c1275b5671
Prepare secure poll
2017-09-27 10:28:10 +02:00
4c394e0031
Fix UI issue in poll
2017-09-27 10:15:23 +02:00
342b6012f7
manual merge of staging into framework
2017-09-26 17:11:45 +02:00
cf6030ab8b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-26 15:58:33 +02:00
e62c5e1d07
Add some debugging lines to help synthesize error cases
2017-09-26 15:58:25 +02:00
9571b3c018
persist whiteboard content across sessions
2017-09-26 15:16:17 +02:00
748172585e
update for modified id
2017-09-26 15:00:25 +02:00
4cd7d8eda4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-26 14:35:02 +02:00
345bfc1cea
Remove migration for pad attributes
2017-09-26 14:36:49 +02:00
52be5501d6
remove invalid test
2017-09-26 14:34:54 +02:00
69014e5fde
Fix mediatags in pad not cached
2017-09-26 11:21:36 +02:00
b3e066eaca
show loading screen tips during loading screen
2017-09-26 10:59:25 +02:00
77fe6a9bba
small bug fixes
2017-09-26 10:23:35 +02:00
1b01855dd2
Merge branch 'staging' into framework
2017-09-25 18:11:57 +02:00
1fd7a6e2b3
Mistake in mkEvent which makes all events only work once
2017-09-25 18:03:31 +02:00
368a6b2406
manual merge, still wip
2017-09-25 17:35:25 +02:00
cdeac00633
Merge branch 'staging' into newdrive
2017-09-25 17:35:06 +02:00
a8eecee590
Fix access to undefined variable in drive
2017-09-25 17:29:31 +02:00
91e36171eb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-25 17:09:41 +02:00
138ad17e3e
Fix 'import local pads' in settings creating duplicates
2017-09-25 17:09:26 +02:00
59ad96e491
Make sure the user is redirected to the drive at registration
2017-09-25 16:11:50 +02:00
d2f1d0c0e9
Fix readme pad not added at registration in sframe drive
2017-09-25 16:09:54 +02:00
ae54cbca33
Refactor sframe-cpnf-inner to export chainpad
2017-09-25 15:46:04 +02:00
44018ee7e1
Improve the LessLoader check to hopefully stop the message saying cookies were blocked.
2017-09-25 15:45:56 +02:00
b15527565c
Allow passing arguments when firing events
2017-09-25 15:45:49 +02:00
0eb2165f31
Implement a new pad framework and make it work (seemingly) with /pad/
2017-09-25 15:45:08 +02:00
d9845d3450
Refactor sframe-cpnf-inner to export chainpad
2017-09-25 15:44:03 +02:00
f418ee9632
Improve the LessLoader check to hopefully stop the message saying cookies were blocked.
2017-09-25 15:43:02 +02:00
72f03b2a47
Allow passing arguments when firing events
2017-09-25 15:42:08 +02:00
1afbd4648d
Fix old drive
2017-09-25 15:23:42 +02:00
b871faffc9
Enable tags in code and slide
2017-09-25 14:47:31 +02:00
6aeb366767
Lint
2017-09-25 14:47:19 +02:00
0600ce59ec
Display the 'spinner' when typing in sframe apps
2017-09-25 13:19:25 +02:00
1d7683503f
Fix link origin in sframe upload table
2017-09-25 12:44:05 +02:00
92c808812a
Fix missing style in toolbar/less2
2017-09-25 11:59:05 +02:00
deba699d08
Remove old style for sframe drive
2017-09-25 11:54:01 +02:00
4049931924
Lint
2017-09-25 11:51:24 +02:00
c364377d7c
Use less2 in sframe drive
2017-09-25 11:48:42 +02:00
47fe7b1c53
Drive in sandboxed iframe
2017-09-22 19:35:06 +02:00
dfdeb7b113
Fix style and race condition for history mode
2017-09-21 18:00:33 +02:00
a810d7bd85
Fix style and race condition for history mode
2017-09-21 18:00:11 +02:00
456370b1aa
Base for Drive in sandboxed iframe
2017-09-21 17:59:26 +02:00
95302366d1
lint compliance
2017-09-21 11:19:23 +02:00
68f7d4bc0a
more conformant tagPrompt behaviour
2017-09-20 17:55:05 +02:00
db4c3e7e2c
Merge branch 'master' into staging
2017-09-20 12:07:01 +02:00
b5b84f540e
fix preview mode class
2017-09-20 12:02:46 +02:00
f990200996
drop any notion of crypto from sframe-listmap
2017-09-19 18:21:33 +02:00
a1c124f1be
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-19 15:38:21 +02:00
95542bcdaf
Lint
2017-09-19 15:38:19 +02:00
c9223cb942
listmap does not care about 'readOnly' mode anymore
2017-09-19 15:38:06 +02:00
88914ec6cc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-19 15:36:38 +02:00
8a09e39f46
Enable tags in pads
2017-09-19 15:30:08 +02:00
d2b27f3588
resolve merge conflicts
2017-09-19 14:24:26 +02:00
4af01e6e9e
make listmap consume cpNfInner
2017-09-19 14:16:13 +02:00
72f0952835
Make sure we can't open a pad using the wrong app
2017-09-19 11:31:45 +02:00
35a313d6ee
Make palette realtime
2017-09-19 11:20:20 +02:00
6fdd66167a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-19 11:04:59 +02:00
3023e8c855
Fix templates in whiteboard
2017-09-19 11:04:52 +02:00
732585ea7b
Sandboxed iframe for the whiteboard app
2017-09-19 10:27:31 +02:00
029a8e3023
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-19 10:27:30 +02:00
d72146ba7f
use setAttribute for assigning attributes in hyperscript
2017-09-19 10:27:19 +02:00
a78b597ebb
lint errors
2017-09-18 15:51:47 +02:00
8ce364a252
Add a button to empty the trash in the drive
2017-09-18 15:47:39 +02:00
a1e7bf701d
Select the element after clicking 'show in folder' in the drive search
2017-09-18 15:24:25 +02:00
f9d27d2783
WIP secure contacts
2017-09-18 15:09:01 +02:00
483160a96a
Fix tab notifications in code and slides
2017-09-18 14:31:58 +02:00
1131ef0172
Fix language selection in sandboxed iframes
2017-09-18 14:26:54 +02:00
0a656ca8d6
Fix the splitter in code and add it back
2017-09-18 12:09:18 +02:00
018f71df04
Add drop handlers for mediatags in ckeditor
2017-09-18 10:59:40 +02:00
c00d295466
Add missing translations
2017-09-15 17:33:36 +02:00
a927f40f02
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-15 13:21:45 +02:00
974658453c
Mediatag integration in pads
2017-09-15 13:21:37 +02:00
08e0ae424d
log errors in less compilation
2017-09-14 18:13:03 +02:00
15db6b180c
copy bug fixes from changes
2017-09-14 13:43:13 +02:00
5b45e92250
delete range requests after they have completed
2017-09-14 12:08:41 +02:00
4f6909fce3
set icon to 'faded' styles
2017-09-14 12:07:21 +02:00
086d4bae32
clean up contacts initialization
2017-09-14 12:01:57 +02:00
96d0456f31
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-14 11:54:16 +02:00
1091e0b375
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-14 11:52:52 +02:00
47ce645897
implement slice
2017-09-14 11:51:33 +02:00
a8f7beb20b
remove deprecated apps
2017-09-14 11:36:40 +02:00
6ed4f2fc64
fix a thing
2017-09-14 11:27:10 +02:00
8a564bf350
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-14 11:23:51 +02:00
513f8e73d4
refactor cryptpad.ready to use nthen
2017-09-14 11:23:37 +02:00
c50c297490
Fix the size of the loading screen for the filepicker
2017-09-14 11:03:39 +02:00
b643ccc232
typo
2017-09-14 10:54:16 +02:00
652c916690
change the command in the documentation so that it will not change itself
2017-09-14 10:52:55 +02:00
5f0383ae99
update version of sframe-boot because it was changed
2017-09-14 10:52:25 +02:00
845f75f8a7
remove a 100ms dead spot from page load
2017-09-14 10:48:59 +02:00
b24e9b84af
Manual merge, update the CSS in loading.js and document that loading.less does nothing.
2017-09-14 10:48:35 +02:00
8a32b72ffc
1. implement cryptpadCache which has put() and get() functions that can be used like a localStorage that auto-flushes when a new version is released
...
2. change loading.js to use packaged css in order to get the loading screen up as quick as possible.
3. change LessLoader to cache less in cryptpadCache
2017-09-14 10:23:05 +02:00
4d688289cc
lint-compliance
2017-09-13 18:19:15 +02:00
2797a77f5d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 18:18:45 +02:00
47cfa0cf45
Focus the editable content when opening a codemirror pad
2017-09-13 18:09:55 +02:00
f039fc7ff5
develop a system for avoiding z-index problems
2017-09-13 17:43:17 +02:00
bafa401473
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 17:22:48 +02:00
fa64adbbe5
Hide visible elements while loading the slide app
2017-09-13 17:22:43 +02:00
fbd4be6135
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 16:32:41 +02:00
d360e2d0f4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 16:20:26 +02:00
ab64bf9e59
Use less2 for the loading screen
2017-09-13 16:19:26 +02:00
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
a332168926
fix some bugs in prompts, alerts, confirms
2017-09-13 15:52:31 +02:00
0db33d48fc
properly handle variable args in Cryptpad.alert
2017-09-13 14:52:58 +02:00
8a87ec180e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 14:52:26 +02:00
0d8c292fef
Merge branches 'staging' and 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 14:47:55 +02:00
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
d46cc8226d
Update LessLoader to be capable of loading CSS as well as less files and properly rewrite the URLs
2017-09-13 14:46:41 +02:00
dc86579d46
use an 8 character password for tests
2017-09-13 14:00:48 +02:00
e1f090bb9d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 12:33:05 +02:00
244e3ecba7
support forefront flag in alert config
2017-09-13 12:32:30 +02:00
63cb5dfc1e
Make less loader rewrite urls to use version parameter
2017-09-13 12:04:24 +02:00
d967df2cec
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 11:00:09 +02:00
e3c0ec29f7
Hopefully chase out a race in sframe-channel
2017-09-13 11:00:00 +02:00
8c41e0bdd6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-12 18:40:20 +02:00
437f50fd4a
Migrate the file to a sandboxed iframe
2017-09-12 18:40:11 +02:00
1713167a5d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-12 14:12:41 +02:00
981a919328
Added tooltips back to sframe land with hopefully a more robust removal.
2017-09-12 14:12:35 +02:00
5ac3e97dc8
Merge branch 'master' into staging
2017-09-12 12:20:47 +02:00
7d720c73a9
Merge branch 'soon'
2017-09-12 11:34:12 +02:00
ddbda08c88
Fix an issue when cleaning the template category in the drive
2017-09-12 11:32:32 +02:00
9d229b8868
lint compliance
2017-09-12 11:30:43 +02:00
5b3667fd4e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-12 11:29:57 +02:00
63700cb791
Fix an issue when cleaning the template category in the drive
2017-09-12 11:29:24 +02:00
a87ccdc37e
remove redundant lines
2017-09-12 11:27:24 +02:00
da0e31fa54
guard against possible type errors
2017-09-12 11:20:50 +02:00
0f9da69185
Show if a pad has been renamed in the drive
2017-09-12 11:17:52 +02:00
499b5ea2ba
warn that a password is too short before doing anything else
2017-09-12 10:50:59 +02:00
a0b3201df3
fix focus on alerts, prompts, and confirms. call back from alerts
2017-09-12 10:49:48 +02:00
a74915ab58
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-11 17:52:40 +02:00
671c893e8a
Duplicating code like a moron, this should hopefully get fixed later.
2017-09-11 17:52:34 +02:00
5a4836fe6d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-11 16:36:41 +02:00
79094aa4bb
Fix closing the title input when the title is not modified
2017-09-11 16:36:24 +02:00
58c38dd77b
focus on the current window when you pop an alert
2017-09-11 16:34:00 +02:00
b9545f45f7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-11 16:26:21 +02:00
306fec2d0e
improve messages for template picker confirm
2017-09-11 16:25:58 +02:00
1943c83f69
clean up api for Cryptpad.confirm
2017-09-11 16:24:43 +02:00
8d3ebdbaf7
I'm stupid
2017-09-11 15:53:27 +02:00
041071e61c
manual merge
2017-09-11 15:52:14 +02:00
7334173b4a
Hopefully fix infinite spinner whenever there is a disconnect (pad)
2017-09-11 15:46:21 +02:00
9271b0c1a8
Try to fix half-codemirror bug
2017-09-11 14:42:43 +02:00
304a8df808
Remove unneeded migration and fix attributes migration
2017-09-11 14:25:19 +02:00
5a1abc8986
let's try using actual js syntax
2017-09-11 14:04:40 +02:00
134c6057c1
Merge branch 'slide2' of github.com:xwiki-labs/cryptpad into origin/slide2
2017-09-11 14:01:05 +02:00
59d25b4c1a
use camel case, not snek case
2017-09-11 14:00:27 +02:00
520b8967fd
allow people with short passwords to log in
2017-09-11 13:54:48 +02:00
8ef27dca08
Lint
2017-09-11 12:25:23 +02:00
1aef844fc3
Fix title attribute for truncated titles in the drive
2017-09-11 12:23:24 +02:00
55fe882f64
Fix readonly mode in code
2017-09-11 12:23:04 +02:00
yflory