88914ec6cc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
8a09e39f46
Enable tags in pads
7 years ago
d2b27f3588
resolve merge conflicts
7 years ago
4af01e6e9e
make listmap consume cpNfInner
7 years ago
6fdd66167a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
732585ea7b
Sandboxed iframe for the whiteboard app
7 years ago
d72146ba7f
use setAttribute for assigning attributes in hyperscript
7 years ago
a1e7bf701d
Select the element after clicking 'show in folder' in the drive search
7 years ago
1131ef0172
Fix language selection in sandboxed iframes
7 years ago
018f71df04
Add drop handlers for mediatags in ckeditor
7 years ago
08e0ae424d
log errors in less compilation
7 years ago
5b45e92250
delete range requests after they have completed
7 years ago
47ce645897
implement slice
7 years ago
6ed4f2fc64
fix a thing
7 years ago
8a564bf350
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
513f8e73d4
refactor cryptpad.ready to use nthen
7 years ago
b643ccc232
typo
7 years ago
652c916690
change the command in the documentation so that it will not change itself
7 years ago
845f75f8a7
remove a 100ms dead spot from page load
7 years ago
b24e9b84af
Manual merge, update the CSS in loading.js and document that loading.less does nothing.
7 years ago
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
7 years ago
4d688289cc
lint-compliance
7 years ago
2797a77f5d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
47cfa0cf45
Focus the editable content when opening a codemirror pad
7 years ago
f039fc7ff5
develop a system for avoiding z-index problems
7 years ago
bafa401473
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
fbd4be6135
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
d360e2d0f4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ab64bf9e59
Use less2 for the loading screen
7 years ago
710418f42f
Make LessLoader able to cache even inside of the sandbox iframe and don't load less compiler unless needed
7 years ago
a332168926
fix some bugs in prompts, alerts, confirms
7 years ago
0db33d48fc
properly handle variable args in Cryptpad.alert
7 years ago
0d8c292fef
Merge branches 'staging' and 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
789a923792
Change font-awesome to be pulled through LessLoader which will rewrite the font file URLs to use ver= parameter
7 years ago
d46cc8226d
Update LessLoader to be capable of loading CSS as well as less files and properly rewrite the URLs
7 years ago
e1f090bb9d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
244e3ecba7
support forefront flag in alert config
7 years ago
63cb5dfc1e
Make less loader rewrite urls to use version parameter
7 years ago
d967df2cec
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
e3c0ec29f7
Hopefully chase out a race in sframe-channel
7 years ago
8c41e0bdd6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
437f50fd4a
Migrate the file to a sandboxed iframe
7 years ago
1713167a5d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
981a919328
Added tooltips back to sframe land with hopefully a more robust removal.
7 years ago
7d720c73a9
Merge branch 'soon'
7 years ago
ddbda08c88
Fix an issue when cleaning the template category in the drive
7 years ago
9d229b8868
lint compliance
7 years ago
a87ccdc37e
remove redundant lines
7 years ago
da0e31fa54
guard against possible type errors
7 years ago
a0b3201df3
fix focus on alerts, prompts, and confirms. call back from alerts
7 years ago
5a4836fe6d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
79094aa4bb
Fix closing the title input when the title is not modified
7 years ago
58c38dd77b
focus on the current window when you pop an alert
7 years ago
b9545f45f7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
306fec2d0e
improve messages for template picker confirm
7 years ago
1943c83f69
clean up api for Cryptpad.confirm
7 years ago
8d3ebdbaf7
I'm stupid
7 years ago
041071e61c
manual merge
7 years ago
7334173b4a
Hopefully fix infinite spinner whenever there is a disconnect (pad)
7 years ago
304a8df808
Remove unneeded migration and fix attributes migration
7 years ago
5a1abc8986
let's try using actual js syntax
7 years ago
134c6057c1
Merge branch 'slide2' of github.com:xwiki-labs/cryptpad into origin/slide2
7 years ago
59d25b4c1a
use camel case, not snek case
7 years ago
520b8967fd
allow people with short passwords to log in
7 years ago
5bf966633c
Merge branch 'staging' into slide2
7 years ago
514bff7065
Add slide number in the title in slide2
7 years ago
0ed6846e07
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
b5b9f931c7
don't use common-realtime
7 years ago
32e8c8ef4b
implement alertify without alertify
7 years ago
c3a07e879c
Merge branch 'staging' into slide2
7 years ago
fc069dac48
Ask the user before loading the template picker
7 years ago
05793c220c
Fix secure iframes on Edge
7 years ago
290d668ceb
Fix race condition preventing slide to work on Edge
7 years ago
739903d511
don't check account usage if you aren't logged in
7 years ago
bbf7ed3827
refactor drive to use dialog.selectable()
...
fix class on alertify-like boxes
7 years ago
f2aaaa9751
Move slide to secure iframe
7 years ago
809b56625d
refactor ui elements
7 years ago
bca9ba66cb
enforce a configurable minimum password length when registering
7 years ago
fab6264ce6
use loading screen from pages.js
7 years ago
e8298f165a
only display first letter of name if user has no avatar
7 years ago
85003f7a23
lint compliance
7 years ago
cca3c04d43
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
15e24ebe4f
ui for hashtag picker
7 years ago
1b97996ef8
implement util.once
7 years ago
0423a5f4e2
Clean secure iframe code
7 years ago
04a04aef2b
Add setAttribute/getAttribute in secure iframes. Store attributes in settings
7 years ago
61b228db79
Fix double / when storing a file
7 years ago
3ca9f41290
Get embed code for pad and code
7 years ago
0bb6698399
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
e85b34f127
Add embed options in the secure pad hashes
7 years ago
b3d5e04bb4
lint compliance
7 years ago
3d2a2da74e
add listAllTags api
7 years ago
0e8a26e8eb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
1c50bb3f61
clear hung tooltips
7 years ago
53eb9bb541
Remove the logo from the filepicker loading screen
7 years ago
729c013af7
Get mediatag embed code from the file app
7 years ago
4108520d20
Add contacts in the new menu if the user is logged in
7 years ago
78b338c379
Merge branch 'code2' into staging
7 years ago
db86a2dbee
Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2
7 years ago
d2787e3eff
Make code2 the default code app
7 years ago
4069945bc4
Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2
7 years ago
cd7b00d45b
make pixels 100px
7 years ago
b1a1f4ba13
add encrypted thumbnails to metadata for images.
...
correct decryption logic
7 years ago
b8e913c95a
more thumbnail methods
7 years ago
ffbb21dd2c
use cryptpad-september build of media-tag
7 years ago
86e23ac19f
Use less2 in secure iframes
7 years ago
f12f4bb925
Integrate filepicker secure iframe in the code2 app
7 years ago
1072e3e797
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ae60b5845f
implement search-by-tag for filesData
7 years ago
72ef730f23
implement tag-related functions
7 years ago
0302c06d0e
send feedback if client does not support symbols
7 years ago
52019dc763
make get and set pad attribute return only cloned data
7 years ago
89b7b644f3
Enable drag & upload in code2 and prepare filepicker
7 years ago
e2719d9098
Add media-tag-nacl to cryptpad so it will be hosted on the server
7 years ago
885282ddea
Fix undefined friend
7 years ago
a60709ff73
Infinite spinner popup leads to frame attempting to reload and failing
7 years ago
b8971cdc23
Add previewMode settings to code2
7 years ago
0d008aaa2e
Add indent settings to code2
7 years ago
f54dc7505c
Migrate indentation settings to a settings subobject
7 years ago
0893bcc0e5
Merge branch 'staging' into code2
7 years ago
f06683e949
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
0ce32464fd
Fix flickering avatar in firefox
7 years ago
ba0e935add
stub localStorage, and handle errors that might come from touching localStorage
7 years ago
be8ea4102e
keep trying to parse the hash until it works
7 years ago
a2ed266048
Move the code app in a secure iframe
7 years ago
a34d1793e0
drop 'loading' text from loading screen
7 years ago
181a19a9a0
polyfill for array.fill
7 years ago
51fa6287c1
Enable notifications in secure pads
7 years ago
642dc17910
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
901917983b
Fix an issue preventing pads to be stored in the drive
7 years ago
8fb7fef3f5
regular expressions are never falsey
7 years ago
24eac9b4a6
test for flakey tests
7 years ago
7d2a76f4d6
delete dead code. fix off-by-one for messages. turn off history button when history is exhausted
7 years ago
430a6f7b77
lint compliance
7 years ago
d9a4a32bf9
Fix avatar for anonymous users in secure pads
7 years ago
00fda0d7d7
Fix avatar in read-only mode (secure pads)
7 years ago
88cb4fd83c
Enable friend requests from secure pads
7 years ago
147d88d845
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
e43c68aa48
Fix viewers number in secure iframe
7 years ago
f89015d9ed
Update the tab title to match the pad title in pad2
7 years ago
1280cd1659
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
51c065d13c
Fix link to main in the new toolbar
7 years ago
d9bf2abcd8
Fix old hashes not working anymore in pad
7 years ago
536fe04790
emit notification when alert, confirm, or prompt are called
7 years ago
d4589c4699
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
6c65e5ff72
Fix the ghost icon in the drive and add missing text
7 years ago
5c2b58e703
log error synchronously so we get a trace when pinPads has no callback
7 years ago
841e3af8da
handle unfriends. clean up. better input validation
7 years ago
c66a0c55e0
ensure that function signatures are correct
7 years ago
91f6e3e543
remove a lot of dead code
7 years ago
57d0c6c973
Merge branch 'new-messaging' into staging
7 years ago
9e04d039d7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
22d754d514
handle user renames
7 years ago
0a6f81850f
Handle infinite-spinner errors and properly inform the user
7 years ago
f58d4c941f
clean up a bit
7 years ago
b75a951a98
encode messages with 'author' field instead of 'channel'
7 years ago
7bbea28831
minor anti-xss changes...
7 years ago
013b75ae67
implement history range requests
7 years ago
b71f1860db
make uid function reusable
7 years ago
75fde58846
Well that was stupid... (fix bug introduced in acfaaa7d56 when trying to make jshint compliance)
7 years ago
5d9599c9b7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
cbac5e417c
Make loading screen come much earlier on pad2
7 years ago
b6881349be
Fix an issue with the notifications in secure pads
7 years ago
ec64ac485d
Fix 'not a function' error
7 years ago
acfaaa7d56
jshint compliance
7 years ago
2ad9fcee17
Manual merge of notify.js
7 years ago
8a9755611a
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
2dacd57e76
fix caching on favicon
7 years ago
33025a9df9
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
c33b128bf4
Enable feedback in pad2
7 years ago
e81bb3fe08
Fix profile link in the userlist
7 years ago
002eed0d6f
make most of the messenger api async
7 years ago
d9f5e3638e
Big caching improvements :D
7 years ago
b4864b96ac
Add a recent pads category in the drive
7 years ago
4f3b4a30ee
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
4b70fc9f49
Use resources from the original origin in pad2
7 years ago
aa9e0d3cd3
Enable AppConfig in pad2
7 years ago
f40d2c0b20
Add templates to pad2
7 years ago
8d020833af
Add missing file
7 years ago
8d837d22ea
Add history to pad2
7 years ago
b2e6df1f9d
Add import & export in pad2
7 years ago
e2d39de143
Forget button in pad2
7 years ago
e4020ba8d4
Fix pad creation in pad2
7 years ago
140c6f3776
Add limit warning in pad2
7 years ago
30aef71603
Enable avatars in pad2
7 years ago
f88a6f63fe
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
fb4808e1e1
Fix queries callback arguments
7 years ago
6dd1643738
Manual merge work done on loading page to pad2
7 years ago
8b702e0150
wip
7 years ago
e65b2f4e9f
Add shareButton to pad2
7 years ago
beb45740d0
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
90f892de9c
Useradmin menu, notifications and share button in pad2
7 years ago
253ab68d8d
Merge branch 'staging' into new-messaging
7 years ago
498c8229e9
Make following a link inside of the iframe only fail rather than carrying the iframe away from the pad.
7 years ago
0693a98890
create a thumbnail when uploading images from whiteboard
7 years ago
b17044ad98
add support for thumbnails in metadata
7 years ago
dd9b38066e
Change display name in useradmin menu
7 years ago
a96d447e8b
Add notifications in pad2
7 years ago
cf6d8c83b2
Fix title setter logic and separate it from UI
7 years ago
ec87f3f897
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
yflory