Caleb James DeLisle
|
041071e61c
|
manual merge
|
7 years ago |
|
Caleb James DeLisle
|
7334173b4a
|
Hopefully fix infinite spinner whenever there is a disconnect (pad)
|
7 years ago |
|
yflory
|
9271b0c1a8
|
Try to fix half-codemirror bug
|
7 years ago |
|
yflory
|
304a8df808
|
Remove unneeded migration and fix attributes migration
|
7 years ago |
|
ansuz
|
5a1abc8986
|
let's try using actual js syntax
|
7 years ago |
|
ansuz
|
134c6057c1
|
Merge branch 'slide2' of github.com:xwiki-labs/cryptpad into origin/slide2
|
7 years ago |
|
ansuz
|
59d25b4c1a
|
use camel case, not snek case
|
7 years ago |
|
ansuz
|
520b8967fd
|
allow people with short passwords to log in
|
7 years ago |
|
yflory
|
8ef27dca08
|
Lint
|
7 years ago |
|
yflory
|
1aef844fc3
|
Fix title attribute for truncated titles in the drive
|
7 years ago |
|
yflory
|
55fe882f64
|
Fix readonly mode in code
|
7 years ago |
|
yflory
|
bd422178c4
|
Hide the filepicker button in readonly mode
|
7 years ago |
|
yflory
|
51f1be9f7a
|
Improve the input style when renaming a folder in the drive tree
|
7 years ago |
|
yflory
|
642511dc3b
|
Disable exiting present mode when in embed mode
|
7 years ago |
|
yflory
|
403b62f131
|
Fix ghost icon modal and improve UI on mobile
|
7 years ago |
|
yflory
|
757d0a2800
|
Save the state of CKEditor's toolbar (visible or hidden)
|
7 years ago |
|
yflory
|
5bf966633c
|
Merge branch 'staging' into slide2
|
7 years ago |
|
yflory
|
514bff7065
|
Add slide number in the title in slide2
|
7 years ago |
|
ansuz
|
0ed6846e07
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
b5b9f931c7
|
don't use common-realtime
|
7 years ago |
|
ansuz
|
32e8c8ef4b
|
implement alertify without alertify
|
7 years ago |
|
ansuz
|
a302ee5d25
|
guard against undefined arguments
|
7 years ago |
|
yflory
|
c3a07e879c
|
Merge branch 'staging' into slide2
|
7 years ago |
|
yflory
|
fc069dac48
|
Ask the user before loading the template picker
|
7 years ago |
|
yflory
|
05793c220c
|
Fix secure iframes on Edge
|
7 years ago |
|
yflory
|
290d668ceb
|
Fix race condition preventing slide to work on Edge
|
7 years ago |
|
ansuz
|
de5d925154
|
autoselect user href in settings
|
7 years ago |
|
ansuz
|
e950ce74cb
|
focus on input when opening filepicker
|
7 years ago |
|
ansuz
|
739903d511
|
don't check account usage if you aren't logged in
|
7 years ago |
|
ansuz
|
bbf7ed3827
|
refactor drive to use dialog.selectable()
fix class on alertify-like boxes
|
7 years ago |
|
yflory
|
f2aaaa9751
|
Move slide to secure iframe
|
7 years ago |
|
ansuz
|
809b56625d
|
refactor ui elements
|
7 years ago |
|
ansuz
|
bca9ba66cb
|
enforce a configurable minimum password length when registering
|
7 years ago |
|
ansuz
|
1958bca984
|
restore hashing screen in login and register
|
7 years ago |
|
ansuz
|
fab6264ce6
|
use loading screen from pages.js
|
7 years ago |
|
ansuz
|
e8298f165a
|
only display first letter of name if user has no avatar
|
7 years ago |
|
ansuz
|
85003f7a23
|
lint compliance
|
7 years ago |
|
ansuz
|
cca3c04d43
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
15e24ebe4f
|
ui for hashtag picker
|
7 years ago |
|
ansuz
|
1b97996ef8
|
implement util.once
|
7 years ago |
|
yflory
|
0423a5f4e2
|
Clean secure iframe code
|
7 years ago |
|
yflory
|
04a04aef2b
|
Add setAttribute/getAttribute in secure iframes. Store attributes in settings
|
7 years ago |
|
yflory
|
61b228db79
|
Fix double / when storing a file
|
7 years ago |
|
yflory
|
8b2733e2da
|
Fix typo
|
7 years ago |
|
yflory
|
3ca9f41290
|
Get embed code for pad and code
|
7 years ago |
|
yflory
|
0bb6698399
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
e85b34f127
|
Add embed options in the secure pad hashes
|
7 years ago |
|
ansuz
|
47ec959032
|
make sure contenteditable is not set in read only mode
|
7 years ago |
|
ansuz
|
6a735b441f
|
use paul's print styles
|
7 years ago |
|
ansuz
|
b3d5e04bb4
|
lint compliance
|
7 years ago |
|
ansuz
|
3d2a2da74e
|
add listAllTags api
|
7 years ago |
|
yflory
|
31a6881dba
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
305feebbbe
|
Fix scroll position when refreshing the drive tree
|
7 years ago |
|
ansuz
|
0e8a26e8eb
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
1c50bb3f61
|
clear hung tooltips
|
7 years ago |
|
yflory
|
53eb9bb541
|
Remove the logo from the filepicker loading screen
|
7 years ago |
|
yflory
|
729c013af7
|
Get mediatag embed code from the file app
|
7 years ago |
|
yflory
|
904936209a
|
Remove loading tips in the file picker
|
7 years ago |
|
yflory
|
98cd69e53e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
204e45dfae
|
Enable templates in pad
|
7 years ago |
|
yflory
|
4108520d20
|
Add contacts in the new menu if the user is logged in
|
7 years ago |
|
ansuz
|
38e1ed93e4
|
Merge branch 'code2' into staging
|
7 years ago |
|
ansuz
|
acaf45a0e0
|
drop thumbnails if metadata is too large
|
7 years ago |
|
yflory
|
78b338c379
|
Merge branch 'code2' into staging
|
7 years ago |
|
yflory
|
db86a2dbee
|
Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2
|
7 years ago |
|
yflory
|
d2787e3eff
|
Make code2 the default code app
|
7 years ago |
|
ansuz
|
4069945bc4
|
Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2
|
7 years ago |
|
ansuz
|
d42d988d36
|
make test more resilient
|
7 years ago |
|
ansuz
|
cd7b00d45b
|
make pixels 100px
|
7 years ago |
|
ansuz
|
e8ac5ed87f
|
add a test for thumbnails
|
7 years ago |
|
ansuz
|
b1a1f4ba13
|
add encrypted thumbnails to metadata for images.
correct decryption logic
|
7 years ago |
|
ansuz
|
b8e913c95a
|
more thumbnail methods
|
7 years ago |
|
ansuz
|
ffbb21dd2c
|
use cryptpad-september build of media-tag
|
7 years ago |
|
yflory
|
c0f14dea5e
|
Store code2 and set the title at the first visit
|
7 years ago |
|
yflory
|
86e23ac19f
|
Use less2 in secure iframes
|
7 years ago |
|
yflory
|
f12f4bb925
|
Integrate filepicker secure iframe in the code2 app
|
7 years ago |
|
ansuz
|
1072e3e797
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
ae60b5845f
|
implement search-by-tag for filesData
|
7 years ago |
|
ansuz
|
72ef730f23
|
implement tag-related functions
|
7 years ago |
|
ansuz
|
0302c06d0e
|
send feedback if client does not support symbols
|
7 years ago |
|
ansuz
|
52019dc763
|
make get and set pad attribute return only cloned data
|
7 years ago |
|
yflory
|
89b7b644f3
|
Enable drag & upload in code2 and prepare filepicker
|
7 years ago |
|
Caleb James DeLisle
|
e2719d9098
|
Add media-tag-nacl to cryptpad so it will be hosted on the server
|
7 years ago |
|
yflory
|
885282ddea
|
Fix undefined friend
|
7 years ago |
|
Caleb James DeLisle
|
a60709ff73
|
Infinite spinner popup leads to frame attempting to reload and failing
|
7 years ago |
|
yflory
|
b8971cdc23
|
Add previewMode settings to code2
|
7 years ago |
|
yflory
|
0d008aaa2e
|
Add indent settings to code2
|
7 years ago |
|
yflory
|
f54dc7505c
|
Migrate indentation settings to a settings subobject
|
7 years ago |
|
yflory
|
0893bcc0e5
|
Merge branch 'staging' into code2
|
7 years ago |
|
yflory
|
f06683e949
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
0ce32464fd
|
Fix flickering avatar in firefox
|
7 years ago |
|
ansuz
|
9a23b77b46
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
ba0e935add
|
stub localStorage, and handle errors that might come from touching localStorage
|
7 years ago |
|
ansuz
|
be8ea4102e
|
keep trying to parse the hash until it works
|
7 years ago |
|
yflory
|
4db4f66786
|
Remove an unnecessary fix for Safari
|
7 years ago |
|
yflory
|
a2ed266048
|
Move the code app in a secure iframe
|
7 years ago |
|
Caleb James DeLisle
|
1044531806
|
Fix Safari iframe size issue
|
7 years ago |
|
ansuz
|
a34d1793e0
|
drop 'loading' text from loading screen
|
7 years ago |
|
ansuz
|
595fa4c2e4
|
Merge branch 'soon'
|
7 years ago |
|
ansuz
|
181a19a9a0
|
polyfill for array.fill
|
7 years ago |
|
yflory
|
51fa6287c1
|
Enable notifications in secure pads
|
7 years ago |
|
yflory
|
642dc17910
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
901917983b
|
Fix an issue preventing pads to be stored in the drive
|
7 years ago |
|
ansuz
|
40f062abda
|
restore app usage report in new pad
|
7 years ago |
|
ansuz
|
8fb7fef3f5
|
regular expressions are never falsey
|
7 years ago |
|
ansuz
|
24eac9b4a6
|
test for flakey tests
|
7 years ago |
|
ansuz
|
7d2a76f4d6
|
delete dead code. fix off-by-one for messages. turn off history button when history is exhausted
|
7 years ago |
|
ansuz
|
288c03bb41
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
Caleb James DeLisle
|
fe03e6ae83
|
bad code, lint
|
7 years ago |
|
ansuz
|
430a6f7b77
|
lint compliance
|
7 years ago |
|
Caleb James DeLisle
|
190dff1c9b
|
Use the bounce app for opening a link with the right click
|
7 years ago |
|
yflory
|
dec870d2bd
|
Fix selection in the drive search results
|
7 years ago |
|
yflory
|
4bceef8952
|
Fix the upload status table missing in the drive
|
7 years ago |
|
yflory
|
0b4e044540
|
Fix the plugin to open a link in a new tab in pad
|
7 years ago |
|
yflory
|
d9a4a32bf9
|
Fix avatar for anonymous users in secure pads
|
7 years ago |
|
yflory
|
00fda0d7d7
|
Fix avatar in read-only mode (secure pads)
|
7 years ago |
|
yflory
|
88cb4fd83c
|
Enable friend requests from secure pads
|
7 years ago |
|
yflory
|
147d88d845
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
e43c68aa48
|
Fix viewers number in secure iframe
|
7 years ago |
|
yflory
|
f89015d9ed
|
Update the tab title to match the pad title in pad2
|
7 years ago |
|
ansuz
|
1280cd1659
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
51c065d13c
|
Fix link to main in the new toolbar
|
7 years ago |
|
yflory
|
d9bf2abcd8
|
Fix old hashes not working anymore in pad
|
7 years ago |
|
ansuz
|
536fe04790
|
emit notification when alert, confirm, or prompt are called
|
7 years ago |
|
Caleb James DeLisle
|
e4a356d873
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
Caleb James DeLisle
|
056285a7b6
|
Move pad2 to pad and create bounce app
|
7 years ago |
|
yflory
|
d4589c4699
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
6c65e5ff72
|
Fix the ghost icon in the drive and add missing text
|
7 years ago |
|
ansuz
|
5fbbaee2f5
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
6314487d98
|
handle unfriends in ui
|
7 years ago |
|
ansuz
|
5c2b58e703
|
log error synchronously so we get a trace when pinPads has no callback
|
7 years ago |
|
ansuz
|
841e3af8da
|
handle unfriends. clean up. better input validation
|
7 years ago |
|
ansuz
|
c66a0c55e0
|
ensure that function signatures are correct
|
7 years ago |
|
ansuz
|
91f6e3e543
|
remove a lot of dead code
|
7 years ago |
|
Caleb James DeLisle
|
e62faf7c7b
|
Edge fix, always use async iframe onLoad rather than invoking it manually
|
7 years ago |
|
ansuz
|
54eefd3d94
|
replace contacts with contacts2
|
7 years ago |
|
ansuz
|
57d0c6c973
|
Merge branch 'new-messaging' into staging
|
7 years ago |
|
ansuz
|
9e04d039d7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
22d754d514
|
handle user renames
|
7 years ago |
|
Caleb James DeLisle
|
0a6f81850f
|
Handle infinite-spinner errors and properly inform the user
|
7 years ago |
|
ansuz
|
a99eb9365e
|
correctly set indentation preferences when changing languages
|
7 years ago |
|
ansuz
|
f58d4c941f
|
clean up a bit
|
7 years ago |
|
ansuz
|
ea5f47f0f9
|
remove some TODOs and solve some wee bugs
|
7 years ago |
|
ansuz
|
b75a951a98
|
encode messages with 'author' field instead of 'channel'
|
7 years ago |
|
Caleb James DeLisle
|
7bbea28831
|
minor anti-xss changes...
|
7 years ago |
|
ansuz
|
013b75ae67
|
implement history range requests
|
7 years ago |
|
ansuz
|
b71f1860db
|
make uid function reusable
|
7 years ago |
|
ansuz
|
443d8a8941
|
remove unnecessary files
|
7 years ago |
|
Caleb James DeLisle
|
75fde58846
|
Well that was stupid... (fix bug introduced in acfaaa7d56 when trying to make jshint compliance)
|
7 years ago |
|
Caleb James DeLisle
|
dc283c2d74
|
Load 1, load 2... not load 1, load 3.
|
7 years ago |
|
Caleb James DeLisle
|
5d9599c9b7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
Caleb James DeLisle
|
cbac5e417c
|
Make loading screen come much earlier on pad2
|
7 years ago |
|
yflory
|
b6881349be
|
Fix an issue with the notifications in secure pads
|
7 years ago |
|
yflory
|
ec64ac485d
|
Fix 'not a function' error
|
7 years ago |
|
Caleb James DeLisle
|
acfaaa7d56
|
jshint compliance
|
7 years ago |
|
Caleb James DeLisle
|
2ad9fcee17
|
Manual merge of notify.js
|
7 years ago |
|
Caleb James DeLisle
|
8a9755611a
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
|
Caleb James DeLisle
|
2dacd57e76
|
fix caching on favicon
|
7 years ago |
|
yflory
|
33025a9df9
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
|
yflory
|
c33b128bf4
|
Enable feedback in pad2
|
7 years ago |
|
yflory
|
e81bb3fe08
|
Fix profile link in the userlist
|
7 years ago |
|
yflory
|
d6c33fdf4f
|
Ghost icon to add a pad
|
7 years ago |
|
ansuz
|
89a13d4b21
|
work on contacts2 until feature parity is reached
|
7 years ago |
|
ansuz
|
002eed0d6f
|
make most of the messenger api async
|
7 years ago |
|
Caleb James DeLisle
|
d9f5e3638e
|
Big caching improvements :D
|
7 years ago |
|
yflory
|
98daf10ed1
|
Ability to collapse the root directory in the drive
|
7 years ago |
|
yflory
|
b4864b96ac
|
Add a recent pads category in the drive
|
7 years ago |
|
Caleb James DeLisle
|
4f3b4a30ee
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
|
Caleb James DeLisle
|
4b70fc9f49
|
Use resources from the original origin in pad2
|
7 years ago |
|
yflory
|
20a68ad71c
|
Hide the template button if the pad2 is a template
|
7 years ago |
|
yflory
|
aa9e0d3cd3
|
Enable AppConfig in pad2
|
7 years ago |
|
yflory
|
4089803785
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
|
yflory
|
f40d2c0b20
|
Add templates to pad2
|
7 years ago |
|
yflory
|
8d020833af
|
Add missing file
|
7 years ago |
|
Caleb James DeLisle
|
bffa4d01a8
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
|
Caleb James DeLisle
|
b081603455
|
Update requirejs
|
7 years ago |
|
yflory
|
8d837d22ea
|
Add history to pad2
|
7 years ago |
|
yflory
|
b2e6df1f9d
|
Add import & export in pad2
|
7 years ago |
|
yflory
|
1da11a1883
|
Disable edition in readonly mode in pad2
|
7 years ago |
|
yflory
|
e2d39de143
|
Forget button in pad2
|
7 years ago |
|
yflory
|
e4020ba8d4
|
Fix pad creation in pad2
|
7 years ago |
|
yflory
|
140c6f3776
|
Add limit warning in pad2
|
7 years ago |
|
yflory
|
30aef71603
|
Enable avatars in pad2
|
7 years ago |
|
yflory
|
f88a6f63fe
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
|
yflory
|
fb4808e1e1
|
Fix queries callback arguments
|
7 years ago |
|
Caleb James DeLisle
|
6dd1643738
|
Manual merge work done on loading page to pad2
|
7 years ago |
|
Caleb James DeLisle
|
8b702e0150
|
wip
|
7 years ago |
|
yflory
|
e65b2f4e9f
|
Add shareButton to pad2
|
7 years ago |
|
yflory
|
beb45740d0
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
|
yflory
|
90f892de9c
|
Useradmin menu, notifications and share button in pad2
|
7 years ago |
|
ansuz
|
253ab68d8d
|
Merge branch 'staging' into new-messaging
|
7 years ago |
|
Caleb James DeLisle
|
498c8229e9
|
Make following a link inside of the iframe only fail rather than carrying the iframe away from the pad.
|
7 years ago |
|
ansuz
|
0693a98890
|
create a thumbnail when uploading images from whiteboard
|
7 years ago |
|
ansuz
|
b17044ad98
|
add support for thumbnails in metadata
|
7 years ago |
|
yflory
|
dd9b38066e
|
Change display name in useradmin menu
|
7 years ago |
|
yflory
|
a96d447e8b
|
Add notifications in pad2
|
7 years ago |
|
Pierre Bondoerffer
|
5e22e1dc59
|
use CryptPad instead of Cryptpad in titles
|
7 years ago |
|
Caleb James DeLisle
|
cf6d8c83b2
|
Fix title setter logic and separate it from UI
|
7 years ago |
|
Caleb James DeLisle
|
ec87f3f897
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
|
Caleb James DeLisle
|
415399ef64
|
Changes to support title change in metadata
|
7 years ago |