 ansuz
|
0a9d34a6c9
|
hide appended color pickers
|
2016-10-24 15:30:23 +02:00 |
|
|
ansuz
|
c858b247c1
|
filter absent users from the userlist
|
2016-10-24 15:11:19 +02:00 |
|
|
ansuz
|
ac3ddbab70
|
expose userList for later usage
|
2016-10-24 15:10:49 +02:00 |
|
|
ansuz
|
a8612ed1c7
|
Merge branch 'usability5' of github.com:xwiki-labs/cryptpad into staging
|
2016-10-24 14:54:35 +02:00 |
|
|
ansuz
|
901a708be6
|
Merge branch 'usability1' of github.com:xwiki-labs/cryptpad into staging
|
2016-10-24 14:54:06 +02:00 |
|
|
ansuz
|
2326526f95
|
correct grammatical error in French translation
|
2016-10-24 14:32:34 +02:00 |
|
|
ansuz
|
e23ac85b6d
|
use absolute path to css
|
2016-10-20 11:30:36 +02:00 |
|
|
ansuz
|
78f8286fe3
|
add a note about installing storage adaptors from npm
|
2016-10-20 11:29:26 +02:00 |
|
|
ansuz
|
46c5f64369
|
remove absent users from the userlist
|
2016-10-19 12:30:25 +02:00 |
|
|
ansuz
|
2f9283a677
|
fix leaky global variable
|
2016-10-18 11:51:35 +02:00 |
|
|
ansuz
|
a2e5c96115
|
make http headers configurable, update default conf
|
2016-10-18 11:48:29 +02:00 |
|
|
ansuz
|
0fe62f8c75
|
make wss CSP headers configurable again
|
2016-10-12 13:03:36 +02:00 |
|
|
ansuz
|
40bac1df55
|
Merge branch 'sandbox-frame' of https://github.com/cjdelisle/cryptpad into csp
|
2016-10-12 11:55:51 +02:00 |
|
|
ansuz
|
1f2e45d6c8
|
improved fs storage adaptor and config docs
* regularly close open file descriptors older than channelExpirationMs
* clean up older file descriptors when exceeding openFileLimit
|
2016-10-12 10:52:27 +02:00 |
|
|
ansuz
|
22464af6a5
|
fix reference to incorrect config flag
|
2016-10-12 10:39:46 +02:00 |
|
|
ansuz
|
bb2317d8e6
|
fix chrome style bug by forcing reload of style sheet
|
2016-10-07 17:41:52 +02:00 |
|
|
ansuz
|
7d5a33512a
|
enable slide application listing on home page by default
|
2016-10-04 17:15:09 +02:00 |
|
|
ansuz
|
a28daf2715
|
use websocket url configuration api
|
2016-10-04 17:13:15 +02:00 |
|
|
ansuz
|
dbc8f01b8b
|
fix merge errors and reach full jshint compliance
|
2016-10-04 16:58:10 +02:00 |
|
|
ansuz
|
2ac1b02572
|
Merge branch 'config-sockets' into soon
|
2016-10-04 14:38:50 +02:00 |
|
|
ansuz
|
61dfca33a3
|
resolve conflict and merge 'newserver'
|
2016-10-04 12:43:14 +02:00 |
|
|
ansuz
|
ee88e96baf
|
merge noscript
|
2016-10-04 11:42:06 +02:00 |
|
|
ansuz
|
11f63c861c
|
Merge branch 'titles' of github.com:xwiki-labs/cryptpad into title
|
2016-10-04 11:23:04 +02:00 |
|
|
ansuz
|
e1512a4063
|
Merge branch 'safe-sockets' into soon
|
2016-10-04 10:59:09 +02:00 |
|
|
ansuz
|
5e76194262
|
use new config api
|
2016-10-03 19:28:36 +02:00 |
|
|
ansuz
|
0ece2cf6a1
|
add to default configuration and comment
|
2016-10-03 19:28:14 +02:00 |
|
|
ansuz
|
3dfa19b786
|
more flexible websocket configuration (WIP)
|
2016-10-03 19:19:38 +02:00 |
|
|
ansuz
|
9fa7da60b9
|
confirm that a socket is ready to send before sending
|
2016-10-03 15:38:42 +02:00 |
|
|
ansuz
|
4b238de84c
|
quieter stdout and stderr logs
|
2016-09-30 15:51:23 +02:00 |
|
|
ansuz
|
921ee128bc
|
deobfuscate email
|
2016-09-29 14:46:32 +02:00 |
|
|
ansuz
|
0be8c333e0
|
Merge branch 'fontawesome' of github.com:xwiki-labs/cryptpad into fontawesome
|
2016-09-28 09:01:33 +02:00 |
|
|
ansuz
|
a266f0bee1
|
query parameter for messages
|
2016-09-27 11:01:32 +02:00 |
|
|
ansuz
|
4f5a5251d6
|
add note about nvm in readme
|
2016-09-26 16:14:45 +02:00 |
|
|
ansuz
|
6315915b5d
|
Merge branch 'newhashNoConflict' into merge-hash
|
2016-09-26 13:55:10 +02:00 |
|
|
ansuz
|
d6525087c7
|
jshint compliancy
|
2016-09-23 17:53:24 +02:00 |
|
|
ansuz
|
ed9acf1c00
|
Merge branch 'rememberName' of github.com:xwiki-labs/cryptpad into rememberName
|
2016-09-23 16:40:07 +02:00 |
|
|
ansuz
|
a4843cb5d7
|
Merge branch 'newhashNoConflict' of github.com:xwiki-labs/cryptpad into newhashNoConflict
|
2016-09-23 16:07:46 +02:00 |
|
|
ansuz
|
a82b7aaf8b
|
allow empty names
|
2016-09-23 16:06:46 +02:00 |
|
|
ansuz
|
f6372ee803
|
add noreferrer attr to blank links as well
|
2016-09-21 15:02:08 +02:00 |
|
|
ansuz
|
c50a0ac579
|
where target=blank, rel=noopener
|
2016-09-21 14:49:47 +02:00 |
|
|
ansuz
|
f29e3d7b0d
|
don't let notifications interfere with document titles
|
2016-09-21 14:34:56 +02:00 |
|
|
ansuz
|
a9e2ca8d72
|
make tests green again
|
2016-09-20 23:31:29 +02:00 |
|
|
ansuz
|
e6785b4dad
|
push /pad/ state once ready to avoid OT collision
|
2016-09-20 16:35:55 +02:00 |
|
|
ansuz
|
723df4880e
|
Merge branch 'slides' into merge-slides
|
2016-09-20 16:28:36 +02:00 |
|
|
ansuz
|
b96f050555
|
Merge branch 'board' into merge-boards
|
2016-09-20 16:26:31 +02:00 |
|
|
ansuz
|
fa8199bc75
|
don't try to use experimental user code
|
2016-09-20 16:22:00 +02:00 |
|
|
ansuz
|
259896a373
|
fix translation fragment in English messages file
|
2016-09-20 16:21:40 +02:00 |
|
|
ansuz
|
2d42cadb23
|
push /code/ state once ready to avoid OT collision
|
2016-09-20 15:14:53 +02:00 |
|
|
ansuz
|
bf5dac58dd
|
Merge branch 'titleUserDoc' of github.com:xwiki-labs/cryptpad into titleUserDoc
|
2016-09-20 14:13:35 +02:00 |
|
|
ansuz
|
138d7e0a25
|
Merge branch 'translations'
|
2016-09-16 21:55:01 +02:00 |
|
|
ansuz
|
63bc7e121f
|
remove unnecessary semicolon
|
2016-09-15 18:57:07 +02:00 |
|
|
ansuz
|
498b24d389
|
Merge branch 'translations' of github.com:xwiki-labs/cryptpad
|
2016-09-15 18:36:35 +02:00 |
|
|
ansuz
|
1f4d0888ad
|
fix false positive for error handler
|
2016-09-15 14:57:20 +02:00 |
|
|
ansuz
|
4001e756cb
|
add import script so admins can migrate lvl to files
|
2016-09-15 12:15:27 +02:00 |
|
|
ansuz
|
c9ff6a519b
|
Merge branch 'defaultTitle'
|
2016-09-15 10:18:12 +02:00 |
|
|
ansuz
|
fc7576fe20
|
implement channel removal
|
2016-09-15 10:07:31 +02:00 |
|
|
ansuz
|
cc4bca8004
|
execute callbacks on presentation events
|
2016-09-14 16:03:52 +02:00 |
|
|
ansuz
|
8bf79ef915
|
serialize slide pads as a sorted object
|
2016-09-14 16:02:57 +02:00 |
|
|
ansuz
|
997b46a3f7
|
limit the size of rendered images
|
2016-09-14 16:02:20 +02:00 |
|
|
ansuz
|
d73fef7fe5
|
slightly better spacing
|
2016-09-14 16:00:06 +02:00 |
|
|
ansuz
|
0296989515
|
rewrite default config file
|
2016-09-14 15:53:41 +02:00 |
|
|
ansuz
|
38d1a1a291
|
faster message iteration
|
2016-09-14 15:06:35 +02:00 |
|
|
ansuz
|
b46f74cd78
|
remove alternative storage adaptors from core
|
2016-09-14 12:33:06 +02:00 |
|
|
ansuz
|
349b6799e0
|
remove leveldb dependency
|
2016-09-14 11:21:59 +02:00 |
|
|
ansuz
|
19caac232b
|
don't try to send invalid messages
|
2016-09-14 11:11:00 +02:00 |
|
|
ansuz
|
4b64f00cc0
|
don't log when cleaning up idle channels
|
2016-09-13 12:12:02 +02:00 |
|
|
ansuz
|
be69e2828c
|
implement flat file storage
|
2016-09-13 11:56:17 +02:00 |
|
|
ansuz
|
217e664d4c
|
boilerplate for filesystem-backed storage
|
2016-09-12 16:40:23 +02:00 |
|
|
ansuz
|
68b35ace38
|
add a SQL database adaptor
|
2016-09-12 10:30:31 +02:00 |
|
|
ansuz
|
97415d8158
|
Merge branch 'users'
|
2016-09-01 17:38:25 +02:00 |
|
|
ansuz
|
122a9fe068
|
realtime kanban board
|
2016-09-01 16:23:40 +02:00 |
|
|
ansuz
|
4561ddcdf3
|
add missing semicolon
|
2016-09-01 16:13:25 +02:00 |
|
|
ansuz
|
8031770f90
|
rename "module" to "APP" in /slide/ for jshint
|
2016-09-01 16:12:22 +02:00 |
|
|
ansuz
|
8e86be81b2
|
Merge branch 'better-slides'
|
2016-09-01 16:01:21 +02:00 |
|
|
ansuz
|
fb21b4e46b
|
fix up /render/
|
2016-09-01 15:54:21 +02:00 |
|
|
ansuz
|
4941c1493e
|
better user integration. a few more common utils
|
2016-09-01 12:15:30 +02:00 |
|
|
ansuz
|
f74236d729
|
export more, use finer granularity for methods
|
2016-09-01 12:15:09 +02:00 |
|
|
ansuz
|
2f2aeef0e5
|
add missing semicolon
|
2016-09-01 12:06:21 +02:00 |
|
|
ansuz
|
8a659cf887
|
maintain aspect ratio for slides
display index and slide count in title
|
2016-09-01 12:03:09 +02:00 |
|
|
ansuz
|
f403d8e2e2
|
remove table refresh button. listen for changes and refresh automatically
|
2016-08-30 18:15:43 +02:00 |
|
|
ansuz
|
f281cf898e
|
add login text to translations
|
2016-08-30 18:12:12 +02:00 |
|
|
ansuz
|
ae116d4772
|
emit change events for remote storage.
listen for those events being sent via postMessage
|
2016-08-30 18:11:43 +02:00 |
|
|
ansuz
|
30ea1b59b7
|
integrate users into common utilities
|
2016-08-30 18:09:53 +02:00 |
|
|
ansuz
|
412cb680ff
|
prototype users
|
2016-08-30 18:08:36 +02:00 |
|
|
ansuz
|
c641692295
|
standardize datatype for callback for storage change callack serialization
|
2016-08-30 18:02:51 +02:00 |
|
|
ansuz
|
43fcb29490
|
listen for changes to localStorage and execute callbacks
|
2016-08-30 18:00:28 +02:00 |
|
|
ansuz
|
6d775f61c6
|
add missing functions
|
2016-08-30 10:06:14 +02:00 |
|
|
ansuz
|
168338b898
|
add missing functions
|
2016-08-29 18:10:15 +02:00 |
|
|
ansuz
|
ca7d2943be
|
test for conditions on deployed machine
|
2016-08-29 16:59:58 +02:00 |
|
|
ansuz
|
9dc206c1ee
|
update tests to use correct variables
|
2016-08-29 16:54:03 +02:00 |
|
|
ansuz
|
7c5ee53e81
|
resolve conflict and merge
|
2016-08-25 18:01:03 +02:00 |
|
|
ansuz
|
f47a6f1cbb
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
2016-08-25 17:59:37 +02:00 |
|
|
ansuz
|
e386749e89
|
unlock the editor after your name has been set (or not)
|
2016-08-25 11:36:20 +02:00 |
|
|
ansuz
|
aa91ebd24e
|
don't initialize until the store is ready
|
2016-08-25 11:23:51 +02:00 |
|
|
ansuz
|
93f5a3d3e9
|
use more bits from the users' seed and parse into various subkeys
|
2016-08-25 11:23:11 +02:00 |
|
|
ansuz
|
1bec02239c
|
coerce dates into strings
|
2016-08-25 11:19:09 +02:00 |
|
|
ansuz
|
0add01a940
|
remove dead code
|
2016-08-25 11:08:15 +02:00 |
|
|
ansuz
|
dcebb9597f
|
prototype of password based key derivation
|
2016-08-22 11:43:41 +02:00 |
|
|
ansuz
|
848f16e8f5
|
unused function which computes values for the table
|
2016-08-22 11:41:23 +02:00 |
|
|
ansuz
|
4e71c2367a
|
depend on scrypt-async. you should update your bower deps
|
2016-08-22 11:40:01 +02:00 |
|