ansuz
661db129b2
lint compliance
2017-11-24 10:32:58 +01:00
ansuz
80978377f2
return transformed cursor value
2017-11-24 10:03:45 +01:00
ansuz
ee6c2097f5
resolve merge conflicts
2017-11-23 16:56:49 +01:00
yflory
9795ac32cb
Ability to burn an anonymous drive from the browser
2017-11-23 14:36:42 +01:00
yflory
280a7c2765
Clean cryptpad-common
2017-11-23 12:28:49 +01:00
yflory
eba1c9dfac
Add chainpad log to the debug app
2017-11-21 18:50:33 +01:00
yflory
30cea8888d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-11-21 17:37:53 +01:00
yflory
06011065d2
Add a debug app
2017-11-21 17:37:38 +01:00
ansuz
60c4973d62
resolve merge conflicts
2017-11-21 17:22:06 +01:00
ansuz
585f9d2e4e
repair broken 'clear channel' button
2017-11-21 17:19:35 +01:00
yflory
000f3edd1d
Constants file
2017-11-21 16:47:19 +01:00
yflory
477f14bb8b
Put constants in a separate file
2017-11-21 16:46:19 +01:00
yflory
7f88d1d43a
Improve drive loading speed
2017-11-21 11:09:59 +01:00
yflory
06ede6b294
Fix export in apps using framework
2017-11-21 10:26:33 +01:00
yflory
c35e3d644e
Make sure dates are stored as numbers in the drive
2017-11-20 15:37:23 +01:00
yflory
655dfe971d
Add translation for the edit username button in the userlist
2017-11-20 14:28:35 +01:00
ansuz
d1beb6493b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-11-20 12:20:13 +01:00
ansuz
b96ea47f1f
strip tracking parameters when parsing urls
2017-11-20 12:09:17 +01:00
yflory
fc02f97d78
Use less2 classes in the user menu
2017-11-17 18:20:45 +01:00
yflory
41a082c46d
Fix video thumbnails
2017-11-17 18:20:02 +01:00
yflory
af8aa25228
Add an option to never rename a file during the session
2017-11-17 10:57:54 +01:00
yflory
31b31654ec
Lint compliance
2017-11-16 18:57:33 +01:00
yflory
25d3d321da
Ability to rename a file before uploading it to the server
2017-11-16 18:11:13 +01:00
yflory
2813b7219e
Fix the public key using the wrong domain in settings
2017-11-16 13:35:07 +01:00
yflory
a96e49d55a
Fix filepicker creating a new netflux network when initialized
2017-11-15 16:56:50 +01:00
yflory
630ac45948
Fix laggy and blinking tooltips
2017-11-15 16:31:26 +01:00
yflory
1f53304ad3
Display a dropdown menu inside another one
2017-11-15 15:35:28 +01:00
yflory
014e12b5b5
Ability to update the username from the userlist
2017-11-15 11:32:54 +01:00
yflory
7cfe64fc5b
Remove cryptpad-common dependency for some inner apps
2017-11-13 18:09:19 +01:00
yflory
1514ad5df3
Move the 'logged out' screen inside the sframe
2017-11-13 17:29:00 +01:00
yflory
5a2afb5c95
Remove Realtime and Messaging from common
2017-11-13 17:01:09 +01:00
yflory
30c8c253dd
Remove util and hash from common
2017-11-13 16:32:40 +01:00
yflory
c9e1de042c
Remove common-interface dependency from cryptpad-common
2017-11-13 12:00:26 +01:00
yflory
dc207393fd
Separate UI elements from cryptpad-common
2017-11-13 10:23:18 +01:00
Caleb James DeLisle
50da6b3b2e
Needs to be handled in chainpad-listmap
...
Revert "Do content checks on the drive so if it gets corrupted, the patch will be rejected"
This reverts commit eaa7b6e8e5
2017-11-11 01:34:20 +01:00
Caleb James DeLisle
eaa7b6e8e5
Do content checks on the drive so if it gets corrupted, the patch will be rejected
2017-11-11 01:26:54 +01:00
yflory
354c63bd64
Clean old code
2017-11-09 18:17:49 +01:00
Caleb James DeLisle
ac66511f0a
Merge branch 'staging' into new-diff
2017-11-09 17:44:45 +01:00
yflory
f931574dac
lint compliance
2017-11-09 17:23:13 +01:00
Caleb James DeLisle
7b62a8042e
Remove TextPatcher and begin to include ChainPad directly using requirejs instead of sniffing off the window
2017-11-09 17:07:04 +01:00
Caleb James DeLisle
840cd91bcb
manual merge
2017-11-09 15:38:32 +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
101482b8cc
Migrate settings to use a sandboxed iframe
2017-11-09 14:23:40 +01:00
yflory
c1ba08cfc6
Make sure thumbnails are .png
2017-11-07 15:04:45 +01:00
yflory
0956905ca8
Wipe localForage on log out
2017-11-07 14:56:50 +01:00
yflory
6b9ffe8dd1
Make thumbnails more secure
2017-11-07 14:51:53 +01:00
ansuz
e07bb0f7b3
roll back to old transform function, except in pad
2017-11-06 17:18:10 +01:00
yflory
a592317e35
lint compliance
2017-11-06 15:49:40 +01:00
yflory
fef97ed60e
Fix an creating duplicates mediatags in markdown preview
2017-11-06 15:47:18 +01:00
yflory
9060464f37
Create thumbnails only when the tab is not focused
2017-11-06 13:36:54 +01:00
yflory
a37e6c7979
lint compliance
2017-11-03 18:39:06 +01:00
yflory
2a3a5c4342
Ability to disable thumbnails
2017-11-03 18:38:27 +01:00
yflory
1871749b6f
Fix -1 viewer in the userlist when disconnected
2017-11-03 15:14:23 +01:00
yflory
cf3024ef5b
Ability to display an error in the toolbar state
2017-11-03 14:30:59 +01:00
yflory
8de9a596f1
Fix cursor in thumbnails
2017-11-02 19:11:27 +01:00
yflory
fd7bb3aadb
Make sure the infinite spinner modal is not displayed multiple times
2017-11-02 17:47:19 +01:00
yflory
3ebb5ca493
Fix issue in diffMarked creating text nodes for each character
2017-10-31 18:19:30 +01:00
yflory
4250688856
Migrate profile to use sframe
2017-10-30 18:49:28 +01:00
ansuz
4c0049ad55
don't log presence of other users as 'joins' when you have first joined
2017-10-27 14:20:31 +02:00
ansuz
325f685f3e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-27 14:14:25 +02:00
ansuz
1cbf1aec92
prevent undefined access in non-sframe apps
2017-10-27 14:14:19 +02:00
yflory
ac1b67ad67
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-27 13:31:54 +02:00
yflory
1245b4d244
Enable thumbnails in poll and whiteboard
2017-10-27 13:31:41 +02:00
ansuz
df1a700cb2
disable thumbnail test. add test for flat dom
2017-10-27 11:01:22 +02:00
ansuz
02cd7e5b58
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-27 10:44:53 +02:00
ansuz
69890ebd8f
prototype alternate datastructure for trees in listmap
2017-10-27 10:43:44 +02:00
ansuz
23c305f71f
implement removeItem so localForage doesn't complain
2017-10-27 10:37:44 +02:00
yflory
6f020b67ca
Add thumbnails to framework apps
2017-10-26 12:31:16 +02:00
yflory
bf817f20ee
Fix file upload in code and slide
2017-10-25 12:31:22 +02:00
yflory
24572a40d2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-24 18:50:19 +02:00
yflory
f4adbd980e
Thumbnails for the code app
2017-10-24 18:49:58 +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
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
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
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
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
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
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
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
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
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
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
ansuz
a12239405b
fix toolbar 'home link' to visit home page from drive
2017-10-09 15:10:38 +02: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
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
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
ansuz
1f35798194
stop event propagation from tag prompt
2017-10-05 15:08:34 +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
yflory
26dfc65c25
Comments in polls
2017-10-04 19:06:16 +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
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
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
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
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
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
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
8de1852ab9
Lint compliance
2017-09-27 10:36:16 +02:00
yflory
b4de31c827
Merge branch 'newdrive' into staging
2017-09-27 10:28:16 +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
yflory
345bfc1cea
Remove migration for pad attributes
2017-09-26 14:36:49 +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
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
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
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
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
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
6fdd66167a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-19 11:04:59 +02:00
yflory
732585ea7b
Sandboxed iframe for the whiteboard app
2017-09-19 10:27:31 +02:00
ansuz
d72146ba7f
use setAttribute for assigning attributes in hyperscript
2017-09-19 10:27:19 +02:00
yflory
a1e7bf701d
Select the element after clicking 'show in folder' in the drive search
2017-09-18 15:24:25 +02:00
yflory
1131ef0172
Fix language selection in sandboxed iframes
2017-09-18 14:26:54 +02:00
yflory
018f71df04
Add drop handlers for mediatags in ckeditor
2017-09-18 10:59:40 +02:00
ansuz
08e0ae424d
log errors in less compilation
2017-09-14 18:13:03 +02:00
ansuz
5b45e92250
delete range requests after they have completed
2017-09-14 12:08:41 +02:00
ansuz
47ce645897
implement slice
2017-09-14 11:51:33 +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
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
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
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
yflory
ab64bf9e59
Use less2 for the loading screen
2017-09-13 16:19:26 +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
ansuz
a332168926
fix some bugs in prompts, alerts, confirms
2017-09-13 15:52:31 +02:00
ansuz
0db33d48fc
properly handle variable args in Cryptpad.alert
2017-09-13 14:52:58 +02:00
Caleb James DeLisle
0d8c292fef
Merge branches 'staging' and 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 14:47:55 +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
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
ansuz
e1f090bb9d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 12:33:05 +02:00
ansuz
244e3ecba7
support forefront flag in alert config
2017-09-13 12:32:30 +02:00
Caleb James DeLisle
63cb5dfc1e
Make less loader rewrite urls to use version parameter
2017-09-13 12:04:24 +02:00
Caleb James DeLisle
d967df2cec
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 11:00:09 +02:00
Caleb James DeLisle
e3c0ec29f7
Hopefully chase out a race in sframe-channel
2017-09-13 11:00:00 +02:00
yflory
8c41e0bdd6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-12 18:40:20 +02:00
yflory
437f50fd4a
Migrate the file to a sandboxed iframe
2017-09-12 18:40:11 +02:00
Caleb James DeLisle
1713167a5d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-12 14:12:41 +02:00
Caleb James DeLisle
981a919328
Added tooltips back to sframe land with hopefully a more robust removal.
2017-09-12 14:12:35 +02:00
yflory
7d720c73a9
Merge branch 'soon'
2017-09-12 11:34:12 +02:00
yflory
ddbda08c88
Fix an issue when cleaning the template category in the drive
2017-09-12 11:32:32 +02:00
ansuz
9d229b8868
lint compliance
2017-09-12 11:30:43 +02:00
ansuz
a87ccdc37e
remove redundant lines
2017-09-12 11:27:24 +02:00
ansuz
da0e31fa54
guard against possible type errors
2017-09-12 11:20:50 +02:00
ansuz
a0b3201df3
fix focus on alerts, prompts, and confirms. call back from alerts
2017-09-12 10:49:48 +02:00
yflory
5a4836fe6d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-11 16:36:41 +02:00
yflory
79094aa4bb
Fix closing the title input when the title is not modified
2017-09-11 16:36:24 +02:00
ansuz
58c38dd77b
focus on the current window when you pop an alert
2017-09-11 16:34:00 +02:00
ansuz
b9545f45f7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-11 16:26:21 +02:00
ansuz
306fec2d0e
improve messages for template picker confirm
2017-09-11 16:25:58 +02:00
ansuz
1943c83f69
clean up api for Cryptpad.confirm
2017-09-11 16:24:43 +02:00
