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 |
Paul Libbrecht
|
1ae7076790
|
Merge branch 'master' of https://github.com/xwiki-labs/cryptpad
|
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
|
c713b44a4a
|
Merge branch 'soon'
|
7 years ago |
yflory
|
d98bbf7df9
|
Fix the pad app when cryptpad is in an iframe
|
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 |
Paul Libbrecht
|
e7de9229a8
|
Do not print toolbar and collaboration (#178).
paul
|
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 |
Caleb James DeLisle
|
a164115e8c
|
Add media-tag-nacl to cryptpad so it will be hosted on the server
|
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 |
yflory
|
d1affebd14
|
Title in pad2
|
7 years ago |
yflory
|
604415b32c
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
yflory
|
fab3d67b75
|
Enable title in pad2
|
7 years ago |
Caleb James DeLisle
|
909bda4302
|
This should fix laxy metadata
|
7 years ago |
ansuz
|
a4dbf39c4a
|
fix pdf display problems in chrome
|
7 years ago |
Caleb James DeLisle
|
2490ee253f
|
Added setDisplayName RPC
|
7 years ago |
yflory
|
887a26b1a6
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
Caleb James DeLisle
|
0b34ceb0eb
|
Added RPC setPadTitleInDrive()
|
7 years ago |
ansuz
|
bed7d95bf3
|
use latest compiled cryptpad media-tag
|
7 years ago |
ansuz
|
4e62f79594
|
stop referring to deleted file as background image
|
7 years ago |
ansuz
|
3a5526e247
|
infer pdfjs document title from iframe url
|
7 years ago |
yflory
|
25466aa2f9
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
yflory
|
1d237735ef
|
Useradmin menu in pad2
|
7 years ago |
Caleb James DeLisle
|
3b5af3ea74
|
sframe common changes
|
7 years ago |
yflory
|
d1157c4d72
|
Add missing file
|
7 years ago |
yflory
|
d237c76f6c
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
yflory
|
f5855a2870
|
Add account name in metadata manager
|
7 years ago |
Caleb James DeLisle
|
3c0197cbf4
|
Firefox fails to boot the iframe if there is no number on setInterval
|
7 years ago |
yflory
|
d88704fb50
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
Caleb James DeLisle
|
a4850a7fcc
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
yflory
|
fc5bdd3bed
|
Add lazy metadata to fix parse errors in pad2
|
7 years ago |
Caleb James DeLisle
|
ad9f2ff223
|
Made pad2 server more generic and easy to implement
|
7 years ago |
ansuz
|
a125253cde
|
lint compliance
|
7 years ago |
ansuz
|
290763d6c5
|
don't complain about bad realtime state just because you disconnected
|
7 years ago |
yflory
|
226ef1fd00
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
yflory
|
fb512c8923
|
Toolbar in pad2
|
7 years ago |
ansuz
|
3b20dcd435
|
add optional cache-busting to favicon
|
7 years ago |
ansuz
|
52d344c3d1
|
Merge branch 'soon'
|
7 years ago |
ansuz
|
ee874878dd
|
clear tooltips when the userlist is redrawn
|
7 years ago |
ansuz
|
f207edfd28
|
handle errors when deriving keys. fix incorrect reference
|
7 years ago |
Caleb James DeLisle
|
e04c0b89a1
|
manual merge of staging
|
7 years ago |
ansuz
|
5b7d1cccd7
|
fix display and logic for tab setting checkbox
|
7 years ago |
Caleb James DeLisle
|
3315449114
|
Lets try this...
|
7 years ago |
Caleb James DeLisle
|
4c949a61e7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
Caleb James DeLisle
|
6b174934c8
|
Try waiting for iframe document.onload instead of looping and waiting for document.body to exist.
|
7 years ago |
yflory
|
e7ef1e1c2b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
yflory
|
7c49ca6e3f
|
Fix initial text size in code
|
7 years ago |
ansuz
|
2874ccb5dc
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
ansuz
|
2a8abc2699
|
comment out splitter code
|
7 years ago |
Caleb James DeLisle
|
725e19925c
|
Yeah, that was silly...
|
7 years ago |
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.
|
7 years ago |
ansuz
|
130b330ede
|
refactor messaging
|
7 years ago |
Caleb James DeLisle
|
638a94785f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
Caleb James DeLisle
|
7ca60e55a7
|
Lock the pad's inner-iframe down with CSP
|
7 years ago |
ansuz
|
5e6e76dfc1
|
make regex case insensitive
|
7 years ago |
ansuz
|
736288a85b
|
lint compliance
|
7 years ago |
ansuz
|
5037f444e9
|
update markdown sanitization strategy
|
7 years ago |
Caleb James DeLisle
|
878a565f89
|
tiny little performance improvement in something that really doesn't need it
|
7 years ago |
Caleb James DeLisle
|
007db0b080
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
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.
|
7 years ago |
ansuz
|
66cacf08da
|
allow users to write with tabs instead of spaces
|
7 years ago |
ansuz
|
64849507b3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
Pierre Bondoerffer
|
a5f9b49bfb
|
make poll box bigger so it show text in smaller windows
|
7 years ago |
Pierre Bondoerffer
|
82fadde249
|
restyle info-box in drive
|
7 years ago |
ansuz
|
958294f109
|
put code settings in their own tab
|
7 years ago |
Pierre Bondoerffer
|
c8d7675ede
|
remove z-index on splitter in code
|
7 years ago |
Pierre Bondoerffer
|
17b986a6ca
|
fix toolbar drive link (oops)
|
7 years ago |
ansuz
|
ae0b2ca1a8
|
add label for code indentation
|
7 years ago |
ansuz
|
284124a32d
|
WIP
|
7 years ago |
Caleb James DeLisle
|
4acd9957a9
|
Set the url if there is none
|
7 years ago |
Caleb James DeLisle
|
33e73dd5e5
|
fixed one last fight
|
7 years ago |
Caleb James DeLisle
|
9c0b0cc6a8
|
Merge branch 'staging' into pad2
|
7 years ago |
Caleb James DeLisle
|
1e56fa31c0
|
yay, they talk and they don't fight
|
7 years ago |
ansuz
|
1c526feffb
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
ansuz
|
fbb880f277
|
implement customizable indentation widths
|
7 years ago |
Caleb James DeLisle
|
b3d349bf80
|
Merge branch 'staging' into pad2
|
7 years ago |
Caleb James DeLisle
|
8efac4e661
|
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
|
7 years ago |
Caleb James DeLisle
|
0dde1d7507
|
wip
|
7 years ago |
Pierre Bondoerffer
|
baf64114a6
|
point to homepage in drive
|
7 years ago |
Pierre Bondoerffer
|
9dce40f3af
|
only add the splitter once
|
7 years ago |
Pierre Bondoerffer
|
4026994310
|
make splitter work when scrolling
|
7 years ago |
Caleb James DeLisle
|
c304071492
|
wip
|
7 years ago |
Caleb James DeLisle
|
e49a42db18
|
Merge branch 'staging' into pad2
|
7 years ago |
Caleb James DeLisle
|
1f9bd866c3
|
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
|
7 years ago |
Pierre Bondoerffer
|
edad5deeac
|
fix logo not showing sometimes in chrome
|
7 years ago |
Pierre Bondoerffer
|
c036bb26be
|
use proper bootstrap class
|
7 years ago |
Caleb James DeLisle
|
52565076b9
|
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
|
7 years ago |
Caleb James DeLisle
|
4b25ab80d6
|
wip
|
7 years ago |
Pierre Bondoerffer
|
b34e252eda
|
improve whiteboard styles
|
7 years ago |
ansuz
|
844967a880
|
continued refactoring
|
7 years ago |
Pierre Bondoerffer
|
8b2cb37c2f
|
improve poll looks
|
7 years ago |
Pierre Bondoerffer
|
5821d3e72f
|
remove useless title
|
7 years ago |
Pierre Bondoerffer
|
a4aeada585
|
make the file dialog placeholder visible, center file list
|
7 years ago |
Pierre Bondoerffer
|
d47e26efd5
|
add margin in code
|
7 years ago |
Pierre Bondoerffer
|
e08ed72653
|
generate the tooltip after the button
|
7 years ago |
Pierre Bondoerffer
|
665e81912e
|
put the tooltip on the actual button to prevent tippy from popping when not intended
|
7 years ago |
Pierre Bondoerffer
|
34ba673cd3
|
improve file upload UI
|
7 years ago |
ansuz
|
34a5a32c44
|
lint compliance
|
7 years ago |
ansuz
|
cdf3cee9c8
|
split out message rendering into ui
|
7 years ago |
ansuz
|
fcdfa52aa9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
ansuz
|
58b3b32cc3
|
big messaging refactor. split UI from logic
|
7 years ago |
Pierre Bondoerffer
|
6ca6755d02
|
more missing titles in toolbar
|
7 years ago |
Pierre Bondoerffer
|
2cc6c636db
|
Add some missing titles
|
7 years ago |
Pierre Bondoerffer
|
d3f2398865
|
bump tippy to 1.2.0, add dynamicTitle option
|
7 years ago |
ansuz
|
8301bd44be
|
Merge pull request #164 from pbondoer/staging
UI improvements
|
7 years ago |
Pierre Bondoerffer
|
85e383d5c5
|
add invisible splitter
|
7 years ago |
Pierre Bondoerffer
|
90075cd48e
|
media-tag to less file
|
7 years ago |
Pierre Bondoerffer
|
d15280c6ce
|
prevent pdfs from being huge
|
7 years ago |
Pierre Bondoerffer
|
c427f375dd
|
add bootstrap css to /code for image uploader
|
7 years ago |
Pierre Bondoerffer
|
f585ddccdf
|
fix image sizes in /slide/
|
7 years ago |
ansuz
|
fc95f1b6a8
|
lint compliance
|
7 years ago |
ansuz
|
ba9696ba33
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
Caleb James DeLisle
|
a612f02be2
|
Merge branch 'staging' into pad2
|
7 years ago |
ansuz
|
c63807fd2b
|
implement channel.send
|
7 years ago |
Caleb James DeLisle
|
35a55a15ed
|
wip
|
7 years ago |
ansuz
|
d835005905
|
simplify in-memory message format
|
7 years ago |
Pierre Bondoerffer
|
8f285eba9f
|
make file picker ui even prettier
|
7 years ago |
ansuz
|
797cc2b105
|
handle messages which fail to decrypt
|
7 years ago |
Caleb James DeLisle
|
65dfd99171
|
major wip
|
7 years ago |
Pierre Bondoerffer
|
c53e738054
|
improve file picker ui
|
7 years ago |
Pierre Bondoerffer
|
798a3dc520
|
automatically fill in display name in poll
|
7 years ago |
Pierre Bondoerffer
|
0588564bc9
|
overflow on poll div
|
7 years ago |
Pierre Bondoerffer
|
be29236af1
|
fix pdfjs styles
|
7 years ago |
ansuz
|
bad5160885
|
fix bad reference
|
7 years ago |
ansuz
|
05aa5ed347
|
hide new feature until it is finished
|
7 years ago |
ansuz
|
395f6e1b27
|
reset confirm text for alertify
|
7 years ago |
ansuz
|
dd6a057962
|
add 'msg' class for pierre
|
7 years ago |
ansuz
|
9865359bb0
|
don't tell users about new versions
|
7 years ago |
ansuz
|
c8c44d3bfc
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
Caleb James DeLisle
|
0d1f19f5d4
|
Big manual merge
|
7 years ago |
Pierre Bondoerffer
|
f6d45d05f6
|
use logo in toolbar
|
7 years ago |
ansuz
|
11c72499a0
|
don't add duplicate messages to the history
|
7 years ago |
ansuz
|
fb13e656b7
|
get new messages when reconnecting
|
7 years ago |
ansuz
|
52854c5a8e
|
ignore history range responses
|
7 years ago |
ansuz
|
e786117110
|
get new messages when reconnecting and WIP get more history
|
7 years ago |
ansuz
|
2ce341fed6
|
disable input field when disconnected
|
7 years ago |
ansuz
|
aba4e34e7f
|
reuse inline styles as a mixin
|
7 years ago |
ansuz
|
195cb01d72
|
better styles for messaging input
|
7 years ago |
ansuz
|
1fac0b9bc4
|
make todo text bold
|
7 years ago |
ansuz
|
66d81429bd
|
integrate file embed into code editor
|
7 years ago |
ansuz
|
dc7db074e8
|
open pad links when clicking in readOnly mode
|
7 years ago |
ansuz
|
71d88b156d
|
make empty profiles for users on first visit
|
7 years ago |
ansuz
|
8b0831ac5d
|
save images drawn with whiteboard to your CryptDrive
|
7 years ago |
ansuz
|
fe826133b3
|
make some markdown styles reusable
|
7 years ago |
ansuz
|
35cf23ce2c
|
clear tooltips when redrawing the userlist
|
7 years ago |
ansuz
|
4c6f8d71e1
|
don't invoke spinner if it does not exist
|
7 years ago |
ansuz
|
311f709dc4
|
lint compliance
|
7 years ago |
ansuz
|
c147d342a3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
ansuz
|
542d0cd17f
|
drop support for legacy pad list
|
7 years ago |
Pierre Bondoerffer
|
93e007b52a
|
reduce png sizes
|
7 years ago |
ansuz
|
1c238100c8
|
don't throw alerts in the middle of someone's presentation
|
7 years ago |
ansuz
|
7cd42d5ff1
|
use provided clearTooltips function
|
7 years ago |
ansuz
|
3fa010027c
|
implement clearTooltips
|
7 years ago |
ansuz
|
a68a225d79
|
fix read-only synchronization bug
|
7 years ago |
ansuz
|
9734a4db80
|
append new items to the top of the todo
|
7 years ago |
ansuz
|
69eaccbdef
|
don't create empty todo entries
|
7 years ago |
ansuz
|
e84edb2c2b
|
disable problematic tooltips
|
7 years ago |
ansuz
|
9c07793d0d
|
remove tips on checkbox state change
|
7 years ago |
ansuz
|
ba9cab762c
|
Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
|
7 years ago |
yflory
|
8e83501c72
|
Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
|
7 years ago |
yflory
|
459e0b3b16
|
CSS and bug fixes for todo
|
7 years ago |
ansuz
|
d4ffa7903f
|
better popup logic
|
7 years ago |
ansuz
|
0b81781f35
|
make the input bold
|
7 years ago |
ansuz
|
2af96d74fc
|
automatically focus on the create todo form
|
7 years ago |
yflory
|
77d6da841f
|
Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
|
7 years ago |
yflory
|
3da76e3ae8
|
Update style for the todo app
|
7 years ago |
ansuz
|
85366f2368
|
use new translations
|
7 years ago |
ansuz
|
d99d071716
|
WIP checkbox titles
|
7 years ago |
ansuz
|
e6031c2209
|
slightly better styles
|
7 years ago |
ansuz
|
8cfd8d3270
|
add translations for todo
|
7 years ago |
ansuz
|
c390bdd518
|
resolve merge conflicts
|
7 years ago |
yflory
|
0612a50ab4
|
Add fadein/fadeout when adding or removing a task
|
7 years ago |
ansuz
|
082632048b
|
fix styles for very wide todos
|
7 years ago |
ansuz
|
a15ff9ba2a
|
hide dates in todo
|
7 years ago |
ansuz
|
f0581f2cf4
|
also style the whole box
|
7 years ago |
ansuz
|
d7d7f212bb
|
add classes to style fake checkboxes based on checkstate
|
7 years ago |
ansuz
|
304d37a334
|
use styled checkboxes
|
7 years ago |
ansuz
|
b5603c89f0
|
add checkboxes to todos
|
7 years ago |
CatalinScr
|
796bf89491
|
Update of the front-page
|
7 years ago |
ansuz
|
4f63921fc9
|
better width styling on list. lint compliance
|
7 years ago |
yflory
|
35635c3e2f
|
CSS fix for the todo app
|
7 years ago |
ansuz
|
3efb9d21f5
|
pull in bootstrap. submit form on enter
|
7 years ago |
ansuz
|
83f79a3883
|
slightly better styles
|
7 years ago |
Nicolas Lemoine
|
180e643af9
|
Style of Todo App
|
7 years ago |
Nicolas Lemoine
|
5083299e8a
|
Merge branch 'todo' of https://github.com/xwiki-labs/cryptpad into todo
|
7 years ago |
Nicolas Lemoine
|
f67fb32bf1
|
Add, delete, display a task in Todo
|
7 years ago |
ansuz
|
56514d7e17
|
add val api
|
7 years ago |
Nicolas Lemoine
|
ac718b6dfa
|
Merge branch 'todo' of https://github.com/xwiki-labs/cryptpad into todo
|
7 years ago |
Nicolas Lemoine
|
a61faebb2b
|
App Todo - Init and HTML
|
7 years ago |
ansuz
|
522476a2a6
|
initialize data model and provide basic methods
|
7 years ago |
yflory
|
4345fc0662
|
Todo app
|
7 years ago |
Nicolas Lemoine
|
e3b9c03fc0
|
TodoApp - Init
|
7 years ago |
Nicolas Lemoine
|
658b00814b
|
TodoApp - Style and translations
|
7 years ago |
ansuz
|
a9a65e4ca9
|
remove unused code
|
7 years ago |
ansuz
|
4b53e02f6c
|
oups
|
7 years ago |
ansuz
|
2e3be27278
|
resolve merge
|
7 years ago |
ansuz
|
dcf5719eaf
|
handle most of the boilerplate stuff
|
7 years ago |
ansuz
|
0d43a84c2b
|
move example into another folder
|
7 years ago |
Nicolas Lemoine
|
5c07eac4de
|
Change title and footer
|
7 years ago |
ansuz
|
f5454f232a
|
pull in todomvc vanillajs example
|
7 years ago |
ansuz
|
ae693ff5a7
|
lint compliance
|
7 years ago |
ansuz
|
6622735db0
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
ansuz
|
55cb0734e2
|
make bad state timeout configurable
|
7 years ago |
yflory
|
469f49fc0a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
yflory
|
a80b00a765
|
Move the file picker in common
|
7 years ago |
ansuz
|
d44f0696af
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
ansuz
|
2d0635a409
|
use custom version of tippy
|
7 years ago |
yflory
|
09793e0d7d
|
jshint
|
7 years ago |
yflory
|
683769f30a
|
Fix tooltips
|
7 years ago |
yflory
|
9633025afe
|
CSS for the removeHistory button in contacts
|
7 years ago |
yflory
|
97f1bbedc5
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
yflory
|
b9bba76b4e
|
Make the delay for tooltips configurable
|
7 years ago |
ansuz
|
dd98e2222a
|
WIP erase chat history button
|
7 years ago |
ansuz
|
128d5b2c6d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
ansuz
|
b22127f10c
|
add history removal
|
7 years ago |
yflory
|
a5a73ce326
|
Fix print button in slide
|
7 years ago |
yflory
|
3bd5f01e53
|
Fix slide ratio in preview mode
|
7 years ago |
yflory
|
140964478e
|
Enter + shift key to add a new line in chat
|
7 years ago |
yflory
|
331b4dddea
|
Clean debugging code
|
7 years ago |
yflory
|
e26e041a5b
|
fix jshint errors
|
7 years ago |
yflory
|
c33d2a2db0
|
New tooltips
|
7 years ago |
yflory
|
88813aee02
|
Show that only html can be imported in pads
|
7 years ago |
yflory
|
b56a782f01
|
Store the userlist state when it is closed using the icon
|
7 years ago |
yflory
|
82c87144cb
|
Remove the friend request button when the request is sent
|
7 years ago |
yflory
|
5ce49af57b
|
Make CryptDrive fast again
|
7 years ago |
yflory
|
1dc98dcff1
|
CSS for the contacts input field
|
7 years ago |
yflory
|
e2d031c76a
|
Add support for markdown syntax in contacts
|
7 years ago |
yflory
|
cba113a2b0
|
Lint
|
7 years ago |
yflory
|
91ebbdfdb4
|
View contact status
|
7 years ago |
yflory
|
221a3b4fed
|
Fix duplicate leftside entries when disconnected in profile
|
7 years ago |
yflory
|
22a28a8fd9
|
Fix undefined description in profile
|
7 years ago |
ansuz
|
39fd0d0f5f
|
notify if you're focused on a conversation in a bacgkrounded tab
|
7 years ago |
yflory
|
7540f12040
|
Fix profile creation button not centered
|
7 years ago |
yflory
|
f719b34e09
|
Add tab notification in contacts
|
7 years ago |
yflory
|
baf439648e
|
Add the contacts app in the dropdown menu
|
7 years ago |
yflory
|
36d792874a
|
Fix initial text not removed in /contacts
|
7 years ago |
yflory
|
3545a66320
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
yflory
|
743b87b70f
|
Add initial text in /contacts
|
7 years ago |
ansuz
|
df0442c2bf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
ansuz
|
eb4b5ca77c
|
stub history removal. coming soon
|
7 years ago |
yflory
|
aa8181ab2b
|
Contacts app translations
|
7 years ago |
yflory
|
73e32f273e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
yflory
|
009d01abde
|
Fix friend removal and update user data
|
7 years ago |
ansuz
|
0cd94e2ba8
|
add title to contacts app
|
7 years ago |
ansuz
|
f2320190b8
|
change friends url to /contacts/
|
7 years ago |
ansuz
|
756b561bbc
|
lint compliance
|
7 years ago |
ansuz
|
6306de5265
|
set avatar border-radius to 4px
|
7 years ago |
ansuz
|
c452f25414
|
stub invite app
|
7 years ago |
ansuz
|
1aecdeb075
|
fresh media tag build
|
7 years ago |
ansuz
|
7114bfaa52
|
lint compliance
|
7 years ago |
ansuz
|
9ef45fe9f1
|
add background-color to names in chat
|
7 years ago |
ansuz
|
e2c17dbeb4
|
resolve conflicts
|
7 years ago |
ansuz
|
0340b45f2c
|
migrate profile to include edKey. don't propose connecting to users with whom you are already friends
|
7 years ago |
yflory
|
557f13f796
|
Unfriend and update username - beta
|
7 years ago |
ansuz
|
7be1e249e1
|
add fa-share-alt to pad initialText
|
7 years ago |
ansuz
|
96d2ff67e1
|
user-plus as icon for add-friend
|
7 years ago |
ansuz
|
c3ba7cd792
|
fix race condition
|
7 years ago |
ansuz
|
d0d38aa2a3
|
feedback on first visit
|
7 years ago |
ansuz
|
9527a5def7
|
avoid a CSP error. silence pdfjs warnings
|
7 years ago |
ansuz
|
9707433944
|
comment out debugging info
|
7 years ago |
ansuz
|
7a225af11e
|
fix some minor slide navigation bugs
|
7 years ago |
ansuz
|
575d4612f9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
ansuz
|
eda9908c3b
|
prevent accessing attributes of null
|
7 years ago |
ansuz
|
eeb2ee2d17
|
add clear channel rpc
|
7 years ago |
yflory
|
8fb5762eea
|
Lint errors
|
7 years ago |
ansuz
|
89af8e4472
|
fix funny off-by-one thing
|
7 years ago |
yflory
|
ac684a8dc7
|
Use the APP toolbar in profile
|
7 years ago |
yflory
|
2d509e3e25
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
yflory
|
b3e225cb3b
|
Replace spinner by text and fix mobile UI
|
7 years ago |
ansuz
|
f450a28d11
|
improve logic for guessing titles within code documents
|
7 years ago |
ansuz
|
0483d15b8f
|
lint compliance
|
7 years ago |
ansuz
|
c0cb5c4263
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
ansuz
|
f4bca0f9c0
|
Modifications for latest media-tag
* use latest built media-tag
* include pdfjs and configure its path for media-tag
* check whether decryption events affect an avatar. crop it if so
|
7 years ago |
ansuz
|
5b3cca58bd
|
modifications to handle latest media-tag
|
7 years ago |
yflory
|
7f5c301734
|
Add display name in the settings useradmin menu
|
7 years ago |
yflory
|
fb21a650ce
|
Lint errors
|
7 years ago |
yflory
|
d09f5b70c7
|
Fix slides CSS
|
7 years ago |
yflory
|
159ccc2866
|
Fix mediatag flickering
|
7 years ago |
yflory
|
ce50dbf3ca
|
Hide the 'templates' list header if the category is empty
|
7 years ago |
yflory
|
42075e4b5f
|
Make everything 16px and 32px
|
7 years ago |
yflory
|
16d0527e92
|
Add a page title in drive, settings and file
|
7 years ago |
yflory
|
5d5f936682
|
Hide the upload table in code
|
7 years ago |
yflory
|
a0b14faf89
|
Fix the font in settings and drive
|
7 years ago |
yflory
|
e732284845
|
Lint
|
7 years ago |
yflory
|
112c4c85e5
|
Left menu in drive
|
7 years ago |
yflory
|
8f5a244999
|
Replace mediatag markdown syntax by html. Enable file upload in /code.
|
7 years ago |
yflory
|
9f9e593e0f
|
Lint
|
7 years ago |
yflory
|
560671ae7d
|
Make avatars circle
|
7 years ago |
yflory
|
125018c8c3
|
New settings page
|
7 years ago |
yflory
|
c02fa39524
|
Make drive search bar blue
|
7 years ago |
yflory
|
438e7e6cf9
|
Fix display name in useradmin (friends app)
|
7 years ago |
yflory
|
e6188bfb63
|
Fix useradmin dropdown position
|
7 years ago |
yflory
|
97d8d86395
|
Fix avatar in static pages
|
7 years ago |
yflory
|
e8f3df5a46
|
Clean less
|
7 years ago |
yflory
|
159d72f33b
|
Merge branch 'msg' into staging
|
7 years ago |
yflory
|
8e2e8b1653
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
yflory
|
ff10c282d4
|
Avatar in the user admin button
|
7 years ago |
yflory
|
be6ee672d3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
yflory
|
f0523a0153
|
Avatar in the user admin menu
|
7 years ago |
ansuz
|
e10de1219b
|
feedback on view hash usage
|
7 years ago |
ansuz
|
52eb8e307c
|
feedback for language used
|
7 years ago |
ansuz
|
086e5909dd
|
Merge branch 'soon' into staging
|
7 years ago |
ansuz
|
781974ec7c
|
center 'Create a profile' button
|
7 years ago |
yflory
|
1c531ccd47
|
Pin the chat channels
|
7 years ago |
ansuz
|
4a37bc4a1c
|
abort the realtime session if it does not synchronize for 30 seconds
|
7 years ago |
ansuz
|
29c6ed6e9b
|
hide slide arrows when there are no more slides in that direction
|
7 years ago |
ansuz
|
c096872467
|
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
|
7 years ago |
ansuz
|
eff27ff6c5
|
focus username button
|
7 years ago |
ansuz
|
c60a71e210
|
add connect button and view profile button
|
7 years ago |
ansuz
|
94f8e4b8a3
|
use validateKeys when instantiating object
|
7 years ago |
ansuz
|
22fbc7e5d8
|
implement getter for public keys
|
7 years ago |
ansuz
|
ecef970250
|
float connect button right because flex styles messed up the pencil icon
|
7 years ago |
yflory
|
df103c4074
|
Messaging app
|
7 years ago |
ansuz
|
f9a43d6570
|
select everything before file extensions in drive when renaming
|
7 years ago |
ansuz
|
1c462d5c4a
|
use random token for feedback instead of date
|
7 years ago |
yflory
|
21f1527c71
|
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
|
7 years ago |
yflory
|
5c7441f82c
|
Display the friend list in the friend app
|
7 years ago |
ansuz
|
fac715dd09
|
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
|
7 years ago |
ansuz
|
4b23ef74d7
|
add support for curve message signing and curve validateKeys
|
7 years ago |
yflory
|
a5e8f6ae81
|
Add friend app and fix avatar size
|
7 years ago |
yflory
|
af31771e3a
|
Share a channel id, not a hash
|
7 years ago |
yflory
|
852b2eaf1d
|
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
|
7 years ago |
yflory
|
26a83003b5
|
Create an owned channel
|
7 years ago |
yflory
|
5b5a7ab286
|
Hide the friend button when the resquest is accepted
|
7 years ago |
ansuz
|
f02285d103
|
fix lowercased p
|
7 years ago |
ansuz
|
5d96c68ad7
|
fix profile app display on chrome
|
7 years ago |
yflory
|
de420de021
|
Fix the folder's path in the search results page
|
7 years ago |
ansuz
|
d3bbdc27c0
|
lint compliance
|
7 years ago |
ansuz
|
bce0b03ba4
|
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
|
7 years ago |
ansuz
|
909e00bbc3
|
create a listmap object using public key crypto
|
7 years ago |
yflory
|
96fde4e5ed
|
Add missing file
|
7 years ago |
ansuz
|
df53166b37
|
implement and use prototype curve encryptors
|
7 years ago |
ansuz
|
d293ba4d44
|
add support for invite hashes
|
7 years ago |
yflory
|
37d5b0afb9
|
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
|
8 years ago |
yflory
|
95e2efab89
|
Add to friend list
|
8 years ago |
ansuz
|
e353627204
|
log users out if they do not have curve keys. add curve keys to object on registration and login.
|
8 years ago |
ansuz
|
4016a95540
|
prototype invite app
|
8 years ago |
yflory
|
465ef74f2b
|
Fix rpc
|
8 years ago |
yflory
|
bf17ad3f1e
|
Friend button in the userlist
|
8 years ago |
yflory
|
8dc8aa27ab
|
Lint
|
8 years ago |
yflory
|
35e8c1a63b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
43ac71603c
|
Move pad attributes in pad data
|
8 years ago |
ansuz
|
9f6ecea5d9
|
fix nacl reference error in media tag
|
8 years ago |
yflory
|
3e802c2443
|
Fix overflowing content in profile
|
8 years ago |
ansuz
|
dfad622b76
|
Merge branch 'soon' into staging
|
8 years ago |
yflory
|
69f4ce2abd
|
Fix middle click on the drive button
|
8 years ago |
ansuz
|
cbd9fc4076
|
Merge branch 'staging'
|
8 years ago |
ansuz
|
3fe0baa956
|
disable pin limit caching
|
8 years ago |
ansuz
|
9c1eaf9c1a
|
lint compliance
|
8 years ago |
ansuz
|
fa06f9d413
|
fix minor bugs in poll
|
8 years ago |
ansuz
|
90bcadd87b
|
Merge branch 'soon' into staging
|
8 years ago |
ansuz
|
be7e7fec43
|
don't bypass warnings when registering
|
8 years ago |
yflory
|
cab595f959
|
Fix duplicate folders in the drive
|
8 years ago |
ansuz
|
42375190e6
|
style buttons for long titles
|
8 years ago |
ansuz
|
c27c140130
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
ac8da0d52d
|
load codemirror in the correct context. fix selection events
|
8 years ago |
yflory
|
789274fd4f
|
Fix font-size in slides
|
8 years ago |
ansuz
|
7377d39b39
|
hide print button
|
8 years ago |
ansuz
|
43b877ad27
|
fix styling on media tag download button
|
8 years ago |
ansuz
|
1fd0ba488a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
04a28433ae
|
replace inner content of media tag download buttons
|
8 years ago |
ansuz
|
f85af7ef4c
|
hide useless messages
|
8 years ago |
ansuz
|
a59853f9c2
|
use new media tag
|
8 years ago |
yflory
|
8cf694bea6
|
Lint
|
8 years ago |
yflory
|
47c6c64b8a
|
Allow emojis in default avatars
|
8 years ago |
yflory
|
ffd184d50e
|
Fix overflowing names in the new userlist
|
8 years ago |
ansuz
|
92d88d1644
|
don't change allowed media types until we have media-tag scoping
|
8 years ago |
ansuz
|
678986dac4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
fa2d857d70
|
Fix css issues with Safari
|
8 years ago |
ansuz
|
efedfe0667
|
show preview pane by default in /slide/
|
8 years ago |
yflory
|
81c8949aee
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
1df5e6e855
|
Fix toolbar buttons for Safari
|
8 years ago |
ansuz
|
8b0210baf1
|
hide useless error
|
8 years ago |
yflory
|
991cb896bd
|
Fix avatar in /pad
|
8 years ago |
yflory
|
70c9f3df75
|
Fix avatar size
|
8 years ago |
ansuz
|
f09ae9b19c
|
jshint compliance
|
8 years ago |
ansuz
|
4a9a564913
|
don't try to handle error thta never happens anymore
|
8 years ago |
ansuz
|
b15aa3360a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
6ac056e314
|
make explicit file size RPCs unauthenticated
|
8 years ago |
yflory
|
9b131dc49c
|
Fix CSS in the slide app
|
8 years ago |
yflory
|
5694505719
|
Fix syntax highlighting
|
8 years ago |
yflory
|
335898a4c7
|
Hack the drawer to close it when clicking outside
|
8 years ago |
yflory
|
472a62730b
|
Fix profile creation and add a link to the profile app
|
8 years ago |
yflory
|
f357ec32c2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
b153dda6ff
|
Add avatars in the user list
|
8 years ago |
ansuz
|
c2e153e8ed
|
more fouc fixes
|
8 years ago |
yflory
|
555d0a09f8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
568ce70afd
|
Add a spinner for the history and update history buttons
|
8 years ago |
Caleb James DeLisle
|
2144587919
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
Caleb James DeLisle
|
c25f2df721
|
Added caching versions to some of the images which are loaded by js
|
8 years ago |
yflory
|
4ab82710ab
|
Remove the background color from the text-color button in the slide app
|
8 years ago |
yflory
|
7e69d051c4
|
Lint errors
|
8 years ago |
yflory
|
26193aeaa7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
b9320e6005
|
Toolbar improvements
|
8 years ago |
ansuz
|
9e91739044
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
ecff05425f
|
feedback for slide printing
|
8 years ago |
ansuz
|
75c2a1fd73
|
jshint compliance
|
8 years ago |
ansuz
|
b8934c0b97
|
smarter redraws of drive/settings usage bar
|
8 years ago |
yflory
|
5a3e9c785c
|
Fix ckeditor toolbar
|
8 years ago |
yflory
|
cc5b7615ad
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
ed0121d172
|
Lint errors
|
8 years ago |
yflory
|
8abc94d37b
|
Replace folder images in the drive
|
8 years ago |
ansuz
|
b7cb1a8d5f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
8279ef3130
|
Fix conflict between ckeditor toolbar and userlist on small screens
|
8 years ago |
ansuz
|
b037cfbfdb
|
set usage tips relative to bottom of screen, not top
|
8 years ago |
ansuz
|
1763cf72d1
|
tell anonymous users they can't upload
|
8 years ago |
yflory
|
7a87775372
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
45f180955b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
56a25e1036
|
Small fixes for the new toolbar
|
8 years ago |
ansuz
|
1179992a90
|
update feedback key name
|
8 years ago |
ansuz
|
4a5f5de78c
|
restore missing stylesheet for poll
|
8 years ago |
ansuz
|
bbf9916a91
|
fixes for file app
|
8 years ago |
ansuz
|
39149a052b
|
add new feedback keys
|
8 years ago |
ansuz
|
7a5c5ce0a3
|
load scripts asynchronously
|
8 years ago |
ansuz
|
9b8866ed72
|
handle RPC_NOT_READY error for logged out users
|
8 years ago |
ansuz
|
a9f8f42e3c
|
use minified less compiler
|
8 years ago |
ansuz
|
fca1ef4d36
|
hide unstyled content until the loading screen is displayed
|
8 years ago |
yflory
|
877c5a8d0e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
19ff8a345d
|
Avatar upload in the profile app
|
8 years ago |
ansuz
|
5e56ad912e
|
remove the last bit of compiled css
|
8 years ago |
ansuz
|
7a7307d560
|
fix logging when resetting
|
8 years ago |
yflory
|
6c94605b9b
|
File upload in the profile
|
8 years ago |
ansuz
|
7439bbaba2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
ed45814020
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
cfc5907237
|
remove unnecessary style rules
|
8 years ago |
yflory
|
85d8eda847
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
176e47f394
|
Add the profile app
|
8 years ago |
ansuz
|
1c1869a22c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
7de2683169
|
make all apps use clientside templates
|
8 years ago |
ansuz
|
f232675cc9
|
create a favicon if it does not already exist
|
8 years ago |
ansuz
|
3be6433fdf
|
send feedback on name changes
|
8 years ago |
ansuz
|
bdca6b10c2
|
use templates in poll.js
|
8 years ago |
ansuz
|
bb74935b08
|
allow pin limit caching to occur at api level
|
8 years ago |
yflory
|
00a554ca0d
|
Fix the donate button style with the new toolbar
|
8 years ago |
ansuz
|
e9bfaa9a60
|
compile less clientside. remove compiled css
|
8 years ago |
ansuz
|
67a096a8a4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
7b37146034
|
don't let spacebar keyups propagate outside of the title
|
8 years ago |
ansuz
|
9195c0cd12
|
is isOverPinLimit in toolbar
|
8 years ago |
ansuz
|
fce0a37f50
|
cache pin data once retrieved from the server
|
8 years ago |
yflory
|
8f2db44793
|
Remove getTitle from the file app
|
8 years ago |
yflory
|
33ea8cb183
|
Make sure we don't call both the yes and no handlers in prompts
|
8 years ago |
yflory
|
3076ade23a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
36ef4178dc
|
Remove the editable title from the file app
|
8 years ago |
ansuz
|
51e06e68a7
|
don't change slides when navigating through history
|
8 years ago |
ansuz
|
ffcbde4325
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
48ece55ed5
|
style fixes, and dynamic less compilation
|
8 years ago |
yflory
|
38f568635d
|
Fix duplicate media-tag in slides when adding or removing a slide
|
8 years ago |
yflory
|
ce44a8d351
|
Fix the backup button in anonymous drive
|
8 years ago |
yflory
|
06a0590f73
|
New folder icons
|
8 years ago |
yflory
|
cc341ca6d4
|
Lint error
|
8 years ago |
yflory
|
0d4d104e08
|
Mobile support for the new toolbar
|
8 years ago |
ansuz
|
b4b851959f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
61a891267f
|
more feedback
|
8 years ago |
yflory
|
c1d2fa6b52
|
Unhack validateKey for the history mode
|
8 years ago |
yflory
|
90cc3e6a5e
|
New userlist in the whiteboard app
|
8 years ago |
yflory
|
2710279904
|
Use the new share button in the file app
|
8 years ago |
yflory
|
5a48cba999
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
684269fdda
|
Userlist in polls
|
8 years ago |
ansuz
|
35bfa1dce4
|
test client-side templates in whiteboard app
|
8 years ago |
yflory
|
a11befaa0f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
13288ee18b
|
Update the userlist in code, slide and pad
|
8 years ago |
ansuz
|
852c028822
|
don't allow editing if pad type is wrong
|
8 years ago |
yflory
|
92b6e60573
|
Small improvements for the new toolbar
|
8 years ago |
ansuz
|
eddfb936f2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
115813c191
|
Merge branch 'new-templates' into staging
|
8 years ago |
ansuz
|
3657e978fd
|
give main2.js a more sensible name
|
8 years ago |
ansuz
|
118b83c420
|
make register and login user clientside templates
|
8 years ago |
ansuz
|
ab54dcf84d
|
make libs pass jshint
|
8 years ago |
yflory
|
8d956c3de6
|
New toolbar
|
8 years ago |
ansuz
|
48f9745619
|
clientside templating
|
8 years ago |
yflory
|
503e9de07c
|
Lint errors
|
8 years ago |
yflory
|
b7a0547b77
|
New toolbar colors
|
8 years ago |
yflory
|
3052ec8abb
|
Merge branch 'newCk' into staging
|
8 years ago |
yflory
|
c3f636851a
|
Fix path size width in drive
|
8 years ago |
yflory
|
c22f610d5c
|
Fix the drive integrity check
|
8 years ago |
yflory
|
fb388f2610
|
Fix an issue with invalid drive before migration
|
8 years ago |
yflory
|
59fb5bd8be
|
One toolbar color per app
|
8 years ago |
yflory
|
5a248db267
|
Merge branch 'staging' into newCk
|
8 years ago |
yflory
|
728272d936
|
Fix undefined function
|
8 years ago |
yflory
|
f13d23241c
|
Upgrade CkEditor to version 4.7
|
8 years ago |
ansuz
|
d822dfe37a
|
add forget button to file app
|
8 years ago |
ansuz
|
7fd36a72f3
|
re-add download button for file app
|
8 years ago |
ansuz
|
f02a381e32
|
avoid horizontal scrollbars
|
8 years ago |
ansuz
|
cc5d5d4f1d
|
make pdfs in file app big
|
8 years ago |
yflory
|
dbfad9d227
|
Lint
|
8 years ago |
yflory
|
91d46cdee4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
d3b9ac2511
|
Update the preview and present content on Ready in slides
|
8 years ago |
ansuz
|
5fd4870b8b
|
Merge pull request #138 from pbondoer/staging
Fix poll auto-focus inputs
|
8 years ago |
Pierre Bondoerffer
|
626e54d7b5
|
Fix poll auto-focus inputs
|
8 years ago |
yflory
|
54adb680e7
|
Hide the slide number in the title outside of present mode
|
8 years ago |
ansuz
|
17838f1d70
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
1b66383bac
|
don't create color-picker if readonly
|
8 years ago |
yflory
|
a38819f5b9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
1ad1b78c64
|
Fix the history mode with readOnly and old URLs
|
8 years ago |
ansuz
|
b2a70f86d3
|
disallow concurrent logins
|
8 years ago |
ansuz
|
35e0de463b
|
disallow concurrent scrypt cycles
|
8 years ago |
ansuz
|
06ca70d11e
|
lint compliance
|
8 years ago |
ansuz
|
f29f430e7c
|
better handling of non-rpc messages
|
8 years ago |
yflory
|
f1aef66fc9
|
Fix the drive history
|
8 years ago |
yflory
|
008c417111
|
Context menu was not hidden after a click in the drive
|
8 years ago |
yflory
|
377a90961b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
e40f43bd20
|
Migrated pads were not displayed instantly in the drive
|
8 years ago |
ansuz
|
44b8bc7b7d
|
make context menus unselectable
|
8 years ago |
yflory
|
928dadcf77
|
Fix toolbar dropdown menus not visible in slide
|
8 years ago |
yflory
|
1df11f2813
|
Update the font-size when entering/leaving present mode
|
8 years ago |
yflory
|
66d8c0ed11
|
Add a preview mode to the slide app
|
8 years ago |
yflory
|
a5924cb803
|
Make sure the initial title is set in the userDoc when creating a new pad
|
8 years ago |
yflory
|
8b5f4dbd47
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
3a36040ba7
|
lint
|
8 years ago |
ansuz
|
0e9ebddf11
|
fix the things
|
8 years ago |
ansuz
|
c0e2c1060e
|
don't reload when slide hash changes
|
8 years ago |
yflory
|
24c14ffbf3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
5bfd8470cb
|
Display the file size before downloading it
|
8 years ago |
ansuz
|
3f85471ab3
|
update footer and package.json for upcoming version
|
8 years ago |
yflory
|
594405de73
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
cbe21959b4
|
Update UI for the file/media app
|
8 years ago |
ansuz
|
06eceed8b3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
17146d7af9
|
send feedback for uploads
|
8 years ago |
yflory
|
c2c04bd5d8
|
Lint
|
8 years ago |
yflory
|
2068a8b85b
|
Embed the mediatag library in the file app
|
8 years ago |
yflory
|
cd5705b3f3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
1e9bc89855
|
Fix drive icons when the name contains a long word
|
8 years ago |
ansuz
|
5ce453afa0
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
e73e32ab3a
|
fix too-tall download button
|
8 years ago |
yflory
|
927f6404b8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
66b076111e
|
Add an upload button to the slide's file picker
|
8 years ago |
ansuz
|
c2e5ef7048
|
better sizing for videos
|
8 years ago |
ansuz
|
c717d01714
|
fix pdf height
|
8 years ago |
ansuz
|
b480346f5b
|
more efficient media-tag
|
8 years ago |
ansuz
|
0d47e68d3e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
0eb50b8b6c
|
drop pdf.js dependency
|
8 years ago |
yflory
|
f3f1cf9e6d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
a237eec41e
|
Add a file picker in the slide app
|
8 years ago |
ansuz
|
20874c76f1
|
prevent code blocks from overflowing slides
|
8 years ago |
yflory
|
a4f45caebb
|
Lint
|
8 years ago |
yflory
|
0a4e876139
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
8738b42861
|
Update the drive UI to show that Upload and New are linked to a folder
|
8 years ago |
ansuz
|
d25a0893cf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
3184e5d235
|
don't reload page on hash mode change
|
8 years ago |
yflory
|
1077b3b267
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
a98353af6c
|
Add a button to upload a file in the drive
|
8 years ago |
ansuz
|
295f9c00a6
|
send feedback on buttons
|
8 years ago |
ansuz
|
d5c7eb49a4
|
send feedback on toolbar hide and CKE buttons
|
8 years ago |
yflory
|
7e0a2abc2c
|
Fix the file name when restoring an element from the trash
|
8 years ago |
yflory
|
5b523be171
|
Fix drag&drop for pads in the drive
|
8 years ago |
yflory
|
e51f678bb9
|
Don't display the popup whne moving a file to the trash
|
8 years ago |
yflory
|
497ddeee6d
|
Upload files with drag&drop in the drive
|
8 years ago |
ansuz
|
687b4d8307
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
69c3bd392f
|
update built media tag to latest XWiki version
|
8 years ago |
yflory
|
494b44e2b1
|
fix lint errors
|
8 years ago |
yflory
|
d8ebe566d8
|
Don't call mediatag for non-image files
|
8 years ago |
yflory
|
37d3d04f0e
|
Clean mediatag integration code
|
8 years ago |
ansuz
|
802146e2af
|
don't put download buttons in a div
|
8 years ago |
yflory
|
19cb920a7c
|
Don't redraw a media-tag everytime the content has changed
|
8 years ago |
yflory
|
2032c08066
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
f9c26645cf
|
Upload images using the slide app
|
8 years ago |
ansuz
|
17e4e9be27
|
download anything that isn't an image in media-tag
|
8 years ago |
ansuz
|
8a599eb9b1
|
Merge pull request #136 from blumeva/staging
change minimum opacity
|
8 years ago |
XWiki SAS
|
fc9ecb0f7c
|
change minimum opacity
|
8 years ago |
ansuz
|
ea79294494
|
Merge pull request #134 from pbondoer/newpoll
More poll improvements
|
8 years ago |
ansuz
|
88c2c0afde
|
Merge pull request #135 from blumeva/staging
Staging
|
8 years ago |
XWiki SAS
|
74c9b663dd
|
changing whiteboard
|
8 years ago |
XWiki SAS
|
40cf7ea107
|
change whiteboard
|
8 years ago |
ansuz
|
1b574da053
|
fix typo
|
8 years ago |
ansuz
|
7ad89bd9af
|
don't interrupt boot because of localStorage failure
|
8 years ago |
ansuz
|
3337e2133a
|
more thorough tests for localStorage presence
|
8 years ago |
yflory
|
a57f8679c5
|
Fix a race condition in the file app
|
8 years ago |
yflory
|
4eeea93265
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
11e2226f1a
|
Fix lint errors
|
8 years ago |
ansuz
|
c779e328e8
|
warn users if their browser does not support localStorage
|
8 years ago |
yflory
|
d7292e69c6
|
Fix undefined variable
|
8 years ago |
ansuz
|
d367f71760
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
c70eb73d52
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
803bad1421
|
Move the file upload code in a separate file
|
8 years ago |
Pierre Bondoerffer
|
d344f03778
|
proper button text
|
8 years ago |
Pierre Bondoerffer
|
2b5339193c
|
bring admin back
|
8 years ago |
Pierre Bondoerffer
|
b2eef94232
|
use numbers, not strings
|
8 years ago |
Pierre Bondoerffer
|
848010842f
|
dont sanity check silently
|
8 years ago |
Pierre Bondoerffer
|
56f2c46c75
|
document a line
|
8 years ago |
Pierre Bondoerffer
|
cd1c957929
|
NaN safety
|
8 years ago |
Pierre Bondoerffer
|
0118fdbd00
|
use a local variable
|
8 years ago |
XWiki SAS
|
49370764c1
|
change whiteboard translation
|
8 years ago |
Pierre Bondoerffer
|
b8e394db67
|
poll: Implement multiple choices
|
8 years ago |
yflory
|
a58162a617
|
Make the drive tests work when not logged in
|
8 years ago |
XWiki SAS
|
c702313489
|
change label texte
|
8 years ago |
yflory
|
2fb5e3ae35
|
Merge branch 'staging' into newToolbar
|
8 years ago |
yflory
|
969cec5d60
|
Make sure everything is synced before migrating the drive
|
8 years ago |
yflory
|
7dd9ed543a
|
Merge branch 'newDrive' into staging
|
8 years ago |
yflory
|
376b60c21c
|
New toolbar temp
|
8 years ago |
yflory
|
9c5bade83e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
d1f4617419
|
Fix a race condition causing the preview part to be empty
|
8 years ago |
ansuz
|
c9725af508
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
db9b9547d9
|
don't complain about missing callbacks for messages which are not our responsibility
|
8 years ago |
Pierre Bondoerffer
|
685b352db8
|
poll: Add show help button
|
8 years ago |
yflory
|
30bdb9881c
|
Fix undefined element in select dropdown menus
|
8 years ago |
yflory
|
298e34a9de
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
8471dab6b1
|
Provide hints in theme and language dropdowns
|
8 years ago |
Pierre Bondoerffer
|
5d565660a9
|
tiny fixes
|
8 years ago |
Pierre Bondoerffer
|
6bc191725f
|
poll: support disconnect and fix trash button
|
8 years ago |
ansuz
|
b3221c0fb4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
0c957989d2
|
add link to upload table when complete
|
8 years ago |
yflory
|
5d6a0dcc1b
|
Fix width transition when dragging preview
|
8 years ago |
Pierre Bondoerffer
|
6dd80c26b1
|
Make editing more visible
|
8 years ago |
yflory
|
3ff3eac283
|
Fix a race condition causing the drive to be empty
|
8 years ago |
yflory
|
a5cb5f2ceb
|
Merge branch 'staging' into newDrive
|
8 years ago |
yflory
|
1b671edce9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
9a4a6e9b40
|
Always display the upgrade button in the drive
|
8 years ago |
yflory
|
9cc25d4c9f
|
Merge branch 'staging' into newDrive
|
8 years ago |
yflory
|
7134b00544
|
Add a button to display the context menu for the trash on mobiles
|
8 years ago |
yflory
|
d24458e4b0
|
Fix the tests to work with the async migration
|
8 years ago |
yflory
|
a57f7c6ce7
|
Fix lint errors
|
8 years ago |
ansuz
|
4bcad3e154
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
47857ec382
|
use cached pinned usage data
|
8 years ago |
yflory
|
75c3c10b20
|
Merge branch 'soon' into staging
|
8 years ago |
yflory
|
c1402fbb0a
|
Lint error
|
8 years ago |
yflory
|
b36484931d
|
Lint
|
8 years ago |
yflory
|
1fb638f519
|
clean the code
|
8 years ago |
yflory
|
9d758a040b
|
Fix an issue with the search field not displayed properly
|
8 years ago |
ansuz
|
08902c0910
|
drop extraneous argument
|
8 years ago |
ansuz
|
23318357a6
|
make fewer RPC calls for usageBar
|
8 years ago |
ansuz
|
df586a223c
|
update limits, usage, plan, and note whenever they are checked
|
8 years ago |
ansuz
|
8bad0c556e
|
change log to error
|
8 years ago |
ansuz
|
b0e00d337e
|
more careful validation
|
8 years ago |
yflory
|
fd88162624
|
Merge branch 'staging' into newDrive
|
8 years ago |
yflory
|
7c9e86e351
|
Merge branch 'soon' into staging
|
8 years ago |
yflory
|
9694272083
|
Fix html code not parsed
|
8 years ago |
yflory
|
9ca10ba524
|
Merge branch 'staging' into newDrive
|
8 years ago |
yflory
|
7f120c8fc1
|
Merge branch 'soon' into staging
|
8 years ago |
yflory
|
78e6118153
|
Merge branch 'staging' into newDrive
|
8 years ago |
yflory
|
444c41974e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
df5cbfb53e
|
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
|
8 years ago |
yflory
|
6a96aa6819
|
Disconnect the network when migrating the drive in another tab
|
8 years ago |
yflory
|
2a94bdaf05
|
test
|
8 years ago |
yflory
|
ca95b5c42b
|
Remove unused console.log
|
8 years ago |
yflory
|
f8c69573fd
|
Disconnect other tabs when migrating the drive
|
8 years ago |
ansuz
|
c4e5741ae0
|
update upgrade button logic
|
8 years ago |
ansuz
|
f1a9002417
|
use upgradeURL with usage bar
|
8 years ago |
yflory
|
51e0d40572
|
Make sure the old storage key is removed after migration
|
8 years ago |
yflory
|
b0fe04381d
|
Merge branch 'staging' into newDrive
|
8 years ago |
ansuz
|
fe2fef5e4c
|
support dragging and dropping multiple files
|
8 years ago |
yflory
|
1c2ea04f11
|
Drive refactoring
|
8 years ago |
ansuz
|
fe42f5e88c
|
ask for new cookies and resend commands on NO_COOKIE errors
|
8 years ago |
ansuz
|
e723228060
|
always show upgrade button in drive
|
8 years ago |
ansuz
|
da533b106a
|
improve type checking in getFileSize
|
8 years ago |
ansuz
|
2f851ab97e
|
fix lint errors
|
8 years ago |
ansuz
|
d25477e8c6
|
don't let tooltips interfere with DOM interaction
|
8 years ago |
yflory
|
811d031ffd
|
Fix the 'File' entry in the drive 'New' menu
|
8 years ago |
yflory
|
5641a4a839
|
Add the file app in the 'new' dropdown menus
|
8 years ago |
yflory
|
ac91d2f413
|
Fix the upgrade and donate buttons in the home page
|
8 years ago |
yflory
|
ee57458158
|
Remove the pin limit alert
|
8 years ago |
ansuz
|
f43132a63b
|
bump version in footer and package.json
|
8 years ago |
ansuz
|
ec9a4dec5e
|
Merge branch 'soon' into staging
|
8 years ago |
ansuz
|
77d4ffba86
|
animate preview mode sidebar
|
8 years ago |
ansuz
|
65233c2464
|
remove unused variable
|
8 years ago |
ansuz
|
767793b5ca
|
fix stuck loading tip
|
8 years ago |
ansuz
|
8f7aaecc1c
|
cache some selectors and decrease memory demands
|
8 years ago |
ansuz
|
f631973f1f
|
optimize file upload
|
8 years ago |
ansuz
|
55af84cc90
|
lower spinner timeout interval
|
8 years ago |
ansuz
|
c65ca5cfc6
|
restore deleted line and add missing semicolon
|
8 years ago |
ansuz
|
8bd9ad8847
|
add automated registration test
|
8 years ago |
ansuz
|
07279c8dc7
|
export boolean Test.testing
|
8 years ago |
Caleb James DeLisle
|
c8bd1bb2ac
|
Trying to improve the tests which fail always when running remotely
|
8 years ago |
Caleb James DeLisle
|
71bd808e4f
|
Send everything through the test global function
|
8 years ago |
Caleb James DeLisle
|
244bd7b378
|
;;;
|
8 years ago |
Caleb James DeLisle
|
7d557df74b
|
a new and more horrible way of sniffing the logs out of the instance
|
8 years ago |
Caleb James DeLisle
|
0d4b74cfba
|
;;;;;; keep these ;;; for later ;;;;;
|
8 years ago |
Caleb James DeLisle
|
24f37ea414
|
Delicious testing
|
8 years ago |
ansuz
|
5e57578fa9
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
8 years ago |
ansuz
|
30f66ab7ba
|
hotfix 'undefined/' bug
|
8 years ago |
ansuz
|
7b94106bac
|
fix inverted conditional :/
|
8 years ago |
ansuz
|
2e03485db4
|
remove known bad entries from localStorage.userHash...
|
8 years ago |
ansuz
|
936bf8df9d
|
return falsey if userHash is junk
|
8 years ago |
ansuz
|
105e5cdac9
|
fix 'undefined/' userHash
|
8 years ago |
ansuz
|
401e908963
|
use media-tag with xhr error handling
|
8 years ago |
ansuz
|
3465710237
|
Merge branch 'mediatag' of https://github.com/Regzox/cryptpad into tag
|
8 years ago |
Daniel RADEAU
|
8ab9248a78
|
Fix ES6
|
8 years ago |
Daniel RADEAU
|
21c39572be
|
Update media-tag and fix bower dependencies
|
8 years ago |
ansuz
|
daf112a5b5
|
take api settings into account for upgrade button
|
8 years ago |
ansuz
|
ebfa228bc0
|
add upgrade button to all static pages
|
8 years ago |
ansuz
|
149568689a
|
color donate button green
|
8 years ago |
ansuz
|
ec6ad6772b
|
send feedback on donation
|
8 years ago |
Daniel RADEAU
|
cb2efe138b
|
Media Tag integration, image, audio, video, pdf
|
8 years ago |
ansuz
|
76c530037b
|
enable donate button in all apps
|
8 years ago |
ansuz
|
9ca5bc507e
|
add support for donate button
|
8 years ago |
ansuz
|
a70014dd11
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
99a44f119f
|
don't send referrer headers on pads which may link outward
|
8 years ago |
ansuz
|
92a7970eb8
|
fix merge conflicts
|
8 years ago |
ansuz
|
1240b864ef
|
fix misconfigured history
|
8 years ago |
Pierre Bondoerffer
|
f434f002c4
|
poll: make locks clickable
|
8 years ago |
ansuz
|
3915b30055
|
provide a register button on login
also direct users from file to login
|
8 years ago |
Pierre Bondoerffer
|
b6bb576a34
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into newpoll
|
8 years ago |
Caleb James DeLisle
|
66520b6041
|
cleaned up the accounts, limits and revenue sharing and unified the config in one place
|
8 years ago |
Pierre Bondoerffer
|
1092285a68
|
merge master
|
8 years ago |
Caleb James DeLisle
|
6c1861dbc6
|
Merge branch 'soon' into staging
|
8 years ago |
Caleb James DeLisle
|
2ecf257fcd
|
Sync localStorage with sessionStorage in auth because safari...
|
8 years ago |
ansuz
|
3f3d64992d
|
resolve merge conflicts
|
8 years ago |
ansuz
|
57017c68fa
|
hacks for cross-domain safari
|
8 years ago |
ansuz
|
cf658c1b3a
|
backport live changes
|
8 years ago |
ansuz
|
a04f179d8b
|
hide preview mode on phones
|
8 years ago |
yflory
|
df2b00122a
|
New drive structure without file names
|
8 years ago |
ansuz
|
dc2b0ae6b4
|
jshint compliance
|
8 years ago |
ansuz
|
b32c329269
|
remember whether you were using preview mode for a pad
|
8 years ago |
ansuz
|
d9f7470f06
|
copy user details into sessionStorage for safari
|
8 years ago |
ansuz
|
a5ffd278a7
|
write styles for code in .less
|
8 years ago |
ansuz
|
3803f6a20f
|
only render preview if preview container is visible
|
8 years ago |
ansuz
|
617e027f12
|
catch markdown preview errors
|
8 years ago |
ansuz
|
c5bb830757
|
don't preview if hightlight mode is not markdown
|
8 years ago |
ansuz
|
fd83ae3e61
|
implement createRandomInteger
|
8 years ago |
ansuz
|
4d9060f49e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
378bf2aa94
|
yflory's word wrap fix
|
8 years ago |
ansuz
|
dc80b6b11f
|
throttle markdown preview
|
8 years ago |
yflory
|
f5f8e148ca
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
90f5713d4a
|
Fix an issue with the search bar redirecting to incorrect location
|
8 years ago |
ansuz
|
97cc4a6d54
|
add styling for tables in markdown preview
|
8 years ago |
ansuz
|
e6c04ccb49
|
bump server after paying for an account
|
8 years ago |
ansuz
|
6faca87e73
|
set preview content in read only mode
|
8 years ago |
ansuz
|
6324d9bbb0
|
feedback on template feature usage
|
8 years ago |
yflory
|
c3437382fb
|
Fix the release version in the what's new popup
|
8 years ago |
ansuz
|
4fae1b16c2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
70cae0d2c3
|
safely access pin reset response
|
8 years ago |
yflory
|
a50805545d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
d55b7e411c
|
Display an alert in the drive when the limit is reached
|
8 years ago |
ansuz
|
dac9d0647d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
259d34b7c8
|
jshint compliance
|
8 years ago |
yflory
|
40b99e7bbf
|
Get the file name before downloading the entire file
|
8 years ago |
ansuz
|
6dc3c62ba4
|
check for src before trying to ajax
|
8 years ago |
ansuz
|
a6cf761172
|
don't store media tag pages in the drive
|
8 years ago |
yflory
|
90a9764fa4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
346c289204
|
Fix lint errors
|
8 years ago |
ansuz
|
71dc0af6c7
|
better test for success error codes
|
8 years ago |
ansuz
|
0b6c587e2b
|
fetch and decrypt metadata with range requests
|
8 years ago |
yflory
|
eb31d0323c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
a99080fb74
|
push the rest of the code
|
8 years ago |
yflory
|
408a4dad94
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
3964f4feee
|
Display the progress when downloading a file
|
8 years ago |
ansuz
|
dd73ad2dd5
|
add decryptMetadata function
|
8 years ago |
ansuz
|
5179252d3b
|
fix merge conflicts
|
8 years ago |
ansuz
|
4ee42b87d4
|
make file crypto great again
|
8 years ago |
yflory
|
c45f08f147
|
Use a download button instead of downloading a file automatically
|
8 years ago |
yflory
|
0c2f84058b
|
Improve css for the file app
|
8 years ago |
yflory
|
9c00a730f2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
538aec6ef5
|
Display a message when pinPads returns an error
|
8 years ago |
ansuz
|
03da870a7a
|
jshint compliance
|
8 years ago |
ansuz
|
af4fd3c6d3
|
resolve merge conflicts
|
8 years ago |
yflory
|
67a04a16ec
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
1ab6eb3c5d
|
Add a queue for multiple uploads in the file app
|
8 years ago |
ansuz
|
ba5ef5157e
|
show pretty representations of storage usage
|
8 years ago |
ansuz
|
0a54f0cf2d
|
better alignment of preview and code entry
|
8 years ago |
ansuz
|
e78299aed6
|
use async file decryption, listen for progress events.
|
8 years ago |
ansuz
|
bcd0303821
|
style /file/ with .less
|
8 years ago |
ansuz
|
ef155d8ccf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
310909dc9e
|
handle new error codes
|
8 years ago |
yflory
|
d014fccfce
|
Fix lint error
|
8 years ago |
yflory
|
2082b328b4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
814c81fb13
|
Display an alert when CryptPad has a new version
|
8 years ago |
ansuz
|
34606ea8ba
|
use newest xwiki media-tag
|
8 years ago |
ansuz
|
5a83259233
|
listen for decryption errors
|
8 years ago |
ansuz
|
2cee9534c5
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
d324a054f2
|
add progress bar to file upload
|
8 years ago |
yflory
|
21f9e31e75
|
Add a placeholder for the user app
|
8 years ago |
ansuz
|
164342920e
|
fix inverted condition
|
8 years ago |
yflory
|
620f4dc512
|
Add translations for the markdown preview button title
|
8 years ago |
yflory
|
51bd41d4e8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
0bd4caeb7e
|
Add the task list code to the markdown renderer
|
8 years ago |
ansuz
|
d187945e94
|
jshint compliance
|
8 years ago |
ansuz
|
3ba94a1ba2
|
correctly set release version number
|
8 years ago |
yflory
|
2b60b81a68
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
d13dde856a
|
Add the markdown renderer file and change code's default content
|
8 years ago |
ansuz
|
4debec39bb
|
update footer with next release codename and corrected matrix link
|
8 years ago |
ansuz
|
73ec91aa5e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
80479fdc90
|
use rpc calls from cryptpad common
|
8 years ago |
ansuz
|
7befaccd88
|
move more rpc calls into pinpad
|
8 years ago |
yflory
|
56bcdff890
|
Add a preview of the markdown content in the code editor
|
8 years ago |
yflory
|
b72415b56b
|
Fix old hashes not working with the new parser
|
8 years ago |
yflory
|
6b7aeb9121
|
Fix the text example
|
8 years ago |
yflory
|
fe0f21594a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
953e7155f0
|
Send only the hostname to the accounts server
|
8 years ago |
ansuz
|
afef456b18
|
fix undefined reference
|
8 years ago |
ansuz
|
8fe0282b7b
|
jshint compliance
|
8 years ago |
ansuz
|
827233dcba
|
new translation keys for file upload
|
8 years ago |
yflory
|
834830fc4f
|
Fix the Ctrl key + click to select multiple files
|
8 years ago |
yflory
|
1a7c4d5ebe
|
Store the FS_hash in the user object after the merge
|
8 years ago |
yflory
|
87fa28180a
|
Display an upgrade button in the settings page
|
8 years ago |
yflory
|
c1b43db363
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
7ee6864ea4
|
Add the user menu in the login and register pages
|
8 years ago |
ansuz
|
1542aa96bc
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
dc2cdb7c08
|
Add the usage bar in the settings page
|
8 years ago |
ansuz
|
cc893723de
|
add some TODOs, log uploaded content so we know it's working
|
8 years ago |
ansuz
|
2dd04f7631
|
get limits from the server
|
8 years ago |
yflory
|
716245f864
|
Make all the buttons look the same
|
8 years ago |
yflory
|
0f37d9def7
|
Change the button font size in the toolbar
|
8 years ago |
yflory
|
48496416e7
|
Use the same font-size for all the toolbar buttons
|
8 years ago |
yflory
|
8172f117a7
|
Fix Hash.alert not a function
|
8 years ago |
yflory
|
0e58859393
|
Fix lint error
|
8 years ago |
yflory
|
771348720b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
03274c3776
|
Display an info message in the anonymous drive
|
8 years ago |
yflory
|
57979f6314
|
Display the public key using a href in the settings page
|
8 years ago |
ansuz
|
a9b670fdf5
|
don't parse trailing slash as part of encryption key in old hashes
|
8 years ago |
ansuz
|
9bbd3161ca
|
update tests for new API changes
|
8 years ago |
ansuz
|
06f3d0eefe
|
shim isArray if not exists. correctly report how often this occurs
|
8 years ago |
yflory
|
50d9f72b3a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
601226115b
|
New anonymous drive
|
8 years ago |
ansuz
|
30f6ef3f85
|
handle more response codes, use metadata
|
8 years ago |
ansuz
|
18d959ef16
|
handle non-200 status codes
|
8 years ago |
yflory
|
ed95bbb08f
|
Fix lint errors
|
8 years ago |
yflory
|
89a993be3c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
0f13198119
|
Move the parseHash code into parsePadUrl
|
8 years ago |
ansuz
|
4c4c21342d
|
don't try to decrypt nothing
|
8 years ago |
ansuz
|
69e933dd17
|
better error handling in file download
|
8 years ago |
ansuz
|
42f3a62cac
|
handle errors with XHR
|
8 years ago |
ansuz
|
213708d8dc
|
center media tags
|
8 years ago |
ansuz
|
6c68b5e6ca
|
use new media-tag, listen for decryption events
|
8 years ago |
ansuz
|
7dd5907ff0
|
Merge branch 'limit' into staging
|
8 years ago |
ansuz
|
22efde87d5
|
correctly estimate upload size
|
8 years ago |
ansuz
|
a993ab6616
|
use new encrypted file encoding in media-tag
|
8 years ago |
ansuz
|
8c49150725
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
e0293a1162
|
Merge branch 'master' into staging
|
8 years ago |
yflory
|
57ee7de7d4
|
Update and return the storage limit
|
8 years ago |
yflory
|
d3854b9774
|
Fix selection issues in the drive with Chrome
|
8 years ago |
yflory
|
371edff943
|
Fix an error when moving unsorted files to root in the drive
|
8 years ago |
yflory
|
b76dcba1d6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
733c3abefa
|
Update the upgrade button in the drive
|
8 years ago |
yflory
|
becba33b05
|
Scroll to the selected element in the drive
|
8 years ago |
yflory
|
419fb15425
|
Remember the scroll position in the drive tree
|
8 years ago |
yflory
|
5d0535966c
|
Center vertically slides in present mode and checkbox to disable transitions
|
8 years ago |
ansuz
|
5d37a50a87
|
try to estimate upload size
|
8 years ago |
ansuz
|
6d30d7f89f
|
strip junk bytes from base64 more safely
|
8 years ago |
ansuz
|
1525712deb
|
new encrypted file format
|
8 years ago |
ansuz
|
8f5989b6b0
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
cf81b02096
|
Make sure the spinner is always centered in the loading screen
|
8 years ago |
yflory
|
5a21be8112
|
Improve UI on mobile
|
8 years ago |
ansuz
|
5aba2d4640
|
remove unused variable
|
8 years ago |
yflory
|
5c8586f8a3
|
Fix typo in file upload
|
8 years ago |
yflory
|
1e4fc5a979
|
lint
|
8 years ago |
yflory
|
3c4b6a89d2
|
Fix a conflict with the arrow keys and renaming a folder in the tree
|
8 years ago |
yflory
|
96ccb94397
|
Add the share button when a file upload is complete
|
8 years ago |
yflory
|
c00158d23a
|
Move code to common-history
|
8 years ago |
ansuz
|
97a28d3938
|
test file encryption/decryption
|
8 years ago |
ansuz
|
6a1c799a6e
|
support async tests
|
8 years ago |
ansuz
|
922e7803e9
|
remove extraneous slashes from hashes when parsing
|
8 years ago |
yflory
|
0f8ef2f516
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
6a8153aca3
|
Fix selection issues in the drive with Chrome
|
8 years ago |
yflory
|
a6c49cd65c
|
Fix undefined title in slides present mode
|
8 years ago |
ansuz
|
299a53ded7
|
prefer to use functions from common
|
8 years ago |
ansuz
|
a338b23f40
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
df47b913e3
|
fetch array buffers in cryptpad-common
|
8 years ago |
yflory
|
ff16084719
|
Fix lint errors
|
8 years ago |
yflory
|
50c8a859e6
|
Move the CodeMirror cursor code to common-codemirror
|
8 years ago |
yflory
|
9eb8e55cf6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
c79a6e3b2b
|
Move Metadata, CodeMirror and title functions in separate files
|
8 years ago |
ansuz
|
56a871cb67
|
Merge branch 'soon' into staging
|
8 years ago |
ansuz
|
521f99a3d6
|
support drag and drop for file upload
|
8 years ago |
ansuz
|
b4973b7610
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
8 years ago |
ansuz
|
ae7d65c3fa
|
fix drag to select in chrome
|
8 years ago |
yflory
|
63710e1ccc
|
Move the code related to the title in another file
|
8 years ago |
yflory
|
48898c97e5
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
8 years ago |
yflory
|
ce5cdce917
|
Fix an issue where the username was lost on websocket reconnect
|
8 years ago |
ansuz
|
1d4d4cffdb
|
correct some copypasted code
|
8 years ago |
ansuz
|
2b4f503aff
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
8 years ago |
ansuz
|
4a104052b4
|
handle errors in file
|
8 years ago |
yflory
|
b818fd8a37
|
Fix 'undefined' error with the context menu
|
8 years ago |
yflory
|
c34c1cb07c
|
Press enter to open a folder
|
8 years ago |
ansuz
|
7da01d0862
|
unlist removed examples
|
8 years ago |
ansuz
|
ea3dc8a852
|
remove file upload test
|
8 years ago |
ansuz
|
42dcfb9661
|
unceremoniously kick web clients when you 'log out everywhere'
|
8 years ago |
yflory
|
1547063b7f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
a20a319a7a
|
Fix focus issues in the CryptDrive search bar
|
8 years ago |
ansuz
|
36ab38f3ac
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
9206d89531
|
Fix lint errors
|
8 years ago |
yflory
|
bbc08bbcfd
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
5a883d5a57
|
Use the new toolbar and move the userlist code in a separate file
|
8 years ago |
yflory
|
6847906ac9
|
Move the userlist code in a separate file
|
8 years ago |
ansuz
|
6471b572eb
|
correct off-by-one
|
8 years ago |
ansuz
|
3a338e0890
|
fix undefined reference
|
8 years ago |
ansuz
|
a173e4c7a0
|
add 'log out everywhere' functionality in settings
|
8 years ago |
yflory
|
5a5b02b82b
|
Don't store in the drive pads without a hash
|
8 years ago |
ansuz
|
c07d3e6162
|
update version strings for upcoming release
|
8 years ago |
ansuz
|
3e118c6a38
|
allow instance-wide custom salt for login
|
8 years ago |
ansuz
|
6a00d11a15
|
fix undefined reference
|
8 years ago |
ansuz
|
c3d1554e8c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
660cda6573
|
set title when uploading
|
8 years ago |
yflory
|
706120ae5b
|
Display images uploaded in the File app with the Media app
|
8 years ago |
yflory
|
28cb40d7ee
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
1b6fae4dd2
|
Update mediatag
|
8 years ago |
ansuz
|
a0c420af8e
|
jshint compliance
|
8 years ago |
ansuz
|
1864dac84f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
78b11584f8
|
remove unused variables
|
8 years ago |
yflory
|
4335b050af
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
a190c99426
|
Toolbar refactoring
|
8 years ago |
ansuz
|
5739c3d973
|
blow up if you ever run out of nonce-space
|
8 years ago |
ansuz
|
2232518c64
|
set title after uploading
|
8 years ago |
ansuz
|
f644dc6c0b
|
WIP support encrypted file upload via base64 chunks
|
8 years ago |
ansuz
|
7573b86946
|
call back with error if an RPC is made while disconnected
|
8 years ago |
ansuz
|
410a9dfb17
|
temporary solution for testing pin limits
|
8 years ago |
yflory
|
cd98fc6eab
|
Increase the z-index of the select area in the drive
|
8 years ago |
yflory
|
80115d0071
|
Fix an 'undefined' variable error in the drive
|
8 years ago |
yflory
|
c9d89debba
|
Fix lint errors
|
8 years ago |
yflory
|
79365a7a82
|
Use the shift key to select multiple files in CryptDrive
|
8 years ago |
yflory
|
3262787244
|
Update the icon mode in CryptDrive
|
8 years ago |
yflory
|
d52e9fba43
|
Use the arrow keys to change the selection in the drive
|
8 years ago |
yflory
|
ef89451a83
|
Display the storage limit in the drive
|
8 years ago |
yflory
|
1d3b8188b3
|
Add mobile support in the slide app
|
8 years ago |
yflory
|
d2e46d1378
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
092b98d235
|
Fix the offset of the drag&select feature in the drive
|
8 years ago |
ansuz
|
f2672d587a
|
fix variable redefinition
|
8 years ago |
ansuz
|
0e7eeb285c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
f414d480a9
|
Add the history mode to the CryptDrive
|
8 years ago |
ansuz
|
cf4dee28f7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
28e4ef1b13
|
WIP RPC code
|
8 years ago |
yflory
|
afb0061d7b
|
Fix an issue with anonymous user unable to store new pads
|
8 years ago |
yflory
|
56aaeea003
|
Fix the drive toolbar not displaying the displayName
|
8 years ago |
yflory
|
538e85c080
|
Fix the context menu in the drive flowing off the screen if too long
|
8 years ago |
ansuz
|
841c9ee9de
|
don't close popup dialog when hitting enter if textarea has focus
|
8 years ago |
ansuz
|
3fa0a73025
|
prevent using string methods on undefined variable
|
8 years ago |
ansuz
|
1b3ce5aa96
|
fix typo
|
8 years ago |
yflory
|
a51a35da70
|
Fix an issue with hashes ending with a slash
|
8 years ago |
yflory
|
d9b5eb8a97
|
Fix an issue with the right click triggering the select area
|
8 years ago |
yflory
|
ef58120819
|
Prevent multiple concurrent clicks to get the history
|
8 years ago |
ansuz
|
38a115d8f8
|
feedback on anonymous drive
|
8 years ago |
yflory
|
16f6ab813c
|
Make it clear that the number is the history represents a version
|
8 years ago |
yflory
|
0ee228666b
|
Replace the IRC link by the Matrix one
|
8 years ago |
yflory
|
c820b3485c
|
Fix function undefined when loading a template
|
8 years ago |
yflory
|
0ef1c14d7f
|
Fix lint errors
|
8 years ago |
yflory
|
fc760b4820
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
a165332c15
|
Don't store a pad in the drive if the limit has been reached
|
8 years ago |
ansuz
|
e51c7f9cf0
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
e132ccf94a
|
prepare for upload
|
8 years ago |
yflory
|
bf7c7c45d0
|
Add the storage limit warning in the toolbar
|
8 years ago |
yflory
|
197b366712
|
Ability to drag&select in the drive
|
8 years ago |
ansuz
|
e2942f959b
|
add crypto for decrypting a chunked file
|
8 years ago |
ansuz
|
aedc46bdaf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
a97e7223f1
|
implement getBlobPathFromHex
|
8 years ago |
yflory
|
520dabe094
|
Remove the unsorted files category
|
8 years ago |
yflory
|
f50aa5c29b
|
Move the mediatag viewer into a media app
|
8 years ago |
yflory
|
6a8274518b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
9882a3a923
|
Add support for the file applicaiton in the drive
|
8 years ago |
ansuz
|
12898b3358
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
74bcec8b31
|
programming is hard okay
|
8 years ago |
yflory
|
2a417ddae8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
d985b144cc
|
Add a new hash version for the file viewer
|
8 years ago |
ansuz
|
3309087277
|
send feedback if isArray is not supported
|
8 years ago |
ansuz
|
f196b836db
|
fix undefined reference
|
8 years ago |
ansuz
|
48973bccd6
|
add tests to assert for hash parsing
|
8 years ago |
ansuz
|
5194677443
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
c9c7d61ad1
|
Media tag viewer
|
8 years ago |
ansuz
|
729d1460b9
|
Merge branch 'master' into staging
|
8 years ago |
ansuz
|
a840fb9e85
|
add example hashes and start working on hash v2
|
8 years ago |
ansuz
|
d1fa68e30d
|
build UCF Media Tag
|
8 years ago |
ansuz
|
cc33c4abe9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
a5ca461a73
|
update footer for new version
|
8 years ago |
yflory
|
fdd51ec18d
|
Don't remove a folder moved into unsorted or into itself
|
8 years ago |
ansuz
|
4b95a1da48
|
unbreak assert/translations
|
8 years ago |
ansuz
|
4fdc5f897e
|
only feedback migration if user had legacy store
|
8 years ago |
ansuz
|
218f2ff76c
|
feedback when logging in or registering
|
8 years ago |
yflory
|
4c3e842664
|
Fix focus issues with the history input in ckeditor
|
8 years ago |
ansuz
|
f7e96b4e8c
|
resolve merge conflicts and jquery errors
|
8 years ago |
yflory
|
5fc2e4cf71
|
Remove the toolbar in ckeditor history mode + history configurable
|
8 years ago |
ansuz
|
18e2e66b06
|
jshint compliance
|
8 years ago |
yflory
|
92ea03d7d9
|
View and restore the history of a pad
|
8 years ago |
ansuz
|
4c0d7bf8e8
|
support multiple calls to cryptpad.ready
|
8 years ago |
ansuz
|
ec041c88e2
|
console.log when providing feedback
also notify server if a users browser does not support proxies
|
8 years ago |
ansuz
|
c51073f211
|
support batch getFileSize calls
|
8 years ago |
ansuz
|
1af621bfe5
|
Merge remote-tracking branch 'origin/auth' into staging
|
8 years ago |
ansuz
|
3afaf029cb
|
feedback about how often we migrate an old drive
|
8 years ago |
Caleb James DeLisle
|
0e8b55edc0
|
Added an authentication page to allow getting the user pubkey
|
8 years ago |
ansuz
|
df9c312b7d
|
make new text translateable
|
8 years ago |
ansuz
|
e8b053e48b
|
use bootloader in feedback.html
|
8 years ago |
ansuz
|
a6dbfcecf3
|
remove old/unused assertions
|
8 years ago |
ansuz
|
b658bda421
|
use bootloader to fix paths to jquery and json.sortify
|
8 years ago |
ansuz
|
347459781c
|
show the size of your files, if you're logged in
|
8 years ago |
ansuz
|
2b8579e8b7
|
add pretty-printers for byte-counts
|
8 years ago |
ansuz
|
2a25afae5f
|
Merge branch 'soon' into staging
|
8 years ago |
ansuz
|
e0ecf651e2
|
add a note about showing pinned file usage
|
8 years ago |
Caleb James DeLisle
|
c341fa8e94
|
Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter
|
8 years ago |
ansuz
|
da69c1822c
|
ask users to sign back if signing keys are missing
|
8 years ago |
Pierre Bondoerffer
|
7a05462eb3
|
Some more poll changes <3
|
8 years ago |
ansuz
|
107e75b287
|
remove invalid semicolon
|
8 years ago |
ansuz
|
821c1a3ec6
|
annotate code which we hope to be able to deprecate in the future
|
8 years ago |
yflory
|
43c045721c
|
Get the channel history
|
8 years ago |
ansuz
|
f6d6f81d55
|
send feedback when a user registers
|
8 years ago |
ansuz
|
deeb47c40b
|
reportAppUsage for settings
|
8 years ago |
Pierre Bondoerffer
|
05785e96ea
|
small color change
|
8 years ago |
ansuz
|
5a83759ee2
|
add usage button to settings page
|
8 years ago |
ansuz
|
a27cc76fc0
|
uppercase LOL
|
8 years ago |
ansuz
|
402ce2db93
|
better validation of inputs
|
8 years ago |
ansuz
|
c7eae9675b
|
keep exporting isArray for backwards compatibility
but prevent internal use
|
8 years ago |
ansuz
|
fbebbf0dca
|
minor clean up
|
8 years ago |
ansuz
|
525d35c9ec
|
redefine alert
|
8 years ago |
Pierre Bondoerffer
|
20c252e5c6
|
fix placeholder styling in safari
|
8 years ago |
ansuz
|
f694a81a5c
|
move more interface code out of cryptpad-common
|
8 years ago |
ansuz
|
a4157b9908
|
remove more unused functions
|
8 years ago |
ansuz
|
e10901edb2
|
begin to move interface code out of cryptpad-common
|
8 years ago |
ansuz
|
95789d3cbe
|
expose rpc for pinned usage
|
8 years ago |
ansuz
|
8f4dbcf4c6
|
remove getPadTitle
|
8 years ago |
ansuz
|
f42da4ecd8
|
move hashChannelList into common-hash.js
|
8 years ago |
ansuz
|
63960bd38c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
520ae822fc
|
correct undefined reference
|
8 years ago |
ansuz
|
50277cb0ae
|
don't rely on 'info' in onRemote so we can call it anywhere
|
8 years ago |
ansuz
|
bf047fcf65
|
Merge pull request #110 from pbondoer/newpoll
Fix flash of autocomplete in poll
|
8 years ago |
Pierre Bondoerffer
|
96ff487271
|
fix flash of content
|
8 years ago |
ansuz
|
5a7eea08c8
|
Merge pull request #108 from pbondoer/newpoll
Poll fixes
|
8 years ago |
Pierre Bondoerffer
|
248f88034b
|
important fixes
|
8 years ago |
yflory
|
633d60ccd0
|
Remove a TODO
|
8 years ago |
Pierre Bondoerffer
|
6b57bb2bbb
|
poll: press enter to validate input
|
8 years ago |
Pierre Bondoerffer
|
d483e10e77
|
poll fixes
|
8 years ago |
yflory
|
81d83897ec
|
Rename hash.js
|
8 years ago |
yflory
|
2ad0a65b71
|
Remove shortcuts that override browser actions
|
8 years ago |
Pierre Bondoerffer
|
ea5301be13
|
poll improved(tm)
|
8 years ago |
Pierre Bondoerffer
|
7434dbcb0f
|
what i have
|
8 years ago |
yflory
|
07705cd5c1
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
eb2a3c1bbf
|
Fix lint errors
|
8 years ago |
ansuz
|
607d9652f5
|
jshint compliance
|
8 years ago |
yflory
|
3ba90332bb
|
Merge branch 'refactor' into staging
|
8 years ago |
Pierre Bondoerffer
|
f11cf8e6ac
|
move poll styles to separate file
|
8 years ago |
yflory
|
daabb0b3ad
|
Integrate and fix the new fileObject (userObject)
|
8 years ago |
ansuz
|
df4a250359
|
use feedback api instead of app=
|
8 years ago |
ansuz
|
86c37bfa37
|
fix find+replace error
|
8 years ago |
ansuz
|
e618483395
|
extract all code for encoding and decoding hashes
|
8 years ago |
ansuz
|
fdd2716ad5
|
move constants to the top of cryptpad-common.js
|
8 years ago |
yflory
|
c1e0316d43
|
Refactor fileObject
|
8 years ago |
ansuz
|
5212539a16
|
move standalone functions from common into their own file
|
8 years ago |
ansuz
|
7437d6b902
|
remove unused function
|
8 years ago |
ansuz
|
4e590a9dd1
|
remove even more dead code
|
8 years ago |
ansuz
|
85fcaa9bbc
|
remove more dead code
|
8 years ago |
ansuz
|
401936a91e
|
move singly-used css file out of /common/
|
8 years ago |
ansuz
|
9a46b58c85
|
deprecate this 90 days after f-release
|
8 years ago |
ansuz
|
7a59183bb1
|
pinpad.create should always be async
|
8 years ago |
ansuz
|
8de3610532
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
9aa0548b1f
|
remove dead cursor code
|
8 years ago |
yflory
|
4e61b79f9a
|
Clean fileObject
|
8 years ago |
yflory
|
cde724399c
|
Pin the pads
|
8 years ago |
yflory
|
74ea2fce5a
|
Fix lint error...
|
8 years ago |
yflory
|
aa49c97d6e
|
Fix lint error
|
8 years ago |
ansuz
|
2c8d1b8183
|
jshint compliance
|
8 years ago |
yflory
|
f0836f745e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
528deb11da
|
Add missing file for whiteboard
|
8 years ago |
ansuz
|
cde9ea9887
|
update footer version
|
8 years ago |
ansuz
|
05a50b1f4c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
a14bb1480a
|
progress for implicit pinning
|
8 years ago |
ansuz
|
f82278a25c
|
handle return of undefined hash
|
8 years ago |
yflory
|
d5e69653c0
|
Select opacity in draw mode in the canvas app
|
8 years ago |
ansuz
|
1d933be5a6
|
make reset return the hash, not an array with containing it
|
8 years ago |
yflory
|
f34492be94
|
Remove duplicates uid in the user list
|
8 years ago |
yflory
|
cfc5d634f4
|
Merge branch 'templates' into staging
|
8 years ago |
yflory
|
bd16e0f0e7
|
Templates in polls and canvas, and ability to disable templates
|
8 years ago |
yflory
|
63a130c678
|
Add a button to delete the selection in canvas
|
8 years ago |
yflory
|
33e19d5918
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
126498585e
|
Add a context menu on the ROOT folder in the drive
|
8 years ago |
yflory
|
be1db2a1ec
|
Ability to remove an object when draw mode is off
|
8 years ago |
ansuz
|
108ab7e9de
|
comment out a style assignment that doesn't seem necessary
|
8 years ago |
ansuz
|
8c629185e1
|
cleaner less file
|
8 years ago |
ansuz
|
0db141e48d
|
rename style files 'whiteboard' instead of main
|
8 years ago |
ansuz
|
395d8625a8
|
draw the palette on pad creation
|
8 years ago |
ansuz
|
3b99c42e22
|
no more inline styles
|
8 years ago |
ansuz
|
ef821c3e7e
|
integrate @lukevers improvements and clean up js a bit
|
8 years ago |
yflory
|
84d8615cf1
|
Save and use templates in pad, code and slides
|
8 years ago |
ansuz
|
bd2034c47b
|
prepare rpc before 'ready' if pinning is enabled
|
8 years ago |
ansuz
|
a70388284d
|
disable unnecessary messages
|
8 years ago |
ansuz
|
abd87e1322
|
jshint compliance
|
8 years ago |
ansuz
|
e4b15bc616
|
implement 'getCanonicalChannelList'
|
8 years ago |
ansuz
|
09f8e139fe
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
a2f692b9a3
|
clean up serverside and clientside pinning logic
|
8 years ago |
yflory
|
a13261abaa
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
dedf2b3c69
|
Display selected color and button to turn off draw mode in canvas
|
8 years ago |
ansuz
|
fdede0d1fd
|
remove some dead code
|
8 years ago |
ansuz
|
e87992c7ec
|
implement atomic pin reset rpc
|
8 years ago |
ansuz
|
166e70f628
|
test new rpc apis
|
8 years ago |
ansuz
|
2a566671f2
|
remove outdated rpc example
|
8 years ago |
ansuz
|
3380cf0348
|
implement getTotalSize rpc
|
8 years ago |
ansuz
|
6e1ffcc18d
|
define better color palette
|
8 years ago |
yflory
|
84029ac2d7
|
Fix the color picker in Chromium 53 and improve the cursor
|
8 years ago |
ansuz
|
5c292fb1fa
|
jshint compliance
|
8 years ago |
yflory
|
b14d89360d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
8e29e30a35
|
Realtime palette + cursor corresponding to the brush
|
8 years ago |
ansuz
|
8bbbf8e252
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
64089c5f6b
|
implement pad pinning
|
8 years ago |
yflory
|
d07acc5364
|
Don't redraw the drive if filesData changes while in unsorted
|
8 years ago |
yflory
|
13514dff63
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
46a5eee597
|
Display the spinner in the toolbar for local changes
|
8 years ago |
ansuz
|
6c7cdc90a9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
212baeb3a6
|
better cookie schema. expire old sessions
|
8 years ago |
yflory
|
54d271c4e7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
a9777ce560
|
Fix input losing focus in polls with Chrome 57
|
8 years ago |
ansuz
|
3484515283
|
enable more tests
|
8 years ago |
ansuz
|
3e47b8a38d
|
remove dead code
|
8 years ago |
ansuz
|
31b178a306
|
use pinpad api
|
8 years ago |
ansuz
|
182dbfc874
|
implement pinning logic in pinpad.js
|
8 years ago |
ansuz
|
a5e5ddae08
|
rpc all the things
|
8 years ago |
ansuz
|
4f7e25eeb9
|
show labels for brush width
|
8 years ago |
ansuz
|
2a6de5163b
|
jshint compliance
|
8 years ago |
ansuz
|
04069cc7f4
|
fix font size
|
8 years ago |
ansuz
|
1e51f89096
|
wipe the userdoc when the canvas is cleared
|
8 years ago |
ansuz
|
e2981c0223
|
try to make the color picker show the current color
|
8 years ago |
ansuz
|
96dac80bd5
|
better color picker in whiteboard
|
8 years ago |
ansuz
|
bd07b3a80f
|
less cramped styling on text inputs on /settings/
|
8 years ago |
ansuz
|
6e9968f989
|
add 'lol' code theme
|
8 years ago |
ansuz
|
b85324a29e
|
jshint compliance
|
8 years ago |
ansuz
|
73d4fd1700
|
handle reconnection attempts
|
8 years ago |
ansuz
|
b07248ad42
|
prompt with setName if name is unset
|
8 years ago |
ansuz
|
9b4b642d4a
|
protect against subtly corrupted user objects
|
8 years ago |
ansuz
|
18469edf18
|
extend list item rendering to support gfm task lists
|
8 years ago |
ansuz
|
055bc03092
|
strip carriage return
|
8 years ago |
ansuz
|
bca13ad5a5
|
add notifications to whiteboard
|
8 years ago |
ansuz
|
233bb7a14f
|
reorganize some html tags for smaller diffs
|
8 years ago |
ansuz
|
76471f7b90
|
add forget button to whiteboard and handle disconnection better
|
8 years ago |
ansuz
|
d4ce3dc6b9
|
don't rewrite css rules. FOUC is too long
|
8 years ago |
ansuz
|
3cfd0a4326
|
commit some garbage
|
8 years ago |
ansuz
|
364dae2882
|
update templated html
|
8 years ago |
ansuz
|
ed89a13fe6
|
progress on adding version string to some css
|
8 years ago |
ansuz
|
4d5baa717d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
76990ac1b2
|
version toolbar.css for cache-busting
|
8 years ago |
ansuz
|
9d3f859657
|
add a contextMenu entry for the whiteboard app
|
8 years ago |
yflory
|
7ede430db3
|
Fix 'search.oldLocation is undefined' error
|
8 years ago |
ansuz
|
df7363f416
|
regenerate templated files for new footer
|
8 years ago |
yflory
|
72fecb9549
|
Fix lint errors
|
8 years ago |
yflory
|
af68e41fb6
|
Always set the focus to the search bar in the drive
|
8 years ago |
yflory
|
67f4096396
|
Fix cursor in the drive search bar
|
8 years ago |
yflory
|
12cc49b575
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
72c60ec676
|
Add background to the whiteboard app
|
8 years ago |
yflory
|
2732b7aa82
|
Fix module.onLocal not defined
|
8 years ago |
ansuz
|
a0c17d7c9b
|
latest rpc code
|
8 years ago |
yflory
|
4ddf9b4e04
|
Improve whiteboard UI
|
8 years ago |
yflory
|
89877baa69
|
Fix read-only mode in canvas app
|
8 years ago |
yflory
|
c2cb24c072
|
Add toolbar to the whiteboard app
|
8 years ago |
ansuz
|
973aeba0da
|
remove bundled fabric.js
|
8 years ago |
ansuz
|
6eab52c33d
|
use secure fabric.js
|
8 years ago |
ansuz
|
59a80d5fde
|
remove silly TODO
|
8 years ago |
ansuz
|
ce5dbaeafd
|
use alertify instead of browser prompt
|
8 years ago |
yflory
|
71c59d7ae2
|
Remove unnecessary TODOs
|
8 years ago |
yflory
|
d92a875ce5
|
Translate the 'wrong application' error message
|
8 years ago |
yflory
|
a8ffac5dcd
|
Remove old code
|
8 years ago |
yflory
|
5322eff607
|
Use the current values for the checkboxes in the print options dialog
|
8 years ago |
yflory
|
53c60a31f6
|
Set the properties and backup inputs to read-only in the drive
|
8 years ago |
yflory
|
0c5a930cb9
|
Fix an issue with the 'Properties' entry not always displayed in context menu
|
8 years ago |
ansuz
|
3e9eb03e5a
|
display a user's public signing key in settings if it exists
|
8 years ago |
ansuz
|
912215185f
|
add uid to userdata for better notifications
|
8 years ago |
ansuz
|
fa9249ef29
|
don't notify for userlist changes if a user joins twice
|
8 years ago |
ansuz
|
40f5e1706f
|
add a unique id to user objects, define a getter
|
8 years ago |
ansuz
|
e2ee80d4e7
|
set icon for whiteboard app
|
8 years ago |
ansuz
|
dbca94437e
|
rename canvas app to 'whiteboard'
|
8 years ago |
yflory
|
994d640f8b
|
Fix an issue causing the lag icon to lose its color
|
8 years ago |
yflory
|
819c7e3bae
|
Fix style issue with drag&drop in the active folder
|
8 years ago |
yflory
|
6fbd1f0028
|
Store the dates as number and not strings to avoid ot issues
|
8 years ago |
yflory
|
8556ce9d17
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
8ce8401107
|
Fix issues with middle click in context menus
|
8 years ago |
yflory
|
5f4990cc80
|
Display or hide the context menu in a more intuitive way with multiselect
|
8 years ago |
yflory
|
51033ab70a
|
Remove useless links in the context menu and properties for readonly pads in the drive
|
8 years ago |
ansuz
|
2b2e581779
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
2e8484ad4c
|
notes about what to improve. transform json on OT instead of just validating
|
8 years ago |
yflory
|
7afde2309d
|
Add properties to the files not in the trash
|
8 years ago |
yflory
|
61d33f2dd6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into prop
|
8 years ago |
yflory
|
66a80ea50c
|
Add properties for pads in the drive
|
8 years ago |
ansuz
|
b542245086
|
fix lint error
|
8 years ago |
ansuz
|
cc43bb8362
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
98027dad27
|
jshint compliance
|
8 years ago |
ansuz
|
eeecb1baab
|
Make Canvas Work Again
|
8 years ago |
ansuz
|
4a173e30dc
|
set user's cursor to either the beginning or end of the document
|
8 years ago |
yflory
|
29174b2922
|
Update the lag icon
|
8 years ago |
yflory
|
26edb77cf0
|
Fix style and usability issues in slides
|
8 years ago |
yflory
|
85105a1382
|
Active folder in drive is not underlined anymore
|
8 years ago |
yflory
|
cd77f50717
|
Fix transitions in slides, add swipe event handlers, and fix print in firefox
|
8 years ago |
yflory
|
e139295d7e
|
Add transitions in present mode
|
8 years ago |
yflory
|
45ac3e40a2
|
Copy print options to present mode
|
8 years ago |
yflory
|
a5f11d0d0d
|
Uniform the slides rendering in present and print mode
|
8 years ago |
ansuz
|
d422c7e165
|
support old hashes in getUserChannelList
|
8 years ago |
ansuz
|
7d5ff27900
|
better rpc tests, sum up your channel usage
|
8 years ago |
ansuz
|
5ed6223313
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
7f2f1f7191
|
correctly initialize RPC object
|
8 years ago |
ansuz
|
c9c9dd0999
|
use userChannelList if a list is not supplied to pinpad
|
8 years ago |
ansuz
|
e8c3cf6aa5
|
implement rpc message signing
|
8 years ago |
ansuz
|
d85a42c776
|
include User_hash in user channel list
|
8 years ago |
yflory
|
f98c825dc3
|
Fix keyboard shortcuts not working in CryptDrive
|
8 years ago |
yflory
|
7b27f1dc2c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
7761aaa89f
|
Add search UI
|
8 years ago |
ansuz
|
b578803136
|
clean up registration code a little bit
|
8 years ago |
ansuz
|
c3c866fa2b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
d19bbcb001
|
Add support for search in the drive
|
8 years ago |
ansuz
|
5eb32b33ee
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
298725b3c2
|
don't show usage tips on error screens
|
8 years ago |
ansuz
|
0a6373852e
|
add signing keys to user object at login and register time
|
8 years ago |
yflory
|
9a32fb1999
|
Fix sub-folders changing position in the tree when renaming them
|
8 years ago |
yflory
|
931f7619c0
|
Keep the scroll position on redraw in drive
|
8 years ago |
yflory
|
0607c3bbf3
|
Add a title to the 'new' button in drive
|
8 years ago |
yflory
|
b9c64a526a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
15e9af77bb
|
Remove the langauge selector from toolbar and add it in settings
|
8 years ago |
ansuz
|
8129b8cdc1
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
15a67afc75
|
jshint compliance
|
8 years ago |
yflory
|
13d7b3cadc
|
Merge branch 'd' into staging
|
8 years ago |
yflory
|
a286599f93
|
Fix fast reconnect, and add support for reconnecting ws in polls
|
8 years ago |
ansuz
|
bd9efd7c04
|
provide examples of valid and invalid rpc calls
|
8 years ago |
ansuz
|
7187d3c550
|
implement getUserChannelList
|
8 years ago |
ansuz
|
306f6ce806
|
resolve merge-conflict with accounting branch
|
8 years ago |
yflory
|
fe5e33a0ee
|
Fix loss of presentation position when updating slides
|
8 years ago |
ansuz
|
805e26bc07
|
add a version footer to main pages
|
8 years ago |
yflory
|
f10149db1c
|
Make sure the tip is always visible when the loading screen is removed
|
8 years ago |
ansuz
|
71db08eac2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
09afba80db
|
add support for logging in from register page
|
8 years ago |
yflory
|
16e5788011
|
Call the callback if we can't parse the local Drive to import it
|
8 years ago |
ansuz
|
413d9a6f0b
|
add a style-callback to confirm
|
8 years ago |
ansuz
|
5d88c3a436
|
newer registration code
|
8 years ago |
ansuz
|
10bb11bff6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
803e57c958
|
add more parameters to confirm dialogs
|
8 years ago |
yflory
|
ceaf757680
|
Allow right click on the CryptPad logo/link in the top left corner
|
8 years ago |
ansuz
|
f2aa531f27
|
apply styles to confirm buttons if provided
|
8 years ago |
ansuz
|
df6298eeb6
|
apply styles to confirm buttons if provided
|
8 years ago |
yflory
|
84c16c00ad
|
Fix click events not working on inputs in the drive tree
|
8 years ago |
ansuz
|
07a2d8e189
|
apply translations on feedback page
|
8 years ago |
yflory
|
ca9faa0056
|
Fix wrong translation keys
|
8 years ago |
yflory
|
b7986ff6b1
|
Replace the spinner code with a font awesome spinner
|
8 years ago |
ansuz
|
6e733b1329
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
d9996cc874
|
current work for pinning
|
8 years ago |
ansuz
|
a7d61aa562
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting
|
8 years ago |
ansuz
|
b3cc8da315
|
implement basic clientside RPC infrastructure
and provide a basic example for testing it
|
8 years ago |
yflory
|
f94db93897
|
Improve the slides layout in print mode
|
8 years ago |
ansuz
|
81027b4200
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting
|
8 years ago |
yflory
|
2392167996
|
Export slides as PDF
|
8 years ago |
yflory
|
4bac8ea0c7
|
Draw all the slides at once to allow reference links (fix #77)
|
8 years ago |
yflory
|
459b18c97b
|
Add the loading screen in the HTML so that it is displayed before JS is loaded
|
8 years ago |
yflory
|
404fa378e6
|
Move the store to the 'common' folder, it is not customizable anymore
|
8 years ago |
yflory
|
a8d200ef2e
|
Don't redirect until realtime is synced when logging in
|
8 years ago |
yflory
|
0c1efd361b
|
Make sure the href is updated everywhere when importing a stronger link
|
8 years ago |
yflory
|
b701e3cc85
|
Fix lint errors
|
8 years ago |
yflory
|
4206382865
|
Fix the settings app to allow backup for unregistered users
|
8 years ago |
yflory
|
f62267f8a1
|
Ability to import local pads in the user object
|
8 years ago |
ansuz
|
e2418a6be2
|
sketch of how pinning rpc will look
|
8 years ago |
ansuz
|
dc567fa7f3
|
signing keys are stored in hex so encode and decode them
|
8 years ago |
yflory
|
ce6cd1211e
|
Fix lint errors
|
8 years ago |
ansuz
|
aa762e7d63
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
8a48612de2
|
add some notes for later
|
8 years ago |
yflory
|
9ad33574e9
|
Fix the function returning the pads list in the drive
|
8 years ago |
yflory
|
14938089ac
|
Keep the focus on the iframe window after canceling a deletion
|
8 years ago |
yflory
|
3f7dea8f7e
|
Context menu support for multi-select options in drive
|
8 years ago |
yflory
|
e1c02fd8a4
|
Drive rename: save pads and folders name on click, cancel with Esc.
|
8 years ago |
yflory
|
d93a270336
|
Ability to display tips in the loading screen
|
8 years ago |
yflory
|
77d09f64e1
|
Display anonymous users in the user list
|
8 years ago |
yflory
|
cb88227e2b
|
Autocomplete on key press in some dropdown menus
|
8 years ago |
ansuz
|
c04819538b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
fcb9848b3a
|
hide toolbar when in read-only mode
|
8 years ago |
yflory
|
2a1b241592
|
Display a button to open the editing link while in read-only mode if we know it
|
8 years ago |
yflory
|
27241488a5
|
Merge pull request #96 from pbondoer/css
(CSS) Some improvements to drive
|
8 years ago |
Pierre Bondoerffer
|
6c9da646e0
|
(CSS) Some improvements to drive
|
8 years ago |
ansuz
|
08c862b271
|
add FIXME notes to poll
|
8 years ago |
yflory
|
ed9bcca96f
|
Close the websocket network when CryptGet/CryptPut is done
|
8 years ago |
yflory
|
a68acac13b
|
Only ask for a display name once in /poll
|
8 years ago |
yflory
|
a978b51656
|
If display name is empty, use anonymous in the drive
|
8 years ago |
yflory
|
153386a6e0
|
CSS improvements in the drive tree
|
8 years ago |
yflory
|
6098f28260
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
a852112808
|
Fix open folder from the tree context menu
|
8 years ago |
ansuz
|
2c9deed381
|
Merge pull request #94 from pbondoer/staging
Some CSS fixes
|
8 years ago |
ansuz
|
868161a8a8
|
fix undefined reference in code
|
8 years ago |
ansuz
|
0bb10a8a0a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
Pierre Bondoerffer
|
800db07077
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
e1303a16da
|
add support for title attributes on dropdowns
|
8 years ago |
yflory
|
52793385ea
|
Fix lint errors
|
8 years ago |
Pierre Bondoerffer
|
e39fe1c0b7
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
01c4d7d4a7
|
Merge branch 'maybe' into staging
|
8 years ago |
ansuz
|
c884782d57
|
here are some changes
|
8 years ago |
yflory
|
2b6e44189d
|
When trying to reset the drive, tell the user if the input text is invalid
|
8 years ago |
yflory
|
9a7c2dd5e2
|
Add a 'settings' link to the user menu in static pages
|
8 years ago |
yflory
|
370ae81106
|
Use the display name in the backup file name if not logged in
|
8 years ago |
Pierre Bondoerffer
|
e0d972674f
|
Fix context menu in drive and rename textbox styling
|
8 years ago |
yflory
|
c5f983ecd7
|
Convert read-only link to editing link in the drive
|
8 years ago |
Pierre Bondoerffer
|
d26d8f53d9
|
(CSS) Fixed textarea being too large
|
8 years ago |
ansuz
|
a9afa24428
|
return empty string instead of blowing up when fixing HTML
|
8 years ago |
yflory
|
6b8d0c8bc7
|
Merge branch 'security2' of git.xwikisas.com:xwiki-labs/cryptpad into security2
|
8 years ago |
yflory
|
b32d698291
|
Fix issue with present mode in slide (readonly)
|
8 years ago |
yflory
|
8bdc8415ab
|
Find a pad in the drive
|
8 years ago |
Caleb James DeLisle
|
91eda5fa83
|
Implement stronger content-security-policy except in /pad/ which does not allow it.
Implement a "loader" which allows for applying a version number to everything.
Added a cache control for anything which has a version.
|
8 years ago |
ansuz
|
7db0e14bc0
|
add 'force' flag to override removal of html elements
|
8 years ago |
yflory
|
53f4f8826e
|
Merge branch 'staging' into staging
|
8 years ago |
yflory
|
55210f17eb
|
Clean the code to be less dependant on 'li'
|
8 years ago |