ansuz
|
dc86579d46
|
use an 8 character password for tests
|
2017-09-13 14:00:48 +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
|
5ac3e97dc8
|
Merge branch 'master' into staging
|
2017-09-12 12:20:47 +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 |
|
yflory
|
5b3667fd4e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-12 11:29:57 +02:00 |
|
yflory
|
63700cb791
|
Fix an issue when cleaning the template category in the drive
|
2017-09-12 11:29:24 +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 |
|
yflory
|
0f9da69185
|
Show if a pad has been renamed in the drive
|
2017-09-12 11:17:52 +02:00 |
|
ansuz
|
499b5ea2ba
|
warn that a password is too short before doing anything else
|
2017-09-12 10:50:59 +02:00 |
|
ansuz
|
a0b3201df3
|
fix focus on alerts, prompts, and confirms. call back from alerts
|
2017-09-12 10:49:48 +02:00 |
|
Caleb James DeLisle
|
a74915ab58
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-11 17:52:40 +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
|
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 |
|
Caleb James DeLisle
|
8d3ebdbaf7
|
I'm stupid
|
2017-09-11 15:53:27 +02:00 |
|
Caleb James DeLisle
|
041071e61c
|
manual merge
|
2017-09-11 15:52:14 +02:00 |
|
Caleb James DeLisle
|
7334173b4a
|
Hopefully fix infinite spinner whenever there is a disconnect (pad)
|
2017-09-11 15:46:21 +02:00 |
|
yflory
|
9271b0c1a8
|
Try to fix half-codemirror bug
|
2017-09-11 14:42:43 +02:00 |
|
yflory
|
304a8df808
|
Remove unneeded migration and fix attributes migration
|
2017-09-11 14:25:19 +02:00 |
|
ansuz
|
5a1abc8986
|
let's try using actual js syntax
|
2017-09-11 14:04:40 +02:00 |
|
ansuz
|
134c6057c1
|
Merge branch 'slide2' of github.com:xwiki-labs/cryptpad into origin/slide2
|
2017-09-11 14:01:05 +02:00 |
|
ansuz
|
59d25b4c1a
|
use camel case, not snek case
|
2017-09-11 14:00:27 +02:00 |
|
ansuz
|
520b8967fd
|
allow people with short passwords to log in
|
2017-09-11 13:54:48 +02:00 |
|
yflory
|
8ef27dca08
|
Lint
|
2017-09-11 12:25:23 +02:00 |
|
yflory
|
1aef844fc3
|
Fix title attribute for truncated titles in the drive
|
2017-09-11 12:23:24 +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
|
51f1be9f7a
|
Improve the input style when renaming a folder in the drive tree
|
2017-09-11 11:50:04 +02:00 |
|
yflory
|
642511dc3b
|
Disable exiting present mode when in embed mode
|
2017-09-11 11:38:40 +02:00 |
|
yflory
|
403b62f131
|
Fix ghost icon modal and improve UI on mobile
|
2017-09-11 11:04:14 +02:00 |
|
yflory
|
757d0a2800
|
Save the state of CKEditor's toolbar (visible or hidden)
|
2017-09-11 10:10:29 +02:00 |
|
yflory
|
5bf966633c
|
Merge branch 'staging' into slide2
|
2017-09-08 18:21:38 +02:00 |
|
yflory
|
514bff7065
|
Add slide number in the title in slide2
|
2017-09-08 18:21:11 +02:00 |
|
ansuz
|
0ed6846e07
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-08 17:41:46 +02:00 |
|
ansuz
|
b5b9f931c7
|
don't use common-realtime
|
2017-09-08 17:41:05 +02:00 |
|
ansuz
|
32e8c8ef4b
|
implement alertify without alertify
|
2017-09-08 17:40:25 +02:00 |
|
ansuz
|
a302ee5d25
|
guard against undefined arguments
|
2017-09-08 17:39:41 +02:00 |
|
yflory
|
c3a07e879c
|
Merge branch 'staging' into slide2
|
2017-09-08 16:23:07 +02:00 |
|
yflory
|
fc069dac48
|
Ask the user before loading the template picker
|
2017-09-08 16:21:12 +02:00 |
|
yflory
|
05793c220c
|
Fix secure iframes on Edge
|
2017-09-08 15:55:01 +02:00 |
|
yflory
|
290d668ceb
|
Fix race condition preventing slide to work on Edge
|
2017-09-08 15:53:53 +02:00 |
|
ansuz
|
de5d925154
|
autoselect user href in settings
|
2017-09-08 15:07:25 +02:00 |
|
ansuz
|
e950ce74cb
|
focus on input when opening filepicker
|
2017-09-08 15:01:47 +02:00 |
|
ansuz
|
739903d511
|
don't check account usage if you aren't logged in
|
2017-09-08 14:00:49 +02:00 |
|
ansuz
|
bbf7ed3827
|
refactor drive to use dialog.selectable()
fix class on alertify-like boxes
|
2017-09-08 12:24:20 +02:00 |
|
yflory
|
f2aaaa9751
|
Move slide to secure iframe
|
2017-09-07 18:56:58 +02:00 |
|
ansuz
|
809b56625d
|
refactor ui elements
|
2017-09-07 18:54:58 +02:00 |
|
ansuz
|
bca9ba66cb
|
enforce a configurable minimum password length when registering
|
2017-09-07 17:44:04 +02:00 |
|
ansuz
|
1958bca984
|
restore hashing screen in login and register
|
2017-09-07 16:48:22 +02:00 |
|
ansuz
|
fab6264ce6
|
use loading screen from pages.js
|
2017-09-07 16:41:11 +02:00 |
|
ansuz
|
e8298f165a
|
only display first letter of name if user has no avatar
|
2017-09-07 16:35:24 +02:00 |
|
ansuz
|
85003f7a23
|
lint compliance
|
2017-09-07 14:21:54 +02:00 |
|
ansuz
|
cca3c04d43
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-07 12:45:18 +02:00 |
|
ansuz
|
15e24ebe4f
|
ui for hashtag picker
|
2017-09-07 12:45:07 +02:00 |
|
ansuz
|
1b97996ef8
|
implement util.once
|
2017-09-07 12:26:05 +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
|
61b228db79
|
Fix double / when storing a file
|
2017-09-06 11:41:09 +02:00 |
|
yflory
|
8b2733e2da
|
Fix typo
|
2017-09-06 11:37:19 +02:00 |
|
yflory
|
3ca9f41290
|
Get embed code for pad and code
|
2017-09-06 10:56:27 +02:00 |
|
yflory
|
0bb6698399
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-05 18:40:18 +02:00 |
|
yflory
|
e85b34f127
|
Add embed options in the secure pad hashes
|
2017-09-05 18:38:51 +02:00 |
|
ansuz
|
47ec959032
|
make sure contenteditable is not set in read only mode
|
2017-09-05 18:35:11 +02:00 |
|
ansuz
|
6a735b441f
|
use paul's print styles
|
2017-09-05 18:16:06 +02:00 |
|
ansuz
|
b3d5e04bb4
|
lint compliance
|
2017-09-05 17:23:16 +02:00 |
|
ansuz
|
3d2a2da74e
|
add listAllTags api
|
2017-09-05 16:52:22 +02:00 |
|
yflory
|
31a6881dba
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-05 15:40:02 +02:00 |
|
yflory
|
305feebbbe
|
Fix scroll position when refreshing the drive tree
|
2017-09-05 15:39:49 +02:00 |
|
ansuz
|
0e8a26e8eb
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-05 15:37:02 +02:00 |
|
ansuz
|
1c50bb3f61
|
clear hung tooltips
|
2017-09-05 15:36:46 +02:00 |
|
yflory
|
53eb9bb541
|
Remove the logo from the filepicker loading screen
|
2017-09-05 15:34:38 +02:00 |
|
yflory
|
729c013af7
|
Get mediatag embed code from the file app
|
2017-09-05 15:08:05 +02:00 |
|
yflory
|
904936209a
|
Remove loading tips in the file picker
|
2017-09-05 11:59:42 +02:00 |
|
yflory
|
98cd69e53e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-05 11:57:54 +02:00 |
|
yflory
|
204e45dfae
|
Enable templates in pad
|
2017-09-05 11:57:44 +02:00 |
|
yflory
|
4108520d20
|
Add contacts in the new menu if the user is logged in
|
2017-09-05 11:43:16 +02:00 |
|
ansuz
|
38e1ed93e4
|
Merge branch 'code2' into staging
|
2017-09-05 11:42:00 +02:00 |
|
ansuz
|
acaf45a0e0
|
drop thumbnails if metadata is too large
|
2017-09-05 11:38:49 +02:00 |
|
yflory
|
78b338c379
|
Merge branch 'code2' into staging
|
2017-09-05 11:38:17 +02:00 |
|
yflory
|
db86a2dbee
|
Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2
|
2017-09-05 11:36:31 +02:00 |
|
yflory
|
d2787e3eff
|
Make code2 the default code app
|
2017-09-05 11:36:02 +02:00 |
|
ansuz
|
4069945bc4
|
Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2
|
2017-09-05 11:27:11 +02:00 |
|
ansuz
|
d42d988d36
|
make test more resilient
|
2017-09-05 11:26:41 +02:00 |
|
ansuz
|
cd7b00d45b
|
make pixels 100px
|
2017-09-05 11:25:47 +02:00 |
|
ansuz
|
e8ac5ed87f
|
add a test for thumbnails
|
2017-09-05 11:24:30 +02:00 |
|
ansuz
|
b1a1f4ba13
|
add encrypted thumbnails to metadata for images.
correct decryption logic
|
2017-09-05 10:57:59 +02:00 |
|
ansuz
|
b8e913c95a
|
more thumbnail methods
|
2017-09-05 10:46:00 +02:00 |
|
ansuz
|
ffbb21dd2c
|
use cryptpad-september build of media-tag
|
2017-09-05 10:43:48 +02:00 |
|
yflory
|
c0f14dea5e
|
Store code2 and set the title at the first visit
|
2017-09-04 17:09:45 +02:00 |
|
yflory
|
86e23ac19f
|
Use less2 in secure iframes
|
2017-09-04 15:09:54 +02:00 |
|
yflory
|
f12f4bb925
|
Integrate filepicker secure iframe in the code2 app
|
2017-09-01 15:17:14 +02:00 |
|
ansuz
|
1072e3e797
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-31 18:12:21 +02:00 |
|
ansuz
|
ae60b5845f
|
implement search-by-tag for filesData
|
2017-08-31 18:12:13 +02:00 |
|
ansuz
|
72ef730f23
|
implement tag-related functions
|
2017-08-31 18:06:26 +02:00 |
|
ansuz
|
0302c06d0e
|
send feedback if client does not support symbols
|
2017-08-31 18:04:20 +02:00 |
|
ansuz
|
52019dc763
|
make get and set pad attribute return only cloned data
|
2017-08-31 18:02:44 +02:00 |
|
yflory
|
89b7b644f3
|
Enable drag & upload in code2 and prepare filepicker
|
2017-08-31 16:32:26 +02:00 |
|
Caleb James DeLisle
|
e2719d9098
|
Add media-tag-nacl to cryptpad so it will be hosted on the server
|
2017-08-31 16:28:48 +02:00 |
|
yflory
|
885282ddea
|
Fix undefined friend
|
2017-08-31 15:49:20 +02:00 |
|
Caleb James DeLisle
|
a60709ff73
|
Infinite spinner popup leads to frame attempting to reload and failing
|
2017-08-30 19:23:01 +02:00 |
|
yflory
|
b8971cdc23
|
Add previewMode settings to code2
|
2017-08-30 18:47:50 +02:00 |
|
yflory
|
0d008aaa2e
|
Add indent settings to code2
|
2017-08-30 17:57:10 +02:00 |
|
yflory
|
f54dc7505c
|
Migrate indentation settings to a settings subobject
|
2017-08-30 17:19:50 +02:00 |
|
yflory
|
0893bcc0e5
|
Merge branch 'staging' into code2
|
2017-08-30 14:57:19 +02:00 |
|
yflory
|
f06683e949
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-30 12:26:23 +02:00 |
|
yflory
|
0ce32464fd
|
Fix flickering avatar in firefox
|
2017-08-30 12:26:11 +02:00 |
|
ansuz
|
9a23b77b46
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-30 11:31:59 +02:00 |
|
ansuz
|
ba0e935add
|
stub localStorage, and handle errors that might come from touching localStorage
|
2017-08-30 11:31:49 +02:00 |
|
ansuz
|
be8ea4102e
|
keep trying to parse the hash until it works
|
2017-08-30 11:26:51 +02:00 |
|
yflory
|
4db4f66786
|
Remove an unnecessary fix for Safari
|
2017-08-30 11:14:58 +02:00 |
|
yflory
|
a2ed266048
|
Move the code app in a secure iframe
|
2017-08-30 11:10:57 +02:00 |
|
Caleb James DeLisle
|
1044531806
|
Fix Safari iframe size issue
|
2017-08-30 11:04:52 +02:00 |
|
ansuz
|
a34d1793e0
|
drop 'loading' text from loading screen
|
2017-08-29 18:15:40 +02:00 |
|
ansuz
|
595fa4c2e4
|
Merge branch 'soon'
|
2017-08-29 12:00:16 +02:00 |
|
ansuz
|
181a19a9a0
|
polyfill for array.fill
|
2017-08-29 11:49:10 +02:00 |
|
yflory
|
51fa6287c1
|
Enable notifications in secure pads
|
2017-08-29 11:20:02 +02:00 |
|
yflory
|
642dc17910
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-29 11:03:05 +02:00 |
|
yflory
|
901917983b
|
Fix an issue preventing pads to be stored in the drive
|
2017-08-29 11:02:56 +02:00 |
|
ansuz
|
40f062abda
|
restore app usage report in new pad
|
2017-08-29 10:50:02 +02:00 |
|
ansuz
|
8fb7fef3f5
|
regular expressions are never falsey
|
2017-08-29 10:37:19 +02:00 |
|
ansuz
|
24eac9b4a6
|
test for flakey tests
|
2017-08-28 18:42:04 +02:00 |
|
ansuz
|
7d2a76f4d6
|
delete dead code. fix off-by-one for messages. turn off history button when history is exhausted
|
2017-08-28 18:32:43 +02:00 |
|
ansuz
|
288c03bb41
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-28 17:52:01 +02:00 |
|
Caleb James DeLisle
|
fe03e6ae83
|
bad code, lint
|
2017-08-28 17:53:23 +02:00 |
|
ansuz
|
430a6f7b77
|
lint compliance
|
2017-08-28 17:51:50 +02:00 |
|
Caleb James DeLisle
|
190dff1c9b
|
Use the bounce app for opening a link with the right click
|
2017-08-28 17:50:55 +02:00 |
|
yflory
|
dec870d2bd
|
Fix selection in the drive search results
|
2017-08-28 17:43:26 +02:00 |
|
yflory
|
4bceef8952
|
Fix the upload status table missing in the drive
|
2017-08-28 17:35:24 +02:00 |
|
yflory
|
0b4e044540
|
Fix the plugin to open a link in a new tab in pad
|
2017-08-28 17:26:51 +02:00 |
|
yflory
|
d9a4a32bf9
|
Fix avatar for anonymous users in secure pads
|
2017-08-28 16:57:10 +02:00 |
|
yflory
|
00fda0d7d7
|
Fix avatar in read-only mode (secure pads)
|
2017-08-28 16:49:28 +02:00 |
|
yflory
|
88cb4fd83c
|
Enable friend requests from secure pads
|
2017-08-28 16:21:05 +02:00 |
|
yflory
|
147d88d845
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-28 15:13:30 +02:00 |
|
yflory
|
e43c68aa48
|
Fix viewers number in secure iframe
|
2017-08-28 15:13:16 +02:00 |
|
yflory
|
f89015d9ed
|
Update the tab title to match the pad title in pad2
|
2017-08-28 14:49:33 +02:00 |
|
ansuz
|
1280cd1659
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-28 14:49:01 +02:00 |
|
yflory
|
51c065d13c
|
Fix link to main in the new toolbar
|
2017-08-28 14:18:33 +02:00 |
|
yflory
|
d9bf2abcd8
|
Fix old hashes not working anymore in pad
|
2017-08-28 13:53:24 +02:00 |
|
ansuz
|
536fe04790
|
emit notification when alert, confirm, or prompt are called
|
2017-08-28 13:46:28 +02:00 |
|
Caleb James DeLisle
|
e4a356d873
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-28 12:25:12 +02:00 |
|
Caleb James DeLisle
|
056285a7b6
|
Move pad2 to pad and create bounce app
|
2017-08-28 12:25:05 +02:00 |
|
yflory
|
d4589c4699
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-28 12:22:38 +02:00 |
|
yflory
|
6c65e5ff72
|
Fix the ghost icon in the drive and add missing text
|
2017-08-28 12:22:31 +02:00 |
|
ansuz
|
5fbbaee2f5
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-28 11:48:02 +02:00 |
|
ansuz
|
6314487d98
|
handle unfriends in ui
|
2017-08-28 11:47:54 +02:00 |
|
ansuz
|
5c2b58e703
|
log error synchronously so we get a trace when pinPads has no callback
|
2017-08-28 11:47:01 +02:00 |
|
ansuz
|
841e3af8da
|
handle unfriends. clean up. better input validation
|
2017-08-28 11:46:05 +02:00 |
|
ansuz
|
c66a0c55e0
|
ensure that function signatures are correct
|
2017-08-28 11:40:31 +02:00 |
|
ansuz
|
91f6e3e543
|
remove a lot of dead code
|
2017-08-28 11:28:45 +02:00 |
|
Caleb James DeLisle
|
e62faf7c7b
|
Edge fix, always use async iframe onLoad rather than invoking it manually
|
2017-08-28 11:22:57 +02:00 |
|
ansuz
|
54eefd3d94
|
replace contacts with contacts2
|
2017-08-25 16:07:53 +02:00 |
|
ansuz
|
57d0c6c973
|
Merge branch 'new-messaging' into staging
|
2017-08-25 14:42:34 +02:00 |
|
ansuz
|
9e04d039d7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-25 14:42:23 +02:00 |
|
ansuz
|
22d754d514
|
handle user renames
|
2017-08-25 14:42:05 +02:00 |
|
Caleb James DeLisle
|
0a6f81850f
|
Handle infinite-spinner errors and properly inform the user
|
2017-08-25 14:24:43 +02:00 |
|
ansuz
|
a99eb9365e
|
correctly set indentation preferences when changing languages
|
2017-08-24 17:31:04 +02:00 |
|
ansuz
|
f58d4c941f
|
clean up a bit
|
2017-08-24 17:19:57 +02:00 |
|
ansuz
|
ea5f47f0f9
|
remove some TODOs and solve some wee bugs
|
2017-08-24 17:18:59 +02:00 |
|
ansuz
|
b75a951a98
|
encode messages with 'author' field instead of 'channel'
|
2017-08-24 17:14:03 +02:00 |
|
Caleb James DeLisle
|
7bbea28831
|
minor anti-xss changes...
|
2017-08-24 13:53:42 +02:00 |
|
ansuz
|
013b75ae67
|
implement history range requests
|
2017-08-24 11:34:05 +02:00 |
|
ansuz
|
b71f1860db
|
make uid function reusable
|
2017-08-24 11:31:20 +02:00 |
|
ansuz
|
443d8a8941
|
remove unnecessary files
|
2017-08-24 11:29:42 +02:00 |
|
Caleb James DeLisle
|
75fde58846
|
Well that was stupid... (fix bug introduced in acfaaa7d56 when trying to make jshint compliance)
|
2017-08-23 16:18:47 +02:00 |
|
Caleb James DeLisle
|
dc283c2d74
|
Load 1, load 2... not load 1, load 3.
|
2017-08-23 15:49:51 +02:00 |
|
Caleb James DeLisle
|
5d9599c9b7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-23 12:15:01 +02:00 |
|
Caleb James DeLisle
|
cbac5e417c
|
Make loading screen come much earlier on pad2
|
2017-08-23 12:14:51 +02:00 |
|
yflory
|
b6881349be
|
Fix an issue with the notifications in secure pads
|
2017-08-23 11:39:53 +02:00 |
|
yflory
|
ec64ac485d
|
Fix 'not a function' error
|
2017-08-23 11:06:55 +02:00 |
|
Caleb James DeLisle
|
acfaaa7d56
|
jshint compliance
|
2017-08-23 11:04:44 +02:00 |
|
Caleb James DeLisle
|
2ad9fcee17
|
Manual merge of notify.js
|
2017-08-23 10:45:55 +02:00 |
|
Caleb James DeLisle
|
8a9755611a
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-23 10:21:53 +02:00 |
|
Caleb James DeLisle
|
2dacd57e76
|
fix caching on favicon
|
2017-08-23 10:21:41 +02:00 |
|
yflory
|
33025a9df9
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-22 18:19:06 +02:00 |
|
yflory
|
c33b128bf4
|
Enable feedback in pad2
|
2017-08-22 18:18:58 +02:00 |
|
yflory
|
e81bb3fe08
|
Fix profile link in the userlist
|
2017-08-22 18:18:48 +02:00 |
|
yflory
|
d6c33fdf4f
|
Ghost icon to add a pad
|
2017-08-22 17:33:48 +02:00 |
|
ansuz
|
89a13d4b21
|
work on contacts2 until feature parity is reached
|
2017-08-22 15:55:49 +02:00 |
|
ansuz
|
002eed0d6f
|
make most of the messenger api async
|
2017-08-22 15:55:00 +02:00 |
|
Caleb James DeLisle
|
d9f5e3638e
|
Big caching improvements :D
|
2017-08-22 15:50:10 +02:00 |
|
yflory
|
98daf10ed1
|
Ability to collapse the root directory in the drive
|
2017-08-22 14:54:41 +02:00 |
|
yflory
|
b4864b96ac
|
Add a recent pads category in the drive
|
2017-08-22 14:28:17 +02:00 |
|
Caleb James DeLisle
|
4f3b4a30ee
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-21 18:38:16 +02:00 |
|
Caleb James DeLisle
|
4b70fc9f49
|
Use resources from the original origin in pad2
|
2017-08-21 18:38:07 +02:00 |
|
yflory
|
20a68ad71c
|
Hide the template button if the pad2 is a template
|
2017-08-21 18:31:15 +02:00 |
|
yflory
|
aa9e0d3cd3
|
Enable AppConfig in pad2
|
2017-08-21 18:30:51 +02:00 |
|
yflory
|
4089803785
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-21 18:22:08 +02:00 |
|
yflory
|
f40d2c0b20
|
Add templates to pad2
|
2017-08-21 18:21:53 +02:00 |
|
yflory
|
8d020833af
|
Add missing file
|
2017-08-21 18:21:25 +02:00 |
|
Caleb James DeLisle
|
bffa4d01a8
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-21 18:08:46 +02:00 |
|
Caleb James DeLisle
|
b081603455
|
Update requirejs
|
2017-08-21 18:08:37 +02:00 |
|
yflory
|
8d837d22ea
|
Add history to pad2
|
2017-08-21 17:40:21 +02:00 |
|
yflory
|
b2e6df1f9d
|
Add import & export in pad2
|
2017-08-21 15:34:21 +02:00 |
|
yflory
|
1da11a1883
|
Disable edition in readonly mode in pad2
|
2017-08-21 15:30:48 +02:00 |
|
yflory
|
e2d39de143
|
Forget button in pad2
|
2017-08-21 15:20:38 +02:00 |
|
yflory
|
e4020ba8d4
|
Fix pad creation in pad2
|
2017-08-21 14:41:56 +02:00 |
|
yflory
|
140c6f3776
|
Add limit warning in pad2
|
2017-08-21 12:24:33 +02:00 |
|
yflory
|
30aef71603
|
Enable avatars in pad2
|
2017-08-21 12:01:38 +02:00 |
|
yflory
|
f88a6f63fe
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-21 11:08:38 +02:00 |
|
yflory
|
fb4808e1e1
|
Fix queries callback arguments
|
2017-08-21 11:08:27 +02:00 |
|
Caleb James DeLisle
|
6dd1643738
|
Manual merge work done on loading page to pad2
|
2017-08-21 10:53:40 +02:00 |
|
Caleb James DeLisle
|
8b702e0150
|
wip
|
2017-08-21 10:34:49 +02:00 |
|
yflory
|
e65b2f4e9f
|
Add shareButton to pad2
|
2017-08-18 18:43:04 +02:00 |
|
yflory
|
beb45740d0
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-18 16:34:50 +02:00 |
|
yflory
|
90f892de9c
|
Useradmin menu, notifications and share button in pad2
|
2017-08-18 16:34:41 +02:00 |
|
ansuz
|
253ab68d8d
|
Merge branch 'staging' into new-messaging
|
2017-08-18 15:31:06 +02:00 |
|
Caleb James DeLisle
|
498c8229e9
|
Make following a link inside of the iframe only fail rather than carrying the iframe away from the pad.
|
2017-08-18 14:12:30 +02:00 |
|
ansuz
|
0693a98890
|
create a thumbnail when uploading images from whiteboard
|
2017-08-18 12:53:02 +02:00 |
|
ansuz
|
b17044ad98
|
add support for thumbnails in metadata
|
2017-08-18 12:47:04 +02:00 |
|
yflory
|
dd9b38066e
|
Change display name in useradmin menu
|
2017-08-18 11:07:42 +02:00 |
|
yflory
|
a96d447e8b
|
Add notifications in pad2
|
2017-08-18 10:47:30 +02:00 |
|
Pierre Bondoerffer
|
5e22e1dc59
|
use CryptPad instead of Cryptpad in titles
|
2017-08-17 20:47:39 +02:00 |
|
Caleb James DeLisle
|
cf6d8c83b2
|
Fix title setter logic and separate it from UI
|
2017-08-17 19:58:48 +02:00 |
|
Caleb James DeLisle
|
ec87f3f897
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-17 19:01:40 +02:00 |
|
Caleb James DeLisle
|
415399ef64
|
Changes to support title change in metadata
|
2017-08-17 19:01:33 +02:00 |
|
yflory
|
d1affebd14
|
Title in pad2
|
2017-08-17 19:01:03 +02:00 |
|
yflory
|
604415b32c
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-17 18:29:24 +02:00 |
|
yflory
|
fab3d67b75
|
Enable title in pad2
|
2017-08-17 18:28:05 +02:00 |
|
Caleb James DeLisle
|
909bda4302
|
This should fix laxy metadata
|
2017-08-17 18:26:58 +02:00 |
|
ansuz
|
a4dbf39c4a
|
fix pdf display problems in chrome
|
2017-08-17 18:11:46 +02:00 |
|
Caleb James DeLisle
|
2490ee253f
|
Added setDisplayName RPC
|
2017-08-17 18:09:17 +02:00 |
|
yflory
|
887a26b1a6
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-17 17:34:47 +02:00 |
|
Caleb James DeLisle
|
0b34ceb0eb
|
Added RPC setPadTitleInDrive()
|
2017-08-17 17:34:08 +02:00 |
|
ansuz
|
bed7d95bf3
|
use latest compiled cryptpad media-tag
|
2017-08-17 17:31:52 +02:00 |
|
ansuz
|
4e62f79594
|
stop referring to deleted file as background image
|
2017-08-17 17:31:18 +02:00 |
|
ansuz
|
3a5526e247
|
infer pdfjs document title from iframe url
|
2017-08-17 17:30:28 +02:00 |
|
yflory
|
25466aa2f9
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-17 17:26:27 +02:00 |
|
yflory
|
1d237735ef
|
Useradmin menu in pad2
|
2017-08-17 17:26:20 +02:00 |
|
Caleb James DeLisle
|
3b5af3ea74
|
sframe common changes
|
2017-08-17 16:56:18 +02:00 |
|
yflory
|
d1157c4d72
|
Add missing file
|
2017-08-17 16:28:54 +02:00 |
|
yflory
|
d237c76f6c
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-17 16:25:31 +02:00 |
|
yflory
|
f5855a2870
|
Add account name in metadata manager
|
2017-08-17 16:25:25 +02:00 |
|
Caleb James DeLisle
|
3c0197cbf4
|
Firefox fails to boot the iframe if there is no number on setInterval
|
2017-08-17 16:17:57 +02:00 |
|
yflory
|
d88704fb50
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-17 15:44:41 +02:00 |
|
Caleb James DeLisle
|
a4850a7fcc
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-17 15:42:28 +02:00 |
|
yflory
|
fc5bdd3bed
|
Add lazy metadata to fix parse errors in pad2
|
2017-08-17 15:42:26 +02:00 |
|
Caleb James DeLisle
|
ad9f2ff223
|
Made pad2 server more generic and easy to implement
|
2017-08-17 15:41:04 +02:00 |
|
ansuz
|
a125253cde
|
lint compliance
|
2017-08-17 15:13:05 +02:00 |
|
ansuz
|
290763d6c5
|
don't complain about bad realtime state just because you disconnected
|
2017-08-17 15:07:34 +02:00 |
|
yflory
|
226ef1fd00
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-17 14:55:53 +02:00 |
|
yflory
|
fb512c8923
|
Toolbar in pad2
|
2017-08-17 14:55:44 +02:00 |
|
ansuz
|
3b20dcd435
|
add optional cache-busting to favicon
|
2017-08-17 14:34:22 +02:00 |
|
ansuz
|
52d344c3d1
|
Merge branch 'soon'
|
2017-08-17 12:53:04 +02:00 |
|
ansuz
|
ee874878dd
|
clear tooltips when the userlist is redrawn
|
2017-08-17 12:50:40 +02:00 |
|
ansuz
|
f207edfd28
|
handle errors when deriving keys. fix incorrect reference
|
2017-08-17 12:50:12 +02:00 |
|
Caleb James DeLisle
|
e04c0b89a1
|
manual merge of staging
|
2017-08-17 12:14:19 +02:00 |
|
ansuz
|
5b7d1cccd7
|
fix display and logic for tab setting checkbox
|
2017-08-16 15:32:42 +02:00 |
|
Caleb James DeLisle
|
3315449114
|
Lets try this...
|
2017-08-16 14:30:17 +02:00 |
|
Caleb James DeLisle
|
4c949a61e7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 12:40:34 +02:00 |
|
Caleb James DeLisle
|
6b174934c8
|
Try waiting for iframe document.onload instead of looping and waiting for document.body to exist.
|
2017-08-16 12:40:15 +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
|
2874ccb5dc
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 12:15:20 +02:00 |
|
ansuz
|
2a8abc2699
|
comment out splitter code
|
2017-08-16 12:15:08 +02:00 |
|
Caleb James DeLisle
|
725e19925c
|
Yeah, that was silly...
|
2017-08-16 12:11:25 +02:00 |
|
Caleb James DeLisle
|
b0b1ed037c
|
Add a filter to catch XSS-like entities and also stub a on-load test which would otherwise make pads inaccessable.
|
2017-08-16 10:19:24 +02:00 |
|
ansuz
|
130b330ede
|
refactor messaging
|
2017-08-16 10:04:50 +02:00 |
|
Caleb James DeLisle
|
638a94785f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-14 16:24:17 +02:00 |
|
Caleb James DeLisle
|
7ca60e55a7
|
Lock the pad's inner-iframe down with CSP
|
2017-08-14 16:23:38 +02:00 |
|
ansuz
|
5e6e76dfc1
|
make regex case insensitive
|
2017-08-14 14:41:23 +02:00 |
|
ansuz
|
736288a85b
|
lint compliance
|
2017-08-14 14:02:57 +02:00 |
|
ansuz
|
5037f444e9
|
update markdown sanitization strategy
|
2017-08-14 13:12:43 +02:00 |
|
Caleb James DeLisle
|
878a565f89
|
tiny little performance improvement in something that really doesn't need it
|
2017-08-11 17:34:51 +02:00 |
|
Caleb James DeLisle
|
007db0b080
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-11 17:28:42 +02:00 |
|
Caleb James DeLisle
|
7a698d092e
|
When Cryptpad.clearTooltips() gets called, don't clear tooltips unless their associated element has gone missing so it won't clear a tip someone is trying to read.
|
2017-08-11 17:28:23 +02:00 |
|
ansuz
|
66cacf08da
|
allow users to write with tabs instead of spaces
|
2017-08-11 15:21:26 +02:00 |
|
ansuz
|
64849507b3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-11 14:26:34 +02:00 |
|
Pierre Bondoerffer
|
a5f9b49bfb
|
make poll box bigger so it show text in smaller windows
|
2017-08-11 13:09:34 +02:00 |
|
Pierre Bondoerffer
|
82fadde249
|
restyle info-box in drive
|
2017-08-11 13:04:03 +02:00 |
|
ansuz
|
958294f109
|
put code settings in their own tab
|
2017-08-11 13:00:50 +02:00 |
|
Pierre Bondoerffer
|
c8d7675ede
|
remove z-index on splitter in code
|
2017-08-11 12:56:42 +02:00 |
|
Pierre Bondoerffer
|
17b986a6ca
|
fix toolbar drive link (oops)
|
2017-08-11 12:56:06 +02:00 |
|
ansuz
|
ae0b2ca1a8
|
add label for code indentation
|
2017-08-11 12:55:10 +02:00 |
|
ansuz
|
284124a32d
|
WIP
|
2017-08-11 10:59:54 +02:00 |
|
Caleb James DeLisle
|
4acd9957a9
|
Set the url if there is none
|
2017-08-11 10:40:57 +02:00 |
|
Caleb James DeLisle
|
33e73dd5e5
|
fixed one last fight
|
2017-08-10 21:40:34 +02:00 |
|
Caleb James DeLisle
|
9c0b0cc6a8
|
Merge branch 'staging' into pad2
|
2017-08-10 18:39:16 +02:00 |
|
Caleb James DeLisle
|
1e56fa31c0
|
yay, they talk and they don't fight
|
2017-08-10 18:31:44 +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 |
|
Caleb James DeLisle
|
b3d349bf80
|
Merge branch 'staging' into pad2
|
2017-08-10 14:53:12 +02:00 |
|
Caleb James DeLisle
|
8efac4e661
|
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
|
2017-08-10 14:49:41 +02:00 |
|
Caleb James DeLisle
|
0dde1d7507
|
wip
|
2017-08-10 14:49:21 +02:00 |
|
Pierre Bondoerffer
|
baf64114a6
|
point to homepage in drive
|
2017-08-10 14:45:56 +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 |
|
Caleb James DeLisle
|
c304071492
|
wip
|
2017-08-09 17:37:55 +02:00 |
|
Caleb James DeLisle
|
e49a42db18
|
Merge branch 'staging' into pad2
|
2017-08-09 16:28:51 +02:00 |
|
Caleb James DeLisle
|
1f9bd866c3
|
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
|
2017-08-09 16:06:46 +02:00 |
|
Pierre Bondoerffer
|
edad5deeac
|
fix logo not showing sometimes in chrome
|
2017-08-09 16:06:29 +02:00 |
|
Pierre Bondoerffer
|
c036bb26be
|
use proper bootstrap class
|
2017-08-09 15:46:17 +02:00 |
|
Caleb James DeLisle
|
52565076b9
|
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
|
2017-08-09 14:48:06 +02:00 |
|
Caleb James DeLisle
|
4b25ab80d6
|
wip
|
2017-08-09 14:45:39 +02:00 |
|
Pierre Bondoerffer
|
b34e252eda
|
improve whiteboard styles
|
2017-08-09 14:43:32 +02:00 |
|
ansuz
|
844967a880
|
continued refactoring
|
2017-08-09 14:20:37 +02:00 |
|
Pierre Bondoerffer
|
8b2cb37c2f
|
improve poll looks
|
2017-08-09 12:33:40 +02:00 |
|
Pierre Bondoerffer
|
5821d3e72f
|
remove useless title
|
2017-08-09 11:25:58 +02:00 |
|
Pierre Bondoerffer
|
a4aeada585
|
make the file dialog placeholder visible, center file list
|
2017-08-09 11:20:46 +02:00 |
|
Pierre Bondoerffer
|
d47e26efd5
|
add margin in code
|
2017-08-09 11:17:14 +02:00 |
|
Pierre Bondoerffer
|
e08ed72653
|
generate the tooltip after the button
|
2017-08-09 11:11:53 +02:00 |
|
Pierre Bondoerffer
|
665e81912e
|
put the tooltip on the actual button to prevent tippy from popping when not intended
|
2017-08-09 11:06:06 +02:00 |
|
Pierre Bondoerffer
|
34ba673cd3
|
improve file upload UI
|
2017-08-09 10:54:20 +02:00 |
|
ansuz
|
34a5a32c44
|
lint compliance
|
2017-08-08 20:29:02 +02:00 |
|
ansuz
|
cdf3cee9c8
|
split out message rendering into ui
|
2017-08-08 18:21:03 +02:00 |
|
ansuz
|
fcdfa52aa9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-08 17:13:38 +02:00 |
|
ansuz
|
58b3b32cc3
|
big messaging refactor. split UI from logic
|
2017-08-08 17:13:10 +02:00 |
|
Pierre Bondoerffer
|
6ca6755d02
|
more missing titles in toolbar
|
2017-08-08 16:51:23 +02:00 |
|
Pierre Bondoerffer
|
2cc6c636db
|
Add some missing titles
|
2017-08-08 16:20:31 +02:00 |
|
Pierre Bondoerffer
|
d3f2398865
|
bump tippy to 1.2.0, add dynamicTitle option
|
2017-08-08 16:19:44 +02:00 |
|
ansuz
|
8301bd44be
|
Merge pull request #164 from pbondoer/staging
UI improvements
|
2017-08-08 14:46:25 +02:00 |
|
Pierre Bondoerffer
|
85e383d5c5
|
add invisible splitter
|
2017-08-08 14:36:04 +02:00 |
|
Pierre Bondoerffer
|
90075cd48e
|
media-tag to less file
|
2017-08-08 12:01:39 +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 |
|
Pierre Bondoerffer
|
f585ddccdf
|
fix image sizes in /slide/
|
2017-08-08 11:44:01 +02:00 |
|
ansuz
|
fc95f1b6a8
|
lint compliance
|
2017-08-08 10:32:25 +02:00 |
|
ansuz
|
ba9696ba33
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-08 10:03:54 +02:00 |
|
Caleb James DeLisle
|
a612f02be2
|
Merge branch 'staging' into pad2
|
2017-08-07 17:49:03 +02:00 |
|
ansuz
|
c63807fd2b
|
implement channel.send
|
2017-08-07 17:24:16 +02:00 |
|
Caleb James DeLisle
|
35a55a15ed
|
wip
|
2017-08-07 17:23:28 +02:00 |
|
ansuz
|
d835005905
|
simplify in-memory message format
|
2017-08-07 17:22:56 +02:00 |
|
Pierre Bondoerffer
|
8f285eba9f
|
make file picker ui even prettier
|
2017-08-07 17:22:54 +02:00 |
|
ansuz
|
797cc2b105
|
handle messages which fail to decrypt
|
2017-08-07 17:21:23 +02:00 |
|
Caleb James DeLisle
|
65dfd99171
|
major wip
|
2017-08-07 16:27:57 +02:00 |
|
Pierre Bondoerffer
|
c53e738054
|
improve file picker ui
|
2017-08-07 16:27:29 +02:00 |
|
Pierre Bondoerffer
|
798a3dc520
|
automatically fill in display name in poll
|
2017-08-07 12:19:21 +02:00 |
|
Pierre Bondoerffer
|
0588564bc9
|
overflow on poll div
|
2017-08-07 11:49:10 +02:00 |
|
Pierre Bondoerffer
|
be29236af1
|
fix pdfjs styles
|
2017-08-07 10:47:30 +02:00 |
|
ansuz
|
bad5160885
|
fix bad reference
|
2017-08-05 09:14:36 +02:00 |
|
ansuz
|
05aa5ed347
|
hide new feature until it is finished
|
2017-08-04 18:07:47 +02:00 |
|
ansuz
|
395f6e1b27
|
reset confirm text for alertify
|
2017-08-04 15:54:15 +02:00 |
|
ansuz
|
dd6a057962
|
add 'msg' class for pierre
|
2017-08-04 15:45:30 +02:00 |
|
ansuz
|
9865359bb0
|
don't tell users about new versions
|
2017-08-04 14:05:00 +02:00 |
|
ansuz
|
c8c44d3bfc
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-04 11:22:22 +02:00 |
|
Caleb James DeLisle
|
0d1f19f5d4
|
Big manual merge
|
2017-08-04 11:20:17 +02:00 |