yflory
|
743b87b70f
|
Add initial text in /contacts
|
2017-07-17 18:51:23 +02:00 |
|
ansuz
|
df0442c2bf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-17 18:40:27 +02:00 |
|
ansuz
|
eb4b5ca77c
|
stub history removal. coming soon
|
2017-07-17 18:39:44 +02:00 |
|
yflory
|
aa8181ab2b
|
Contacts app translations
|
2017-07-17 18:34:46 +02:00 |
|
yflory
|
73e32f273e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-17 18:08:07 +02:00 |
|
yflory
|
009d01abde
|
Fix friend removal and update user data
|
2017-07-17 18:07:58 +02:00 |
|
ansuz
|
0cd94e2ba8
|
add title to contacts app
|
2017-07-17 17:38:41 +02:00 |
|
ansuz
|
f2320190b8
|
change friends url to /contacts/
|
2017-07-17 17:18:28 +02:00 |
|
ansuz
|
a28a59abf0
|
harden server further against bad channel ids
|
2017-07-17 16:34:47 +02:00 |
|
ansuz
|
06c971ec47
|
s/friend/contact/g
|
2017-07-17 15:52:13 +02:00 |
|
ansuz
|
756b561bbc
|
lint compliance
|
2017-07-17 14:12:51 +02:00 |
|
ansuz
|
2e0aa185cd
|
uppercase first letter of new translation keys
|
2017-07-17 14:12:05 +02:00 |
|
ansuz
|
6306de5265
|
set avatar border-radius to 4px
|
2017-07-17 13:43:51 +02:00 |
|
ansuz
|
c452f25414
|
stub invite app
|
2017-07-17 11:56:34 +02:00 |
|
ansuz
|
1aecdeb075
|
fresh media tag build
|
2017-07-17 11:08:39 +02:00 |
|
ansuz
|
33dcd2ae28
|
drop black border from avatars in userlist
|
2017-07-17 11:08:20 +02:00 |
|
ansuz
|
7114bfaa52
|
lint compliance
|
2017-07-13 21:09:29 +02:00 |
|
ansuz
|
9ef45fe9f1
|
add background-color to names in chat
|
2017-07-13 18:04:56 +02:00 |
|
ansuz
|
e2c17dbeb4
|
resolve conflicts
|
2017-07-13 17:52:00 +02:00 |
|
ansuz
|
0340b45f2c
|
migrate profile to include edKey. don't propose connecting to users with whom you are already friends
|
2017-07-13 17:45:13 +02:00 |
|
yflory
|
557f13f796
|
Unfriend and update username - beta
|
2017-07-13 17:32:57 +02:00 |
|
ansuz
|
b295aaa6c7
|
harden clearChannel implementation
|
2017-07-13 17:28:07 +02:00 |
|
ansuz
|
7be1e249e1
|
add fa-share-alt to pad initialText
|
2017-07-13 15:48:03 +02:00 |
|
ansuz
|
96d2ff67e1
|
user-plus as icon for add-friend
|
2017-07-13 15:22:11 +02:00 |
|
ansuz
|
c3ba7cd792
|
fix race condition
|
2017-07-13 12:55:08 +02:00 |
|
ansuz
|
bf9c2b0b84
|
new messages
|
2017-07-13 12:29:49 +02:00 |
|
ansuz
|
980d555500
|
enable img-src blob: in /pad/
|
2017-07-13 11:19:45 +02:00 |
|
ansuz
|
d0d38aa2a3
|
feedback on first visit
|
2017-07-13 11:03:56 +02:00 |
|
ansuz
|
9527a5def7
|
avoid a CSP error. silence pdfjs warnings
|
2017-07-13 10:58:45 +02:00 |
|
ansuz
|
9707433944
|
comment out debugging info
|
2017-07-13 10:57:51 +02:00 |
|
ansuz
|
7a225af11e
|
fix some minor slide navigation bugs
|
2017-07-13 10:57:27 +02:00 |
|
Caleb James DeLisle
|
f6abdc2b86
|
manual merge of staging
|
2017-07-13 10:30:42 +02:00 |
|
ansuz
|
a756faf818
|
lint compliance
|
2017-07-13 08:36:55 +02:00 |
|
ansuz
|
575d4612f9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-12 18:56:12 +02:00 |
|
ansuz
|
eda9908c3b
|
prevent accessing attributes of null
|
2017-07-12 18:56:04 +02:00 |
|
ansuz
|
eeb2ee2d17
|
add clear channel rpc
|
2017-07-12 18:55:29 +02:00 |
|
yflory
|
8fb5762eea
|
Lint errors
|
2017-07-12 18:51:19 +02:00 |
|
ansuz
|
89af8e4472
|
fix funny off-by-one thing
|
2017-07-12 18:49:33 +02:00 |
|
yflory
|
ac684a8dc7
|
Use the APP toolbar in profile
|
2017-07-12 18:34:16 +02:00 |
|
yflory
|
2d509e3e25
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-12 14:34:57 +02:00 |
|
yflory
|
b3e225cb3b
|
Replace spinner by text and fix mobile UI
|
2017-07-12 14:33:28 +02:00 |
|
ansuz
|
f450a28d11
|
improve logic for guessing titles within code documents
|
2017-07-12 11:09:53 +02:00 |
|
ansuz
|
0483d15b8f
|
lint compliance
|
2017-07-12 10:55:42 +02:00 |
|
ansuz
|
3453e54357
|
bump footer and package.json for upcoming version
|
2017-07-12 10:49:05 +02:00 |
|
ansuz
|
c0cb5c4263
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-12 10:46:15 +02:00 |
|
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
|
2017-07-12 10:44:40 +02:00 |
|
ansuz
|
5b3cca58bd
|
modifications to handle latest media-tag
|
2017-07-12 10:44:03 +02:00 |
|
yflory
|
7f5c301734
|
Add display name in the settings useradmin menu
|
2017-07-11 18:50:41 +02:00 |
|
yflory
|
fb21a650ce
|
Lint errors
|
2017-07-11 17:40:13 +02:00 |
|
yflory
|
d09f5b70c7
|
Fix slides CSS
|
2017-07-11 17:39:26 +02:00 |