 ansuz
|
54eefd3d94
|
replace contacts with contacts2
|
2017-08-25 16:07:53 +02:00 |
|
|
ansuz
|
57d0c6c973
|
Merge branch 'new-messaging' into staging
|
2017-08-25 14:42:34 +02:00 |
|
|
ansuz
|
9e04d039d7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-25 14:42:23 +02:00 |
|
|
ansuz
|
22d754d514
|
handle user renames
|
2017-08-25 14:42:05 +02:00 |
|
|
ansuz
|
f9cdbe66a0
|
add forgotten translation string
|
2017-08-24 17:20:59 +02:00 |
|
|
ansuz
|
f58d4c941f
|
clean up a bit
|
2017-08-24 17:19:57 +02:00 |
|
|
ansuz
|
ea5f47f0f9
|
remove some TODOs and solve some wee bugs
|
2017-08-24 17:18:59 +02:00 |
|
|
ansuz
|
b75a951a98
|
encode messages with 'author' field instead of 'channel'
|
2017-08-24 17:14:03 +02:00 |
|
|
ansuz
|
78404ce8b7
|
add npm sub-commands
|
2017-08-24 11:34:46 +02:00 |
|
|
ansuz
|
013b75ae67
|
implement history range requests
|
2017-08-24 11:34:05 +02:00 |
|
|
ansuz
|
b71f1860db
|
make uid function reusable
|
2017-08-24 11:31:20 +02:00 |
|
|
ansuz
|
443d8a8941
|
remove unnecessary files
|
2017-08-24 11:29:42 +02:00 |
|
|
ansuz
|
89a13d4b21
|
work on contacts2 until feature parity is reached
|
2017-08-22 15:55:49 +02:00 |
|
|
ansuz
|
002eed0d6f
|
make most of the messenger api async
|
2017-08-22 15:55:00 +02:00 |
|
|
ansuz
|
253ab68d8d
|
Merge branch 'staging' into new-messaging
|
2017-08-18 15:31:06 +02:00 |
|
|
ansuz
|
0693a98890
|
create a thumbnail when uploading images from whiteboard
|
2017-08-18 12:53:02 +02:00 |
|
|
ansuz
|
b17044ad98
|
add support for thumbnails in metadata
|
2017-08-18 12:47:04 +02:00 |
|
|
ansuz
|
a4dbf39c4a
|
fix pdf display problems in chrome
|
2017-08-17 18:11:46 +02:00 |
|
|
ansuz
|
bed7d95bf3
|
use latest compiled cryptpad media-tag
|
2017-08-17 17:31:52 +02:00 |
|
|
ansuz
|
4e62f79594
|
stop referring to deleted file as background image
|
2017-08-17 17:31:18 +02:00 |
|
|
ansuz
|
3a5526e247
|
infer pdfjs document title from iframe url
|
2017-08-17 17:30:28 +02:00 |
|
|
ansuz
|
a125253cde
|
lint compliance
|
2017-08-17 15:13:05 +02:00 |
|
|
ansuz
|
290763d6c5
|
don't complain about bad realtime state just because you disconnected
|
2017-08-17 15:07:34 +02:00 |
|
|
ansuz
|
3b20dcd435
|
add optional cache-busting to favicon
|
2017-08-17 14:34:22 +02:00 |
|
|
ansuz
|
48fe3ef841
|
add a tip about cryptdrive
|
2017-08-17 14:25:24 +02:00 |
|
|
ansuz
|
839c6df3bb
|
remove invalid loading screen tips. create a new one
|
2017-08-17 14:16:37 +02:00 |
|
|
ansuz
|
95404992da
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-17 12:51:58 +02:00 |
|
|
ansuz
|
ee874878dd
|
clear tooltips when the userlist is redrawn
|
2017-08-17 12:50:40 +02:00 |
|
|
ansuz
|
f207edfd28
|
handle errors when deriving keys. fix incorrect reference
|
2017-08-17 12:50:12 +02:00 |
|
|
ansuz
|
2874ccb5dc
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 12:15:20 +02:00 |
|
|
ansuz
|
2a8abc2699
|
comment out splitter code
|
2017-08-16 12:15:08 +02:00 |
|
|
ansuz
|
46e47b454d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 11:34:54 +02:00 |
|
|
ansuz
|
127b6dbc6b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 11:34:35 +02:00 |
|
|
ansuz
|
8b5519ad29
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 11:31:09 +02:00 |
|
|
ansuz
|
2b7dcbe77c
|
remove bs class that caused poor alignment sometimes
|
2017-08-16 11:30:56 +02:00 |
|
|
ansuz
|
9213aa7ee4
|
simplify example config
|
2017-08-16 11:02:03 +02:00 |
|
|
ansuz
|
7537caf8fe
|
make footer translateable
|
2017-08-16 10:51:08 +02:00 |
|
|
ansuz
|
bd45aeaa03
|
bump package.json version
|
2017-08-16 10:31:47 +02:00 |
|
|
ansuz
|
d3a298d639
|
Merge branch 'ui-integration' into staging
|
2017-08-16 10:20:34 +02:00 |
|
|
ansuz
|
8ee5e14a60
|
merge ui-integration
|
2017-08-16 10:20:05 +02:00 |
|
|
ansuz
|
130b330ede
|
refactor messaging
|
2017-08-16 10:04:50 +02:00 |
|
|
ansuz
|
9a6bf302b4
|
ignore ckeditor hacks
|
2017-08-14 18:12:05 +02:00 |
|
|
ansuz
|
5e6e76dfc1
|
make regex case insensitive
|
2017-08-14 14:41:23 +02:00 |
|
|
ansuz
|
736288a85b
|
lint compliance
|
2017-08-14 14:02:57 +02:00 |
|
|
ansuz
|
5037f444e9
|
update markdown sanitization strategy
|
2017-08-14 13:12:43 +02:00 |
|
|
ansuz
|
9b86003722
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-11 15:22:43 +02:00 |
|
|
ansuz
|
66cacf08da
|
allow users to write with tabs instead of spaces
|
2017-08-11 15:21:26 +02:00 |
|
|
ansuz
|
64849507b3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-11 14:26:34 +02:00 |
|
|
ansuz
|
328107be4d
|
translation key for using tabs
|
2017-08-11 14:26:08 +02:00 |
|
|
ansuz
|
958294f109
|
put code settings in their own tab
|
2017-08-11 13:00:50 +02:00 |
|
|
ansuz
|
ae0b2ca1a8
|
add label for code indentation
|
2017-08-11 12:55:10 +02:00 |
|
|
ansuz
|
7f2b7fc287
|
show Your CryptDrive, if logged in. fix typos
|
2017-08-11 11:32:21 +02:00 |
|
|
ansuz
|
f4e5e67a68
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-11 11:00:06 +02:00 |
|
|
ansuz
|
284124a32d
|
WIP
|
2017-08-11 10:59:54 +02:00 |
|
|
ansuz
|
1c526feffb
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-10 18:06:58 +02:00 |
|
|
ansuz
|
fbb880f277
|
implement customizable indentation widths
|
2017-08-10 18:06:47 +02:00 |
|
|
ansuz
|
844967a880
|
continued refactoring
|
2017-08-09 14:20:37 +02:00 |
|
|
ansuz
|
34a5a32c44
|
lint compliance
|
2017-08-08 20:29:02 +02:00 |
|
|
ansuz
|
cdf3cee9c8
|
split out message rendering into ui
|
2017-08-08 18:21:03 +02:00 |
|
|
ansuz
|
fcdfa52aa9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-08 17:13:38 +02:00 |
|
|
ansuz
|
58b3b32cc3
|
big messaging refactor. split UI from logic
|
2017-08-08 17:13:10 +02:00 |
|
|
ansuz
|
fc95f1b6a8
|
lint compliance
|
2017-08-08 10:32:25 +02:00 |
|
|
ansuz
|
ba9696ba33
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-08 10:03:54 +02:00 |
|
|
ansuz
|
c63807fd2b
|
implement channel.send
|
2017-08-07 17:24:16 +02:00 |
|
|
ansuz
|
d835005905
|
simplify in-memory message format
|
2017-08-07 17:22:56 +02:00 |
|
|
ansuz
|
797cc2b105
|
handle messages which fail to decrypt
|
2017-08-07 17:21:23 +02:00 |
|
|
ansuz
|
bad5160885
|
fix bad reference
|
2017-08-05 09:14:36 +02:00 |
|
|
ansuz
|
05aa5ed347
|
hide new feature until it is finished
|
2017-08-04 18:07:47 +02:00 |
|
|
ansuz
|
244f436f6e
|
resolve merge conflict
|
2017-08-04 16:01:20 +02:00 |
|
|
ansuz
|
2a8311396e
|
lint compliance
|
2017-08-04 16:00:06 +02:00 |
|
|
ansuz
|
395f6e1b27
|
reset confirm text for alertify
|
2017-08-04 15:54:15 +02:00 |
|
|
ansuz
|
dd6a057962
|
add 'msg' class for pierre
|
2017-08-04 15:45:30 +02:00 |
|
|
ansuz
|
96b12d55fb
|
add a return
|
2017-08-04 14:37:21 +02:00 |
|
|
ansuz
|
b79adf4177
|
redirect to drive if logged in
|
2017-08-04 14:35:47 +02:00 |
|
|
ansuz
|
c895d06193
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-04 14:26:31 +02:00 |
|
|
ansuz
|
252f40748a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-04 14:21:26 +02:00 |
|
|
ansuz
|
9865359bb0
|
don't tell users about new versions
|
2017-08-04 14:05:00 +02:00 |
|
|
ansuz
|
c8c44d3bfc
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-04 11:22:22 +02:00 |
|
|
ansuz
|
11c72499a0
|
don't add duplicate messages to the history
|
2017-08-03 17:06:28 +02:00 |
|
|
ansuz
|
fb13e656b7
|
get new messages when reconnecting
|
2017-08-03 15:06:06 +02:00 |
|
|
ansuz
|
52854c5a8e
|
ignore history range responses
|
2017-08-03 15:05:04 +02:00 |
|
|
ansuz
|
e786117110
|
get new messages when reconnecting and WIP get more history
|
2017-08-03 15:04:29 +02:00 |
|
|
ansuz
|
2ce341fed6
|
disable input field when disconnected
|
2017-08-03 14:12:07 +02:00 |
|
|
ansuz
|
aba4e34e7f
|
reuse inline styles as a mixin
|
2017-08-03 12:17:33 +02:00 |
|
|
ansuz
|
195cb01d72
|
better styles for messaging input
|
2017-08-03 12:15:06 +02:00 |
|
|
ansuz
|
1fac0b9bc4
|
make todo text bold
|
2017-08-03 11:53:48 +02:00 |
|
|
ansuz
|
66d81429bd
|
integrate file embed into code editor
|
2017-08-03 11:47:54 +02:00 |
|
|
ansuz
|
dc7db074e8
|
open pad links when clicking in readOnly mode
|
2017-08-03 11:04:38 +02:00 |
|
|
ansuz
|
35867001cb
|
add missing messages
|
2017-08-02 17:38:34 +02:00 |
|
|
ansuz
|
71d88b156d
|
make empty profiles for users on first visit
|
2017-08-02 17:32:09 +02:00 |
|
|
ansuz
|
8b0831ac5d
|
save images drawn with whiteboard to your CryptDrive
|
2017-08-02 16:51:41 +02:00 |
|
|
ansuz
|
fe826133b3
|
make some markdown styles reusable
|
2017-08-02 11:03:06 +02:00 |
|
|
ansuz
|
0602fabc41
|
Merge branch 'soon' into staging
|
2017-08-01 13:54:10 +02:00 |
|
|
ansuz
|
d84487ab49
|
Merge branch 'master' into staging
|
2017-08-01 13:54:04 +02:00 |
|
|
ansuz
|
ace31c952e
|
clear tooltips when redrawing the userlist
|
2017-08-01 11:51:46 +02:00 |
|
|
ansuz
|
24436c2c51
|
clear tooltips when redrawing the userlist
|
2017-08-01 11:51:43 +02:00 |
|
|
ansuz
|
35cf23ce2c
|
clear tooltips when redrawing the userlist
|
2017-08-01 11:50:43 +02:00 |
|
|
ansuz
|
4c6f8d71e1
|
don't invoke spinner if it does not exist
|
2017-08-01 11:08:25 +02:00 |
|
|
ansuz
|
0b69973c17
|
remove html
|
2017-08-01 10:32:04 +02:00 |
|
|
ansuz
|
85cfd4335d
|
correct markdown syntax
|
2017-08-01 10:31:23 +02:00 |
|