 ansuz
|
973aeba0da
|
remove bundled fabric.js
|
2017-03-27 12:48:54 +02:00 |
|
|
ansuz
|
6eab52c33d
|
use secure fabric.js
|
2017-03-27 12:45:39 +02:00 |
|
|
ansuz
|
59a80d5fde
|
remove silly TODO
|
2017-03-27 12:08:19 +02:00 |
|
|
ansuz
|
ce5dbaeafd
|
use alertify instead of browser prompt
|
2017-03-27 12:00:21 +02:00 |
|
|
ansuz
|
69edce5491
|
remove unused translation keys
|
2017-03-27 11:29:19 +02:00 |
|
|
ansuz
|
304c7b7fe4
|
mention the importance of CSP headers in the readme
|
2017-03-24 15:43:49 +01:00 |
|
|
ansuz
|
b176426213
|
increase default ckeditor font size to 16px
|
2017-03-24 14:55:29 +01:00 |
|
|
ansuz
|
3e9eb03e5a
|
display a user's public signing key in settings if it exists
|
2017-03-24 14:26:36 +01:00 |
|
|
ansuz
|
ba53b50e0b
|
update path for whiteboard app
|
2017-03-24 13:33:29 +01:00 |
|
|
ansuz
|
912215185f
|
add uid to userdata for better notifications
|
2017-03-24 13:32:42 +01:00 |
|
|
ansuz
|
fa9249ef29
|
don't notify for userlist changes if a user joins twice
|
2017-03-24 13:17:51 +01:00 |
|
|
ansuz
|
40f5e1706f
|
add a unique id to user objects, define a getter
|
2017-03-24 12:17:49 +01:00 |
|
|
ansuz
|
d1c32ea1f8
|
define english, french, and spanish labels for whiteboard app
|
2017-03-23 16:50:37 +01:00 |
|
|
ansuz
|
e2ee80d4e7
|
set icon for whiteboard app
|
2017-03-23 16:16:24 +01:00 |
|
|
ansuz
|
dbca94437e
|
rename canvas app to 'whiteboard'
|
2017-03-23 16:16:00 +01:00 |
|
|
ansuz
|
2b2e581779
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-21 11:47:27 +01:00 |
|
|
ansuz
|
2e8484ad4c
|
notes about what to improve. transform json on OT instead of just validating
|
2017-03-21 11:47:11 +01:00 |
|
|
ansuz
|
acc094654d
|
remove funny file
|
2017-03-21 10:18:50 +01:00 |
|
|
ansuz
|
b542245086
|
fix lint error
|
2017-03-20 18:11:26 +01:00 |
|
|
ansuz
|
f301592a83
|
Merge branch 'spanish' of github.com:pbondoer/cryptpad into spanish
|
2017-03-20 18:08:08 +01:00 |
|
|
ansuz
|
cc43bb8362
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-20 18:05:39 +01:00 |
|
|
ansuz
|
ef0e1d7aa0
|
add a non-breaking space to pad initialState
|
2017-03-20 18:05:07 +01:00 |
|
|
ansuz
|
98027dad27
|
jshint compliance
|
2017-03-20 18:02:11 +01:00 |
|
|
ansuz
|
eeecb1baab
|
Make Canvas Work Again
|
2017-03-20 18:01:13 +01:00 |
|
|
ansuz
|
4a173e30dc
|
set user's cursor to either the beginning or end of the document
|
2017-03-20 17:51:56 +01:00 |
|
|
ansuz
|
2add39ee40
|
fix default config
|
2017-03-16 17:29:12 +01:00 |
|
|
ansuz
|
25a2215846
|
reconcile merge conflict from master
|
2017-03-16 17:24:36 +01:00 |
|
|
ansuz
|
d422c7e165
|
support old hashes in getUserChannelList
|
2017-03-16 17:14:54 +01:00 |
|
|
ansuz
|
7d5ff27900
|
better rpc tests, sum up your channel usage
|
2017-03-16 17:03:45 +01:00 |
|
|
ansuz
|
7ab65367c5
|
don't try to verify messages if you can't decode base64
|
2017-03-16 17:01:53 +01:00 |
|
|
ansuz
|
e8fbbf9984
|
fix default config to be very permissive with CSP headers
|
2017-03-16 15:40:16 +01:00 |
|
|
ansuz
|
3185e2a4cc
|
comment out config lines which break local usage of cryptpad
|
2017-03-16 15:18:57 +01:00 |
|
|
ansuz
|
737ffe8430
|
comment out config lines which break local usage of cryptpad
|
2017-03-16 15:18:29 +01:00 |
|
|
ansuz
|
e207895ffc
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
2017-03-16 15:17:49 +01:00 |
|
|
ansuz
|
b38ba6dbec
|
comment out config lines which break local usage of cryptpad
|
2017-03-16 15:17:40 +01:00 |
|
|
ansuz
|
5ed6223313
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-16 14:47:03 +01:00 |
|
|
ansuz
|
7f2f1f7191
|
correctly initialize RPC object
|
2017-03-16 14:46:55 +01:00 |
|
|
ansuz
|
c9c9dd0999
|
use userChannelList if a list is not supplied to pinpad
|
2017-03-16 14:46:17 +01:00 |
|
|
ansuz
|
e8c3cf6aa5
|
implement rpc message signing
|
2017-03-16 14:45:38 +01:00 |
|
|
ansuz
|
d85a42c776
|
include User_hash in user channel list
|
2017-03-16 14:43:57 +01:00 |
|
|
ansuz
|
dc350caff7
|
return NOT_IMPLEMENTED for all planned rpc calls
|
2017-03-16 14:43:05 +01:00 |
|
|
ansuz
|
ac08c9f3d9
|
rpc should only respond to signed messages
|
2017-03-16 13:07:42 +01:00 |
|
|
ansuz
|
d585fce67b
|
suppress RPC errors if configured to do so
|
2017-03-16 13:07:01 +01:00 |
|
|
ansuz
|
b578803136
|
clean up registration code a little bit
|
2017-03-16 10:37:16 +01:00 |
|
|
ansuz
|
c3c866fa2b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-15 18:59:53 +01:00 |
|
|
ansuz
|
5eb32b33ee
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-15 18:59:38 +01:00 |
|
|
ansuz
|
298725b3c2
|
don't show usage tips on error screens
|
2017-03-15 18:58:39 +01:00 |
|
|
ansuz
|
0a6373852e
|
add signing keys to user object at login and register time
|
2017-03-15 18:57:13 +01:00 |
|
|
ansuz
|
8129b8cdc1
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-15 16:05:05 +01:00 |
|
|
ansuz
|
15a67afc75
|
jshint compliance
|
2017-03-15 16:04:52 +01:00 |
|
|
ansuz
|
bd9efd7c04
|
provide examples of valid and invalid rpc calls
|
2017-03-15 15:56:32 +01:00 |
|
|
ansuz
|
7187d3c550
|
implement getUserChannelList
|
2017-03-15 15:55:55 +01:00 |
|
|
ansuz
|
61fc4a3f86
|
respond to GET_FILE_SIZE rpc calls
|
2017-03-15 15:55:25 +01:00 |
|
|
ansuz
|
d0466a2052
|
implement 'getChannelSize' api in storage
|
2017-03-15 15:51:03 +01:00 |
|
|
ansuz
|
306f6ce806
|
resolve merge-conflict with accounting branch
|
2017-03-14 15:52:04 +01:00 |
|
|
ansuz
|
9818c562fb
|
Merge branch 'soon'
|
2017-03-14 14:45:18 +01:00 |
|
|
ansuz
|
c864e213ec
|
bump version number
|
2017-03-14 14:35:44 +01:00 |
|
|
ansuz
|
dcc4e0dc6b
|
remove extraneous translation
|
2017-03-14 14:35:27 +01:00 |
|
|
ansuz
|
805e26bc07
|
add a version footer to main pages
|
2017-03-14 14:34:13 +01:00 |
|
|
ansuz
|
71db08eac2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-14 12:40:25 +01:00 |
|
|
ansuz
|
fcbe3a5224
|
add already registered message to english translation
|
2017-03-14 12:40:19 +01:00 |
|
|
ansuz
|
09afba80db
|
add support for logging in from register page
|
2017-03-14 12:39:50 +01:00 |
|
|
ansuz
|
11ff3f5347
|
new styles for alertify dialogs
|
2017-03-14 12:02:12 +01:00 |
|
|
ansuz
|
413d9a6f0b
|
add a style-callback to confirm
|
2017-03-14 12:01:42 +01:00 |
|
|
ansuz
|
5d88c3a436
|
newer registration code
|
2017-03-14 12:00:23 +01:00 |
|
|
ansuz
|
bbe2279b9c
|
add new translations for registration
|
2017-03-14 11:02:14 +01:00 |
|
|
ansuz
|
10bb11bff6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-13 19:32:15 +01:00 |
|
|
ansuz
|
0d30a1e00f
|
add safe and danger classes to alertify styles
|
2017-03-13 19:32:10 +01:00 |
|
|
ansuz
|
803e57c958
|
add more parameters to confirm dialogs
|
2017-03-13 19:30:56 +01:00 |
|
|
ansuz
|
f2aa531f27
|
apply styles to confirm buttons if provided
|
2017-03-13 18:18:38 +01:00 |
|
|
ansuz
|
df6298eeb6
|
apply styles to confirm buttons if provided
|
2017-03-13 18:18:17 +01:00 |
|
|
ansuz
|
bebd40f901
|
add a todo
|
2017-03-13 18:16:17 +01:00 |
|
|
ansuz
|
07a2d8e189
|
apply translations on feedback page
|
2017-03-13 12:56:49 +01:00 |
|
|
ansuz
|
a16e6850d4
|
add translation keys for the feedback page
|
2017-03-13 12:54:59 +01:00 |
|
|
ansuz
|
95a51e8fe4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-13 12:16:06 +01:00 |
|
|
ansuz
|
ff3641134f
|
update pad initialState
|
2017-03-13 12:16:01 +01:00 |
|
|
ansuz
|
1178660815
|
update code initialState string
|
2017-03-13 11:52:33 +01:00 |
|
|
ansuz
|
91e587d9c7
|
fix section title
|
2017-03-13 11:30:48 +01:00 |
|
|
ansuz
|
b7a43cd9d9
|
update readme to explain dev mode
|
2017-03-13 11:29:08 +01:00 |
|
|
ansuz
|
6e733b1329
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-13 10:59:20 +01:00 |
|
|
ansuz
|
d9996cc874
|
current work for pinning
|
2017-03-13 10:56:08 +01:00 |
|
|
ansuz
|
a7d61aa562
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting
|
2017-03-10 18:04:07 +01:00 |
|
|
ansuz
|
b3cc8da315
|
implement basic clientside RPC infrastructure
and provide a basic example for testing it
|
2017-03-10 18:03:52 +01:00 |
|
|
ansuz
|
612a00b484
|
implement serverside RPC infrastructure
|
2017-03-10 18:03:15 +01:00 |
|
|
ansuz
|
81027b4200
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting
|
2017-03-10 10:49:33 +01:00 |
|
|
ansuz
|
e2418a6be2
|
sketch of how pinning rpc will look
|
2017-03-07 17:33:31 +01:00 |
|
|
ansuz
|
dc567fa7f3
|
signing keys are stored in hex so encode and decode them
|
2017-03-07 17:30:32 +01:00 |
|
|
ansuz
|
aa762e7d63
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-07 15:33:01 +01:00 |
|
|
ansuz
|
8a48612de2
|
add some notes for later
|
2017-03-07 14:40:06 +01:00 |
|
|
ansuz
|
f7002a0bf7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-06 17:25:13 +01:00 |
|
|
ansuz
|
efdd999161
|
implement dev mode which busts cache all the time
|
2017-03-06 17:25:02 +01:00 |
|
|
ansuz
|
c04819538b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-03 18:16:39 +01:00 |
|
|
ansuz
|
fcb9848b3a
|
hide toolbar when in read-only mode
|
2017-03-03 18:16:34 +01:00 |
|
|
ansuz
|
bf82704def
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-03 17:21:43 +01:00 |
|
|
ansuz
|
92066118a1
|
correct out of date portions of the readme
|
2017-03-03 17:16:06 +01:00 |
|
|
ansuz
|
6e72c6a51b
|
remove unused dependencies
|
2017-03-03 17:15:33 +01:00 |
|
|
ansuz
|
08c862b271
|
add FIXME notes to poll
|
2017-03-03 16:13:32 +01:00 |
|
|
ansuz
|
3b578aa1fd
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-02 18:31:38 +01:00 |
|
|
ansuz
|
f313b6f65c
|
bump travis node version to 6.6.0
|
2017-03-02 18:31:24 +01:00 |
|
|
ansuz
|
868161a8a8
|
fix undefined reference in code
|
2017-03-02 17:59:59 +01:00 |
|