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 |