ansuz
8359902f6a
fix typo in poll
2017-10-24 17:42:08 +02:00
ansuz
69f9a7ebf3
make userlist change notifications configurable
2017-10-24 17:29:58 +02:00
Caleb James DeLisle
027b9fa383
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-24 18:03:31 +03:00
Caleb James DeLisle
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
ansuz
bac608adfe
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-24 16:56:13 +02:00
ansuz
dc90811090
only call onReady once in sframe-listmap
2017-10-24 16:56:08 +02:00
yflory
bac10472f3
lint compliance
2017-10-24 14:32:47 +02:00
yflory
39b4cb9226
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-24 14:31:56 +02:00
yflory
18b5b20d27
Add thumbnails for PDFs
2017-10-24 14:31:42 +02:00
ansuz
aee51f1317
lint compliance
2017-10-24 14:02:29 +02:00
ansuz
447b0a74ee
handle errors for videos when uploading
2017-10-24 13:45:27 +02:00
yflory
30a69fae13
Add thumbnails for videos
2017-10-24 12:26:04 +02:00
yflory
21f8ae7570
Keep the correct ratio for image thumbnails
2017-10-24 11:45:07 +02:00
yflory
2dd3c42fd5
Fix handlers registered again on reconnect in drive and poll
2017-10-24 10:42:08 +02:00
yflory
a0bcb901d3
Add titles in poll when options or usernames are overflowing
2017-10-23 15:16:51 +02:00
yflory
74985fd0f2
Use text for the addUser button in polls
2017-10-23 15:12:27 +02:00
ansuz
6db5a34323
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-23 14:53:42 +02:00
ansuz
c17fc2efe7
improve option order in poll
2017-10-23 14:53:31 +02:00
yflory
2be22867c1
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-23 14:39:31 +02:00
yflory
13718d0263
Fix recent pads in chrome
2017-10-23 14:38:38 +02:00
ansuz
2e5fdf709a
Merge branch 'soon' into staging
2017-10-23 14:29:01 +02:00
ansuz
de8339fea7
hide alertify when you are in presentation mode
2017-10-23 14:25:25 +02:00
Caleb James DeLisle
9b02b36724
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-23 14:22:54 +03:00
Caleb James DeLisle
d7e9498143
Fix and then disable the new OT
2017-10-23 14:22:33 +03:00
ansuz
288e141c1f
add missing sframe method
2017-10-23 12:33:50 +02:00
yflory
c1d05a00ba
Improve media-tag export in pad to work with existing CSP
2017-10-23 10:55:40 +02:00
yflory
3e4faf1be1
Add new state messages in the toolbar
2017-10-20 18:12:47 +02:00
yflory
6d080bcb45
Ability to export mediatag images in pad
2017-10-20 18:10:08 +02:00
yflory
a0dd867f33
Fix pending state not removed after friend invite rejected
2017-10-20 18:09:09 +02:00
yflory
c25be21138
Fix the upgrade button in the drive
2017-10-20 10:16:01 +02:00
Caleb James DeLisle
cc6b2192e4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-20 10:26:27 +03:00
yflory
a3c7aa67d8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-19 19:07:00 +02:00
yflory
094856a511
Fix renaming pad with multiple dots in the name in drive
2017-10-19 18:30:55 +02:00
ansuz
bf832ba784
fix comment overflow
2017-10-19 17:30:40 +02:00
yflory
7bc2f81852
Fix pinned column not always stored in polls
2017-10-19 16:01:56 +02:00
yflory
88e7f9a218
Add last access and creation times in the properties window in drive
2017-10-19 15:05:55 +02:00
yflory
22e3baed4b
Fix sort issues in drive
2017-10-19 15:00:29 +02:00
yflory
f43606f71d
Present mode to display only the parsed markdown in code
2017-10-19 14:39:38 +02:00
yflory
515214aed1
Use present mode in embed code
2017-10-19 11:59:07 +02:00
yflory
201c974df6
Merge branch 'thumbnails' into staging
2017-10-19 11:43:43 +02:00
yflory
7b8490ad20
Use less2 in contacts
2017-10-19 09:58:28 +02:00
yflory
dd63cd13d7
Fix profile page title
2017-10-18 16:59:20 +02:00
Caleb James DeLisle
81d0b3272d
Fix multiple infinite-spinner errors piling up on top of eachother
2017-10-18 14:49:50 +03:00
Caleb James DeLisle
9e4c48f537
lint errors
2017-10-18 12:25:13 +03:00
Caleb James DeLisle
a149152f11
Merge branch 'staging' into framework
2017-10-18 11:42:31 +03:00
yflory
4197b7b968
Fix missing icon in list mode for files with thumbnail
2017-10-17 17:23:31 +02:00
yflory
d941b1098a
Remove selection in whiteboard when uploading to the drive
2017-10-17 17:21:15 +02:00
yflory
4116d08dd1
Display thumbnails in the drive and then file picker
2017-10-17 17:17:31 +02:00
yflory
6920129126
Embed images from the drive in whiteboard
2017-10-17 12:19:57 +02:00
MacLemon
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
yflory
2fd120100a
Merge branch 'wb' into staging
2017-10-13 16:58:59 +02:00
Caleb James DeLisle
15337603bb
Merge branch 'staging' into framework
2017-10-13 13:41:24 +03:00
Caleb James DeLisle
a6b34491fc
freeze the editor when reconnecting
2017-10-13 13:40:51 +03:00
Caleb James DeLisle
854c1e94a4
make infinite spinner error message go away if ChainPad settles after it has been popped
2017-10-13 13:39:49 +03:00
yflory
a859ab081a
Fix fouc in drive
2017-10-12 18:21:34 +02:00
yflory
7b6432f134
Lint
2017-10-12 18:20:33 +02:00
yflory
6926d42292
Autoload template picker to make it faster to appear when used
2017-10-12 18:18:01 +02:00
yflory
1c8e1a36e8
Add file type in the pad attributes for existing files
2017-10-12 17:43:49 +02:00
yflory
b86f8e3f26
Fix uloaded files not moved to the correct folder in drive
2017-10-12 17:33:22 +02:00
yflory
88d0a2b8a6
Merge branch 'master' into staging
2017-10-12 17:08:34 +02:00
yflory
5ed60a0ad7
Fix image ratio in slides
2017-10-12 16:45:51 +02:00
Caleb James DeLisle
753e2d797e
Merge branch 'staging' into framework
2017-10-12 17:07:10 +03:00
yflory
62bc72847f
Add an error message when trying to tag a deleted pad
2017-10-12 15:06:29 +02:00
Caleb James DeLisle
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
yflory
69dd3a60ab
Hide template and fileupload buttons for anonymous users
2017-10-12 14:32:12 +02:00
yflory
8e1f15e88d
Get title suggestion based on poll's description
2017-10-12 14:12:26 +02:00
ansuz
e317265594
Merge branch 'master' of github.com:xwiki-labs/cryptpad
2017-10-12 14:09:55 +02:00
ansuz
0d912402e5
patch for bug in Firefox ESR
2017-10-12 14:09:48 +02:00
yflory
91381ca77d
Fix lint errors
2017-10-12 12:20:27 +02:00
yflory
50090a3af6
Add placeholders for the comment form in poll
2017-10-12 12:18:32 +02:00
yflory
95ad25973e
Ability to delete a stronger pad from readonly mode
2017-10-12 11:41:53 +02:00
yflory
b28c1537e8
Fix history in readonly mode
2017-10-12 10:59:23 +02:00
yflory
620ba4ed5d
Fix fouc in drive
2017-10-11 17:15:56 +02:00
yflory
b31bbebf7b
Buttons are missing in whiteboard when zoomed in
2017-10-11 17:11:38 +02:00
yflory
a5a08176fb
Merge branch 'master' into staging
2017-10-11 16:58:45 +02:00
yflory
54b5a2d654
Fix style issues in poll (Chrome)
2017-10-11 16:01:26 +02:00
yflory
86767184da
Fix style issues in poll for Edge
2017-10-11 15:38:23 +02:00
yflory
00e8d32d60
Fix column position in poll for Chrome
2017-10-11 15:37:47 +02:00
yflory
b110e1b8da
Fix style issues in poll for Edge
2017-10-11 15:37:11 +02:00
yflory
ecb537ac7f
Move code to render.js in poll
2017-10-10 18:19:49 +02:00
yflory
75b3ff9c60
CSS issue in polls
2017-10-10 11:35:24 +02:00
yflory
c46280d032
Fix style issues for Edge
2017-10-10 11:32:52 +02:00
ansuz
128c9c2f4e
Merge branch 'staging' of github.com:CatalinScr/cryptpad into catalin
2017-10-09 17:20:23 +02:00
ansuz
f0bdc3b26f
second try
2017-10-09 16:57:30 +02:00
ansuz
d50a692986
add note about tags to prompt
2017-10-09 16:51:57 +02:00
Caleb James DeLisle
c8928a0811
Switch the transform function and also stop calling textPatcher without the metadata
2017-10-09 17:07:26 +03:00
yflory
035150614d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-09 15:38:08 +02:00
yflory
484e216054
Fix hashtag button in the toolbar
2017-10-09 15:37:37 +02:00
yflory
4c19375f4d
Avoid missing characters in poll's inputs
2017-10-09 15:11:02 +02:00
ansuz
a12239405b
fix toolbar 'home link' to visit home page from drive
2017-10-09 15:10:38 +02:00
yflory
dd141b5c9f
Disable comments when a poll is not published
2017-10-09 14:08:54 +02:00
Caleb James DeLisle
36aee2d174
lets try normalizing the dom before applying a patch
2017-10-09 14:13:11 +03:00
Caleb James DeLisle
828a685ba8
Fix broken browser fight logging
2017-10-09 14:12:55 +03:00
yflory
aa744567ed
Fix thumbnails in sframe apps
2017-10-09 11:52:34 +02:00
yflory
5e7bf0cfb8
Embed an image in whiteboard
2017-10-09 10:32:24 +02:00
Caleb James DeLisle
f0eb58ee95
Merge branch 'staging' into framework
2017-10-06 14:50:35 +03:00
Caleb James DeLisle
9509d538e0
Cursor not being updated at the right times before applying a patch.
2017-10-06 14:49:52 +03:00
yflory
888028c542
Lint
2017-10-05 18:13:28 +02:00
yflory
e5a54b5978
Fix folder highlighting with drag&drop in the drive
2017-10-05 18:12:23 +02:00
yflory
1c7c37c121
Add the file class to pads in 'template' and 'recent' categories in the drive
2017-10-05 18:07:05 +02:00
yflory
ab3648a30a
Merge branch 'newpoll' into staging
2017-10-05 17:56:17 +02:00
yflory
1c4f1c785d
Improve stability and UI in poll and its comments
2017-10-05 17:54:07 +02:00
ansuz
7559bc062e
lint compliance
2017-10-05 17:06:02 +02:00
ansuz
503111d26a
use recompiled media-tag
2017-10-05 17:00:47 +02:00
ansuz
427afc3954
override modified file name in pdfjs
2017-10-05 16:59:55 +02:00
ansuz
d85db64939
add tags from drive
2017-10-05 16:58:34 +02:00
Caleb James DeLisle
0aecfad854
Occasionally the language selector only says "Mode" rather than the language
2017-10-05 16:12:49 +03: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
ansuz
1f35798194
stop event propagation from tag prompt
2017-10-05 15:08:34 +02:00
ansuz
c936e5ae73
make context menu open correct app on correct port
2017-10-05 11:14:47 +02:00
Caleb James DeLisle
d9e97b86e6
Merge branch 'staging' into framework
2017-10-05 12:14:37 +03:00
Caleb James DeLisle
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
ansuz
deed04108b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-05 10:22:07 +02:00
ansuz
a90c078e84
correct reference to undefined
2017-10-05 10:21:59 +02:00
yflory
26dfc65c25
Comments in polls
2017-10-04 19:06:16 +02:00
yflory
5304dc319f
Enable redirection to the previous page after registration
2017-10-04 15:55:57 +02:00
yflory
ceb8ff18bd
Fix ghost icon in drive
2017-10-04 15:52:09 +02:00
yflory
846b1a9fb3
Improve description UI in poll. Enable tags and mediatag
2017-10-04 15:39:18 +02:00
yflory
68bda92291
Use codemirror for description in poll
2017-10-03 19:04:29 +02:00
ansuz
b8ce149db6
add hint about tag usage
2017-10-03 18:36:34 +02:00
ansuz
f15ec4efe9
add tagging to whiteboard and file apps
2017-10-03 18:05:28 +02:00
ansuz
f90742603e
style fixes
2017-10-03 17:53:28 +02: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
yflory
707d3b3e94
Ability to export polls as csv
2017-10-03 16:50:59 +02:00
yflory
5cf86bf74a
Update UI in poll and remove old code
2017-10-03 14:11:11 +02:00
ansuz
09c0a473e2
fix function signatures
2017-10-03 14:08:40 +02:00
yflory
3337689630
Wrong translation key in toolbar
2017-10-03 14:04:07 +02:00
Caleb James DeLisle
94d2f4472b
Stop using presentSuccess because it is hidden behind the modal in slide
2017-10-03 12:10:16 +03:00
yflory
126742a1c3
Fix bugs in sframe poll and update UI
2017-10-02 19:02:31 +02:00
ansuz
351b95d6a9
resolve merge conflicts
2017-10-02 18:59:47 +02:00
ansuz
6c7b135f91
lint compliance
2017-10-02 18:58:18 +02:00
ansuz
94c392b79f
secure messaging
2017-10-02 18:57:17 +02:00
Caleb James DeLisle
53f65f6a87
Merge branch 'staging' into framework
2017-10-02 17:46:27 +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
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
Caleb James DeLisle
7230c780a1
Get rid of last usages of cryptpad-common in pad/inner
2017-10-02 15:06:01 +03:00
Caleb James DeLisle
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
ansuz
0a99478d9f
catch diffdom errors and plow through
2017-09-28 11:50:35 +02:00
ansuz
0f9e93e1de
make tests pass again
2017-09-28 10:36:40 +02:00
ansuz
48c49e5a75
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-28 10:23:59 +02:00
ansuz
19e58cec94
prevent typeError
2017-09-28 10:23:48 +02:00
yflory
66da349ee4
Sandboxed Poll app with less2
2017-09-27 18:52:04 +02: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
Caleb James DeLisle
6dbc02e81a
Merge branch 'staging' into framework
2017-09-27 12:01:18 +02:00
Caleb James DeLisle
1c791b5b51
Fix framework by removing some async and also fix media tags
2017-09-27 11:58:14 +02:00
Caleb James DeLisle
90d00c10b1
Make metadata-manager a bit more robust
2017-09-27 11:56:25 +02:00
yflory
9b2251005c
Merge branch 'staging' into newpoll
2017-09-27 10:36:33 +02:00
yflory
8de1852ab9
Lint compliance
2017-09-27 10:36:16 +02:00
yflory
2c10f9b07b
Merge branch 'staging' into newpoll
2017-09-27 10:32:03 +02:00
yflory
e02a779c14
Use secure drive as default drive
2017-09-27 10:31:35 +02:00
yflory
b4de31c827
Merge branch 'newdrive' into staging
2017-09-27 10:28:16 +02:00
yflory
c1275b5671
Prepare secure poll
2017-09-27 10:28:10 +02:00
yflory
4c394e0031
Fix UI issue in poll
2017-09-27 10:15:23 +02:00
Caleb James DeLisle
342b6012f7
manual merge of staging into framework
2017-09-26 17:11:45 +02:00
Caleb James DeLisle
cf6030ab8b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-26 15:58:33 +02:00
Caleb James DeLisle
e62c5e1d07
Add some debugging lines to help synthesize error cases
2017-09-26 15:58:25 +02:00
ansuz
9571b3c018
persist whiteboard content across sessions
2017-09-26 15:16:17 +02:00
ansuz
748172585e
update for modified id
2017-09-26 15:00:25 +02:00
ansuz
4cd7d8eda4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-26 14:35:02 +02:00
yflory
345bfc1cea
Remove migration for pad attributes
2017-09-26 14:36:49 +02:00
ansuz
52be5501d6
remove invalid test
2017-09-26 14:34:54 +02:00
yflory
69014e5fde
Fix mediatags in pad not cached
2017-09-26 11:21:36 +02:00
ansuz
b3e066eaca
show loading screen tips during loading screen
2017-09-26 10:59:25 +02:00
Caleb James DeLisle
77fe6a9bba
small bug fixes
2017-09-26 10:23:35 +02:00
Caleb James DeLisle
1b01855dd2
Merge branch 'staging' into framework
2017-09-25 18:11:57 +02:00
Caleb James DeLisle
1fd7a6e2b3
Mistake in mkEvent which makes all events only work once
2017-09-25 18:03:31 +02:00
Caleb James DeLisle
368a6b2406
manual merge, still wip
2017-09-25 17:35:25 +02:00
yflory
cdeac00633
Merge branch 'staging' into newdrive
2017-09-25 17:35:06 +02:00
yflory
a8eecee590
Fix access to undefined variable in drive
2017-09-25 17:29:31 +02:00
yflory
91e36171eb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-25 17:09:41 +02:00
yflory
138ad17e3e
Fix 'import local pads' in settings creating duplicates
2017-09-25 17:09:26 +02:00
yflory
59ad96e491
Make sure the user is redirected to the drive at registration
2017-09-25 16:11:50 +02:00
yflory
d2f1d0c0e9
Fix readme pad not added at registration in sframe drive
2017-09-25 16:09:54 +02:00
Caleb James DeLisle
ae54cbca33
Refactor sframe-cpnf-inner to export chainpad
2017-09-25 15:46:04 +02:00
Caleb James DeLisle
44018ee7e1
Improve the LessLoader check to hopefully stop the message saying cookies were blocked.
2017-09-25 15:45:56 +02:00
Caleb James DeLisle
b15527565c
Allow passing arguments when firing events
2017-09-25 15:45:49 +02:00
Caleb James DeLisle
0eb2165f31
Implement a new pad framework and make it work (seemingly) with /pad/
2017-09-25 15:45:08 +02:00
Caleb James DeLisle
d9845d3450
Refactor sframe-cpnf-inner to export chainpad
2017-09-25 15:44:03 +02:00
Caleb James DeLisle
f418ee9632
Improve the LessLoader check to hopefully stop the message saying cookies were blocked.
2017-09-25 15:43:02 +02:00
Caleb James DeLisle
72f03b2a47
Allow passing arguments when firing events
2017-09-25 15:42:08 +02:00
yflory
1afbd4648d
Fix old drive
2017-09-25 15:23:42 +02:00
yflory
b871faffc9
Enable tags in code and slide
2017-09-25 14:47:31 +02:00
yflory
6aeb366767
Lint
2017-09-25 14:47:19 +02:00
yflory
0600ce59ec
Display the 'spinner' when typing in sframe apps
2017-09-25 13:19:25 +02:00
yflory
1d7683503f
Fix link origin in sframe upload table
2017-09-25 12:44:05 +02:00
yflory
92c808812a
Fix missing style in toolbar/less2
2017-09-25 11:59:05 +02:00
yflory
deba699d08
Remove old style for sframe drive
2017-09-25 11:54:01 +02:00
yflory
4049931924
Lint
2017-09-25 11:51:24 +02:00
yflory
c364377d7c
Use less2 in sframe drive
2017-09-25 11:48:42 +02:00
yflory
47fe7b1c53
Drive in sandboxed iframe
2017-09-22 19:35:06 +02:00
yflory
dfdeb7b113
Fix style and race condition for history mode
2017-09-21 18:00:33 +02:00
yflory
a810d7bd85
Fix style and race condition for history mode
2017-09-21 18:00:11 +02:00
yflory
456370b1aa
Base for Drive in sandboxed iframe
2017-09-21 17:59:26 +02:00
ansuz
95302366d1
lint compliance
2017-09-21 11:19:23 +02:00
ansuz
68f7d4bc0a
more conformant tagPrompt behaviour
2017-09-20 17:55:05 +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
ansuz
f990200996
drop any notion of crypto from sframe-listmap
2017-09-19 18:21:33 +02:00
ansuz
a1c124f1be
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-19 15:38:21 +02:00
yflory
95542bcdaf
Lint
2017-09-19 15:38:19 +02:00
ansuz
c9223cb942
listmap does not care about 'readOnly' mode anymore
2017-09-19 15:38:06 +02:00
yflory
88914ec6cc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-19 15:36:38 +02:00
yflory
8a09e39f46
Enable tags in pads
2017-09-19 15:30:08 +02:00
ansuz
d2b27f3588
resolve merge conflicts
2017-09-19 14:24:26 +02:00
ansuz
4af01e6e9e
make listmap consume cpNfInner
2017-09-19 14:16:13 +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
35a313d6ee
Make palette realtime
2017-09-19 11:20:20 +02:00
yflory
6fdd66167a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-19 11:04:59 +02:00
yflory
3023e8c855
Fix templates in whiteboard
2017-09-19 11:04:52 +02:00
yflory
732585ea7b
Sandboxed iframe for the whiteboard app
2017-09-19 10:27:31 +02:00
ansuz
029a8e3023
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-19 10:27:30 +02:00
ansuz
d72146ba7f
use setAttribute for assigning attributes in hyperscript
2017-09-19 10:27:19 +02:00
yflory
a78b597ebb
lint errors
2017-09-18 15:51:47 +02:00
yflory
8ce364a252
Add a button to empty the trash in the drive
2017-09-18 15:47:39 +02:00
yflory
a1e7bf701d
Select the element after clicking 'show in folder' in the drive search
2017-09-18 15:24:25 +02:00
ansuz
f9d27d2783
WIP secure contacts
2017-09-18 15:09:01 +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
yflory
018f71df04
Add drop handlers for mediatags in ckeditor
2017-09-18 10:59:40 +02:00
yflory
c00d295466
Add missing translations
2017-09-15 17:33:36 +02:00
yflory
a927f40f02
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-15 13:21:45 +02:00
yflory
974658453c
Mediatag integration in pads
2017-09-15 13:21:37 +02:00
ansuz
08e0ae424d
log errors in less compilation
2017-09-14 18:13:03 +02:00
ansuz
15db6b180c
copy bug fixes from changes
2017-09-14 13:43:13 +02:00
ansuz
5b45e92250
delete range requests after they have completed
2017-09-14 12:08:41 +02:00
ansuz
4f6909fce3
set icon to 'faded' styles
2017-09-14 12:07:21 +02:00
ansuz
086d4bae32
clean up contacts initialization
2017-09-14 12:01:57 +02:00
yflory
96d0456f31
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-14 11:54:16 +02:00
yflory
1091e0b375
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-14 11:52:52 +02:00
ansuz
47ce645897
implement slice
2017-09-14 11:51:33 +02:00
ansuz
a8f7beb20b
remove deprecated apps
2017-09-14 11:36:40 +02:00
ansuz
6ed4f2fc64
fix a thing
2017-09-14 11:27:10 +02:00
ansuz
8a564bf350
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-14 11:23:51 +02:00
ansuz
513f8e73d4
refactor cryptpad.ready to use nthen
2017-09-14 11:23:37 +02:00
yflory
c50c297490
Fix the size of the loading screen for the filepicker
2017-09-14 11:03:39 +02:00
Caleb James DeLisle
b643ccc232
typo
2017-09-14 10:54:16 +02:00
Caleb James DeLisle
652c916690
change the command in the documentation so that it will not change itself
2017-09-14 10:52:55 +02:00
Caleb James DeLisle
5f0383ae99
update version of sframe-boot because it was changed
2017-09-14 10:52:25 +02:00
Caleb James DeLisle
845f75f8a7
remove a 100ms dead spot from page load
2017-09-14 10:48:59 +02:00
Caleb James DeLisle
b24e9b84af
Manual merge, update the CSS in loading.js and document that loading.less does nothing.
2017-09-14 10:48:35 +02:00
Caleb James DeLisle
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
ansuz
4d688289cc
lint-compliance
2017-09-13 18:19:15 +02:00
ansuz
2797a77f5d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 18:18:45 +02:00
yflory
47cfa0cf45
Focus the editable content when opening a codemirror pad
2017-09-13 18:09:55 +02:00
ansuz
f039fc7ff5
develop a system for avoiding z-index problems
2017-09-13 17:43:17 +02:00
yflory
bafa401473
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 17:22:48 +02:00
yflory
fa64adbbe5
Hide visible elements while loading the slide app
2017-09-13 17:22:43 +02:00
ansuz
fbd4be6135
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 16:32:41 +02:00
yflory
d360e2d0f4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 16:20:26 +02:00