ansuz
|
2e3be27278
|
resolve merge
|
2017-07-23 14:31:13 +02:00 |
|
ansuz
|
dcf5719eaf
|
handle most of the boilerplate stuff
|
2017-07-23 14:27:47 +02:00 |
|
ansuz
|
0d43a84c2b
|
move example into another folder
|
2017-07-23 14:19:43 +02:00 |
|
Nicolas Lemoine
|
5c07eac4de
|
Change title and footer
|
2017-07-23 15:08:27 +03:00 |
|
ansuz
|
f5454f232a
|
pull in todomvc vanillajs example
|
2017-07-23 13:46:41 +02:00 |
|
ansuz
|
ae693ff5a7
|
lint compliance
|
2017-07-23 09:01:12 +02:00 |
|
ansuz
|
6622735db0
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-22 14:15:15 +02:00 |
|
ansuz
|
55cb0734e2
|
make bad state timeout configurable
|
2017-07-22 10:56:39 +02:00 |
|
yflory
|
469f49fc0a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-20 18:32:12 +02:00 |
|
yflory
|
a80b00a765
|
Move the file picker in common
|
2017-07-20 18:32:03 +02:00 |
|
ansuz
|
d44f0696af
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-20 18:24:53 +02:00 |
|
ansuz
|
2d0635a409
|
use custom version of tippy
|
2017-07-20 18:23:51 +02:00 |
|
yflory
|
09793e0d7d
|
jshint
|
2017-07-20 18:21:10 +02:00 |
|
yflory
|
683769f30a
|
Fix tooltips
|
2017-07-20 18:19:59 +02:00 |
|
yflory
|
9633025afe
|
CSS for the removeHistory button in contacts
|
2017-07-20 17:26:33 +02:00 |
|
yflory
|
97f1bbedc5
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-20 17:08:28 +02:00 |
|
yflory
|
b9bba76b4e
|
Make the delay for tooltips configurable
|
2017-07-20 17:08:11 +02:00 |
|
ansuz
|
dd98e2222a
|
WIP erase chat history button
|
2017-07-20 17:04:11 +02:00 |
|
ansuz
|
128d5b2c6d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-20 15:55:17 +02:00 |
|
ansuz
|
b22127f10c
|
add history removal
|
2017-07-20 15:55:04 +02:00 |
|
yflory
|
a5a73ce326
|
Fix print button in slide
|
2017-07-20 14:41:51 +02:00 |
|
yflory
|
3bd5f01e53
|
Fix slide ratio in preview mode
|
2017-07-20 09:55:18 +02:00 |
|
yflory
|
140964478e
|
Enter + shift key to add a new line in chat
|
2017-07-20 09:54:44 +02:00 |
|
yflory
|
331b4dddea
|
Clean debugging code
|
2017-07-19 17:50:08 +02:00 |
|
yflory
|
e26e041a5b
|
fix jshint errors
|
2017-07-19 17:24:35 +02:00 |
|
yflory
|
c33d2a2db0
|
New tooltips
|
2017-07-19 17:14:10 +02:00 |
|
yflory
|
88813aee02
|
Show that only html can be imported in pads
|
2017-07-19 16:36:10 +02:00 |
|
yflory
|
b56a782f01
|
Store the userlist state when it is closed using the icon
|
2017-07-19 14:38:46 +02:00 |
|
yflory
|
82c87144cb
|
Remove the friend request button when the request is sent
|
2017-07-19 14:14:34 +02:00 |
|
yflory
|
5ce49af57b
|
Make CryptDrive fast again
|
2017-07-19 11:36:00 +02:00 |
|
yflory
|
1dc98dcff1
|
CSS for the contacts input field
|
2017-07-19 10:30:38 +02:00 |
|
yflory
|
e2d031c76a
|
Add support for markdown syntax in contacts
|
2017-07-19 10:29:59 +02:00 |
|
yflory
|
cba113a2b0
|
Lint
|
2017-07-18 15:52:46 +02:00 |
|
yflory
|
91ebbdfdb4
|
View contact status
|
2017-07-18 15:50:21 +02:00 |
|
yflory
|
221a3b4fed
|
Fix duplicate leftside entries when disconnected in profile
|
2017-07-18 12:10:58 +02:00 |
|
yflory
|
22a28a8fd9
|
Fix undefined description in profile
|
2017-07-18 11:49:54 +02:00 |
|
ansuz
|
39fd0d0f5f
|
notify if you're focused on a conversation in a bacgkrounded tab
|
2017-07-18 10:57:37 +02:00 |
|
yflory
|
7540f12040
|
Fix profile creation button not centered
|
2017-07-18 10:45:36 +02:00 |
|
yflory
|
f719b34e09
|
Add tab notification in contacts
|
2017-07-18 10:42:23 +02:00 |
|
yflory
|
baf439648e
|
Add the contacts app in the dropdown menu
|
2017-07-18 10:22:51 +02:00 |
|
yflory
|
36d792874a
|
Fix initial text not removed in /contacts
|
2017-07-18 10:13:29 +02:00 |
|
yflory
|
3545a66320
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-17 18:51:40 +02:00 |
|
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
|
756b561bbc
|
lint compliance
|
2017-07-17 14:12:51 +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
|
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
|
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
|
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 |
|
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
|
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 |
|
yflory
|
159ccc2866
|
Fix mediatag flickering
|
2017-07-11 17:39:08 +02:00 |
|
yflory
|
ce50dbf3ca
|
Hide the 'templates' list header if the category is empty
|
2017-07-11 15:51:55 +02:00 |
|
yflory
|
42075e4b5f
|
Make everything 16px and 32px
|
2017-07-11 15:34:46 +02:00 |
|
yflory
|
16d0527e92
|
Add a page title in drive, settings and file
|
2017-07-11 15:13:39 +02:00 |
|
yflory
|
5d5f936682
|
Hide the upload table in code
|
2017-07-11 14:38:26 +02:00 |
|
yflory
|
a0b14faf89
|
Fix the font in settings and drive
|
2017-07-11 13:11:16 +02:00 |
|
yflory
|
e732284845
|
Lint
|
2017-07-11 12:50:16 +02:00 |
|
yflory
|
112c4c85e5
|
Left menu in drive
|
2017-07-11 12:47:15 +02:00 |
|
yflory
|
8f5a244999
|
Replace mediatag markdown syntax by html. Enable file upload in /code.
|
2017-07-11 11:56:06 +02:00 |
|
yflory
|
9f9e593e0f
|
Lint
|
2017-07-10 18:46:59 +02:00 |
|
yflory
|
560671ae7d
|
Make avatars circle
|
2017-07-10 18:46:26 +02:00 |
|
yflory
|
125018c8c3
|
New settings page
|
2017-07-10 18:29:23 +02:00 |
|
yflory
|
c02fa39524
|
Make drive search bar blue
|
2017-07-10 15:19:08 +02:00 |
|
yflory
|
438e7e6cf9
|
Fix display name in useradmin (friends app)
|
2017-07-10 13:04:33 +02:00 |
|
yflory
|
e6188bfb63
|
Fix useradmin dropdown position
|
2017-07-10 12:38:54 +02:00 |
|
yflory
|
97d8d86395
|
Fix avatar in static pages
|
2017-07-10 12:03:44 +02:00 |
|
yflory
|
e8f3df5a46
|
Clean less
|
2017-07-10 11:57:04 +02:00 |
|
yflory
|
159d72f33b
|
Merge branch 'msg' into staging
|
2017-07-10 11:48:22 +02:00 |