ansuz
|
91f6e3e543
|
remove a lot of dead code
|
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
|
f58d4c941f
|
clean up a bit
|
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 |
|
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
|
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 |
|
ansuz
|
002eed0d6f
|
make most of the messenger api async
|
7 years ago |
|
Caleb James DeLisle
|
d9f5e3638e
|
Big caching improvements :D
|
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
|
aa9e0d3cd3
|
Enable AppConfig in pad2
|
7 years ago |
|
yflory
|
f40d2c0b20
|
Add templates to pad2
|
7 years ago |
|
yflory
|
8d020833af
|
Add missing file
|
7 years ago |
|
yflory
|
8d837d22ea
|
Add history to pad2
|
7 years ago |
|
yflory
|
b2e6df1f9d
|
Add import & export 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 |
|
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
|
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
|
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
|
130b330ede
|
refactor messaging
|
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
|
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 |
|
Pierre Bondoerffer
|
17b986a6ca
|
fix toolbar drive link (oops)
|
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 |
|
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 |
|
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 |
|
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 |
|
ansuz
|
844967a880
|
continued refactoring
|
7 years ago |
|
Pierre Bondoerffer
|
a4aeada585
|
make the file dialog placeholder visible, center file list
|
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
|
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
|
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 |
|
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
|
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
|
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
|
66d81429bd
|
integrate file embed into code editor
|
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
|
3fa010027c
|
implement clearTooltips
|
7 years ago |
|
ansuz
|
a68a225d79
|
fix read-only synchronization bug
|
7 years ago |
|
CatalinScr
|
796bf89491
|
Update of the front-page
|
8 years ago |
|
Nicolas Lemoine
|
658b00814b
|
TodoApp - Style and translations
|
8 years ago |
|
ansuz
|
ae693ff5a7
|
lint compliance
|
8 years ago |
|
ansuz
|
6622735db0
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
55cb0734e2
|
make bad state timeout configurable
|
8 years ago |
|
yflory
|
469f49fc0a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
a80b00a765
|
Move the file picker in common
|
8 years ago |
|
ansuz
|
d44f0696af
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
2d0635a409
|
use custom version of tippy
|
8 years ago |
|
yflory
|
09793e0d7d
|
jshint
|
8 years ago |
|
yflory
|
683769f30a
|
Fix tooltips
|
8 years ago |
|
yflory
|
9633025afe
|
CSS for the removeHistory button in contacts
|
8 years ago |
|
yflory
|
97f1bbedc5
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
b9bba76b4e
|
Make the delay for tooltips configurable
|
8 years ago |
|
ansuz
|
dd98e2222a
|
WIP erase chat history button
|
8 years ago |
|
ansuz
|
128d5b2c6d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
b22127f10c
|
add history removal
|
8 years ago |
|
yflory
|
a5a73ce326
|
Fix print button in slide
|
8 years ago |
|
yflory
|
140964478e
|
Enter + shift key to add a new line in chat
|
8 years ago |
|
yflory
|
e26e041a5b
|
fix jshint errors
|
8 years ago |
|
yflory
|
c33d2a2db0
|
New tooltips
|
8 years ago |
|
yflory
|
b56a782f01
|
Store the userlist state when it is closed using the icon
|
8 years ago |
|
yflory
|
82c87144cb
|
Remove the friend request button when the request is sent
|
8 years ago |
|
yflory
|
5ce49af57b
|
Make CryptDrive fast again
|
8 years ago |
|
yflory
|
e2d031c76a
|
Add support for markdown syntax in contacts
|
8 years ago |
|
yflory
|
cba113a2b0
|
Lint
|
8 years ago |
|
yflory
|
91ebbdfdb4
|
View contact status
|
8 years ago |
|
ansuz
|
39fd0d0f5f
|
notify if you're focused on a conversation in a bacgkrounded tab
|
8 years ago |
|
yflory
|
f719b34e09
|
Add tab notification in contacts
|
8 years ago |
|
yflory
|
baf439648e
|
Add the contacts app in the dropdown menu
|
8 years ago |
|
yflory
|
36d792874a
|
Fix initial text not removed in /contacts
|
8 years ago |
|
ansuz
|
df0442c2bf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
eb4b5ca77c
|
stub history removal. coming soon
|
8 years ago |
|
yflory
|
aa8181ab2b
|
Contacts app translations
|
8 years ago |
|
yflory
|
73e32f273e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
009d01abde
|
Fix friend removal and update user data
|
8 years ago |
|
ansuz
|
1aecdeb075
|
fresh media tag build
|
8 years ago |
|
ansuz
|
7114bfaa52
|
lint compliance
|
8 years ago |
|
ansuz
|
e2c17dbeb4
|
resolve conflicts
|
8 years ago |
|
yflory
|
557f13f796
|
Unfriend and update username - beta
|
8 years ago |
|
ansuz
|
96d2ff67e1
|
user-plus as icon for add-friend
|
8 years ago |
|
ansuz
|
c3ba7cd792
|
fix race condition
|
8 years ago |
|
ansuz
|
d0d38aa2a3
|
feedback on first visit
|
8 years ago |
|
ansuz
|
9527a5def7
|
avoid a CSP error. silence pdfjs warnings
|
8 years ago |
|
ansuz
|
9707433944
|
comment out debugging info
|
8 years ago |
|
ansuz
|
575d4612f9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
eda9908c3b
|
prevent accessing attributes of null
|
8 years ago |
|
ansuz
|
eeb2ee2d17
|
add clear channel rpc
|
8 years ago |
|
ansuz
|
89af8e4472
|
fix funny off-by-one thing
|
8 years ago |
|
yflory
|
ac684a8dc7
|
Use the APP toolbar in profile
|
8 years ago |
|
yflory
|
2d509e3e25
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
b3e225cb3b
|
Replace spinner by text and fix mobile UI
|
8 years ago |
|
ansuz
|
f450a28d11
|
improve logic for guessing titles within code documents
|
8 years ago |
|
ansuz
|
0483d15b8f
|
lint compliance
|
8 years ago |
|
ansuz
|
c0cb5c4263
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 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
|
8 years ago |
|
ansuz
|
5b3cca58bd
|
modifications to handle latest media-tag
|
8 years ago |
|
yflory
|
7f5c301734
|
Add display name in the settings useradmin menu
|
8 years ago |
|
yflory
|
fb21a650ce
|
Lint errors
|
8 years ago |
|
yflory
|
159ccc2866
|
Fix mediatag flickering
|
8 years ago |
|
yflory
|
16d0527e92
|
Add a page title in drive, settings and file
|
8 years ago |
|
yflory
|
a0b14faf89
|
Fix the font in settings and drive
|
8 years ago |
|
yflory
|
8f5a244999
|
Replace mediatag markdown syntax by html. Enable file upload in /code.
|
8 years ago |
|
yflory
|
438e7e6cf9
|
Fix display name in useradmin (friends app)
|
8 years ago |
|
yflory
|
e6188bfb63
|
Fix useradmin dropdown position
|
8 years ago |
|
yflory
|
97d8d86395
|
Fix avatar in static pages
|
8 years ago |
|
yflory
|
e8f3df5a46
|
Clean less
|
8 years ago |
|
yflory
|
159d72f33b
|
Merge branch 'msg' into staging
|
8 years ago |
|
yflory
|
8e2e8b1653
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
ff10c282d4
|
Avatar in the user admin button
|
8 years ago |
|
yflory
|
be6ee672d3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
f0523a0153
|
Avatar in the user admin menu
|
8 years ago |
|
ansuz
|
e10de1219b
|
feedback on view hash usage
|
8 years ago |
|
ansuz
|
52eb8e307c
|
feedback for language used
|
8 years ago |
|
yflory
|
1c531ccd47
|
Pin the chat channels
|
8 years ago |
|
ansuz
|
4a37bc4a1c
|
abort the realtime session if it does not synchronize for 30 seconds
|
8 years ago |
|
ansuz
|
c096872467
|
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
|
8 years ago |
|
ansuz
|
22fbc7e5d8
|
implement getter for public keys
|
8 years ago |
|
yflory
|
df103c4074
|
Messaging app
|
8 years ago |
|
ansuz
|
1c462d5c4a
|
use random token for feedback instead of date
|
8 years ago |
|
yflory
|
21f1527c71
|
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
|
8 years ago |
|
yflory
|
5c7441f82c
|
Display the friend list in the friend app
|
8 years ago |
|
ansuz
|
fac715dd09
|
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
|
8 years ago |
|
ansuz
|
4b23ef74d7
|
add support for curve message signing and curve validateKeys
|
8 years ago |
|
yflory
|
a5e8f6ae81
|
Add friend app and fix avatar size
|
8 years ago |
|
yflory
|
af31771e3a
|
Share a channel id, not a hash
|
8 years ago |
|
yflory
|
852b2eaf1d
|
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
|
8 years ago |
|
yflory
|
26a83003b5
|
Create an owned channel
|
8 years ago |
|
yflory
|
5b5a7ab286
|
Hide the friend button when the resquest is accepted
|
8 years ago |
|
ansuz
|
d3bbdc27c0
|
lint compliance
|
8 years ago |
|
ansuz
|
bce0b03ba4
|
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
|
8 years ago |
|
ansuz
|
909e00bbc3
|
create a listmap object using public key crypto
|
8 years ago |
|
yflory
|
96fde4e5ed
|
Add missing file
|
8 years ago |
|
ansuz
|
df53166b37
|
implement and use prototype curve encryptors
|
8 years ago |
|
ansuz
|
d293ba4d44
|
add support for invite hashes
|
8 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
|
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 |
|
yflory
|
cab595f959
|
Fix duplicate folders in the drive
|
8 years ago |
|
ansuz
|
ac8da0d52d
|
load codemirror in the correct context. fix selection events
|
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 |
|
yflory
|
fa2d857d70
|
Fix css issues with Safari
|
8 years ago |
|
yflory
|
81c8949aee
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
8b0210baf1
|
hide useless error
|
8 years ago |
|
yflory
|
991cb896bd
|
Fix avatar in /pad
|
8 years ago |
|
ansuz
|
6ac056e314
|
make explicit file size RPCs unauthenticated
|
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
|
b153dda6ff
|
Add avatars in the user list
|
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
|
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
|
75c2a1fd73
|
jshint compliance
|
8 years ago |
|
ansuz
|
b8934c0b97
|
smarter redraws of drive/settings usage bar
|
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 |
|
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
|
39149a052b
|
add new feedback keys
|
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 |
|
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
|
1c1869a22c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
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
|
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
|
33ea8cb183
|
Make sure we don't call both the yes and no handlers in prompts
|
8 years ago |
|
ansuz
|
51e06e68a7
|
don't change slides when navigating through history
|
8 years ago |
|
yflory
|
38f568635d
|
Fix duplicate media-tag in slides when adding or removing a slide
|
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
|
2710279904
|
Use the new share button in the file app
|
8 years ago |
|
yflory
|
684269fdda
|
Userlist in polls
|
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
|
ab54dcf84d
|
make libs pass jshint
|
8 years ago |
|
yflory
|
8d956c3de6
|
New toolbar
|
8 years ago |
|
ansuz
|
48f9745619
|
clientside templating
|
8 years ago |
|
yflory
|
b7a0547b77
|
New toolbar colors
|
8 years ago |
|
yflory
|
3052ec8abb
|
Merge branch 'newCk' into staging
|
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
|
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
|
f29f430e7c
|
better handling of non-rpc messages
|
8 years ago |
|
yflory
|
e40f43bd20
|
Migrated pads were not displayed instantly in the drive
|
8 years ago |
|
yflory
|
a5924cb803
|
Make sure the initial title is set in the userDoc when creating a new pad
|
8 years ago |
|
ansuz
|
0e9ebddf11
|
fix the things
|
8 years ago |
|
ansuz
|
c0e2c1060e
|
don't reload when slide hash changes
|
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
|
17146d7af9
|
send feedback for uploads
|
8 years ago |
|
yflory
|
2068a8b85b
|
Embed the mediatag library in the file app
|
8 years ago |
|
yflory
|
66b076111e
|
Add an upload button to the slide's file picker
|
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
|
a237eec41e
|
Add a file picker in the slide app
|
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 |
|
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
|
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
|
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
|
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 |
|
yflory
|
803bad1421
|
Move the file upload code in a separate file
|
8 years ago |
|
yflory
|
a58162a617
|
Make the drive tests work when not logged in
|
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 |
|
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 |
|
yflory
|
30bdb9881c
|
Fix undefined element in select dropdown menus
|
8 years ago |
|
yflory
|
8471dab6b1
|
Provide hints in theme and language dropdowns
|
8 years ago |
|
yflory
|
a5cb5f2ceb
|
Merge branch 'staging' into newDrive
|
8 years ago |
|
yflory
|
9cc25d4c9f
|
Merge branch 'staging' into newDrive
|
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 |
|
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 |
|
yflory
|
1c2ea04f11
|
Drive refactoring
|
8 years ago |
|
ansuz
|
fe42f5e88c
|
ask for new cookies and resend commands on NO_COOKIE errors
|
8 years ago |
|
ansuz
|
da533b106a
|
improve type checking in getFileSize
|
8 years ago |
|
ansuz
|
d25477e8c6
|
don't let tooltips interfere with DOM interaction
|
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
|
767793b5ca
|
fix stuck loading tip
|
8 years ago |
|
ansuz
|
f631973f1f
|
optimize file upload
|
8 years ago |
|
ansuz
|
55af84cc90
|
lower spinner timeout interval
|
8 years ago |
|
ansuz
|
07279c8dc7
|
export boolean Test.testing
|
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
|
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
|
21c39572be
|
Update media-tag and fix bower dependencies
|
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
|
9ca5bc507e
|
add support for donate button
|
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 |
|
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 |
|
yflory
|
df2b00122a
|
New drive structure without file names
|
8 years ago |