 ansuz
|
7f8147b18b
|
Merge branch 'soon'
|
2017-11-07 15:06:57 +01:00 |
|
|
ansuz
|
4bfd13d291
|
Merge branch 'staging' into soon
|
2017-11-07 15:06:51 +01:00 |
|
|
ansuz
|
454fc8498c
|
remove old* apps
|
2017-11-07 13:50:07 +01:00 |
|
|
ansuz
|
12ae657422
|
Merge branch 'staging' into soon
|
2017-11-07 12:07:25 +01:00 |
|
|
ansuz
|
2c9df23849
|
update english text for removing from trash in the drive
|
2017-11-06 17:37:29 +01:00 |
|
|
ansuz
|
e07bb0f7b3
|
roll back to old transform function, except in pad
|
2017-11-06 17:18:10 +01:00 |
|
|
ansuz
|
d10f752457
|
s/delete/move to trash
|
2017-11-06 17:07:37 +01:00 |
|
|
ansuz
|
402fae442d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-11-06 15:14:21 +01:00 |
|
|
ansuz
|
c5f6491c37
|
bump footer and package.json to latest version
|
2017-11-06 15:14:02 +01:00 |
|
|
ansuz
|
744809101c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-30 16:24:55 +01:00 |
|
|
ansuz
|
867df1db56
|
fix '+New' button in drive toolbar
|
2017-10-30 16:24:41 +01:00 |
|
|
ansuz
|
11b8b380fd
|
Merge branch 'staging' into evilham
|
2017-10-30 14:50:11 +01:00 |
|
|
ansuz
|
04f26ff886
|
Merge branch 'staging' of github.com:evilham/cryptpad into evilham
|
2017-10-30 14:41:21 +01:00 |
|
|
ansuz
|
0a14c715ad
|
add test for support of invite urls
|
2017-10-30 14:40:43 +01:00 |
|
|
ansuz
|
4c0049ad55
|
don't log presence of other users as 'joins' when you have first joined
|
2017-10-27 14:20:31 +02:00 |
|
|
ansuz
|
325f685f3e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-27 14:14:25 +02:00 |
|
|
ansuz
|
1cbf1aec92
|
prevent undefined access in non-sframe apps
|
2017-10-27 14:14:19 +02:00 |
|
|
ansuz
|
d644054e3f
|
lint compliance
|
2017-10-27 11:13:26 +02:00 |
|
|
ansuz
|
ed253e6c75
|
Merge branch 'staging' into evilham
|
2017-10-27 11:03:16 +02:00 |
|
|
ansuz
|
df1a700cb2
|
disable thumbnail test. add test for flat dom
|
2017-10-27 11:01:22 +02:00 |
|
|
ansuz
|
02cd7e5b58
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-27 10:44:53 +02:00 |
|
|
ansuz
|
69890ebd8f
|
prototype alternate datastructure for trees in listmap
|
2017-10-27 10:43:44 +02:00 |
|
|
ansuz
|
23c305f71f
|
implement removeItem so localForage doesn't complain
|
2017-10-27 10:37:44 +02:00 |
|
|
ansuz
|
98c66ef8f6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-25 13:04:08 +02:00 |
|
|
ansuz
|
f031af4e9d
|
fix broken media-tags in contacts
|
2017-10-25 10:50:17 +02:00 |
|
|
ansuz
|
f52a46c5aa
|
add html2canvas dependency
|
2017-10-24 18:49:34 +02:00 |
|
|
ansuz
|
ba97aa7ad2
|
allow file upload handler to create thumbnails for whiteboard
|
2017-10-24 18:09:38 +02:00 |
|
|
ansuz
|
6157c57a4b
|
disable color palette when interface is not editable
|
2017-10-24 17:59:19 +02:00 |
|
|
ansuz
|
8359902f6a
|
fix typo in poll
|
2017-10-24 17:42:08 +02:00 |
|
|
ansuz
|
69f9a7ebf3
|
make userlist change notifications configurable
|
2017-10-24 17:29:58 +02:00 |
|
|
ansuz
|
bac608adfe
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-24 16:56:13 +02:00 |
|
|
ansuz
|
dc90811090
|
only call onReady once in sframe-listmap
|
2017-10-24 16:56:08 +02:00 |
|
|
ansuz
|
aee51f1317
|
lint compliance
|
2017-10-24 14:02:29 +02:00 |
|
|
ansuz
|
447b0a74ee
|
handle errors for videos when uploading
|
2017-10-24 13:45:27 +02:00 |
|
|
ansuz
|
7d1892546b
|
add missing french translation
|
2017-10-23 14:59:14 +02:00 |
|
|
ansuz
|
6db5a34323
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-23 14:53:42 +02:00 |
|
|
ansuz
|
c17fc2efe7
|
improve option order in poll
|
2017-10-23 14:53:31 +02:00 |
|
|
ansuz
|
2e5fdf709a
|
Merge branch 'soon' into staging
|
2017-10-23 14:29:01 +02:00 |
|
|
ansuz
|
de8339fea7
|
hide alertify when you are in presentation mode
|
2017-10-23 14:25:25 +02:00 |
|
|
ansuz
|
aaef30f489
|
bump cryptpad version
|
2017-10-23 14:05:49 +02:00 |
|
|
ansuz
|
05c66e64dd
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-23 12:33:57 +02:00 |
|
|
ansuz
|
288e141c1f
|
add missing sframe method
|
2017-10-23 12:33:50 +02:00 |
|
|
ansuz
|
bf832ba784
|
fix comment overflow
|
2017-10-19 17:30:40 +02:00 |
|
|
ansuz
|
e317265594
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
2017-10-12 14:09:55 +02:00 |
|
|
ansuz
|
0d912402e5
|
patch for bug in Firefox ESR
|
2017-10-12 14:09:48 +02:00 |
|
|
ansuz
|
d4cd67f7a7
|
update current version of readme
|
2017-10-10 13:26:31 +02:00 |
|
|
ansuz
|
128c9c2f4e
|
Merge branch 'staging' of github.com:CatalinScr/cryptpad into catalin
|
2017-10-09 17:20:23 +02:00 |
|
|
ansuz
|
d046b9ce33
|
add missing French key
|
2017-10-09 17:16:48 +02:00 |
|
|
ansuz
|
f0bdc3b26f
|
second try
|
2017-10-09 16:57:30 +02:00 |
|
|
ansuz
|
d50a692986
|
add note about tags to prompt
|
2017-10-09 16:51:57 +02:00 |
|
|
ansuz
|
3f181fa370
|
update loading screen tip for tags
|
2017-10-09 15:38:33 +02:00 |
|
|
ansuz
|
c0bf34fd02
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-09 15:36:29 +02:00 |
|
|
ansuz
|
f751554f82
|
update footer and package.json for upcoming version
|
2017-10-09 15:15:04 +02:00 |
|
|
ansuz
|
a12239405b
|
fix toolbar 'home link' to visit home page from drive
|
2017-10-09 15:10:38 +02:00 |
|
|
ansuz
|
7559bc062e
|
lint compliance
|
2017-10-05 17:06:02 +02:00 |
|
|
ansuz
|
080511efcd
|
add missing translation for hashtags
|
2017-10-05 17:01:39 +02:00 |
|
|
ansuz
|
503111d26a
|
use recompiled media-tag
|
2017-10-05 17:00:47 +02:00 |
|
|
ansuz
|
427afc3954
|
override modified file name in pdfjs
|
2017-10-05 16:59:55 +02:00 |
|
|
ansuz
|
d85db64939
|
add tags from drive
|
2017-10-05 16:58:34 +02:00 |
|
|
ansuz
|
1f35798194
|
stop event propagation from tag prompt
|
2017-10-05 15:08:34 +02:00 |
|
|
ansuz
|
c936e5ae73
|
make context menu open correct app on correct port
|
2017-10-05 11:14:47 +02:00 |
|
|
ansuz
|
deed04108b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-05 10:22:07 +02:00 |
|
|
ansuz
|
a90c078e84
|
correct reference to undefined
|
2017-10-05 10:21:59 +02:00 |
|
|
ansuz
|
e2f53eaddb
|
add loading screen tip about hashtags
|
2017-10-03 18:39:03 +02:00 |
|
|
ansuz
|
b8ce149db6
|
add hint about tag usage
|
2017-10-03 18:36:34 +02:00 |
|
|
ansuz
|
f15ec4efe9
|
add tagging to whiteboard and file apps
|
2017-10-03 18:05:28 +02:00 |
|
|
ansuz
|
f90742603e
|
style fixes
|
2017-10-03 17:53:28 +02:00 |
|
|
ansuz
|
09c0a473e2
|
fix function signatures
|
2017-10-03 14:08:40 +02:00 |
|
|
ansuz
|
351b95d6a9
|
resolve merge conflicts
|
2017-10-02 18:59:47 +02:00 |
|
|
ansuz
|
6c7b135f91
|
lint compliance
|
2017-10-02 18:58:18 +02:00 |
|
|
ansuz
|
94c392b79f
|
secure messaging
|
2017-10-02 18:57:17 +02:00 |
|
|
ansuz
|
0a99478d9f
|
catch diffdom errors and plow through
|
2017-09-28 11:50:35 +02:00 |
|
|
ansuz
|
0f9e93e1de
|
make tests pass again
|
2017-09-28 10:36:40 +02:00 |
|
|
ansuz
|
48c49e5a75
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-28 10:23:59 +02:00 |
|
|
ansuz
|
19e58cec94
|
prevent typeError
|
2017-09-28 10:23:48 +02:00 |
|
|
ansuz
|
9571b3c018
|
persist whiteboard content across sessions
|
2017-09-26 15:16:17 +02:00 |
|
|
ansuz
|
748172585e
|
update for modified id
|
2017-09-26 15:00:25 +02:00 |
|
|
ansuz
|
4cd7d8eda4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-26 14:35:02 +02:00 |
|
|
ansuz
|
52be5501d6
|
remove invalid test
|
2017-09-26 14:34:54 +02:00 |
|
|
ansuz
|
b3e066eaca
|
show loading screen tips during loading screen
|
2017-09-26 10:59:25 +02:00 |
|
|
ansuz
|
95302366d1
|
lint compliance
|
2017-09-21 11:19:23 +02:00 |
|
|
ansuz
|
68f7d4bc0a
|
more conformant tagPrompt behaviour
|
2017-09-20 17:55:05 +02:00 |
|
|
ansuz
|
db4c3e7e2c
|
Merge branch 'master' into staging
|
2017-09-20 12:07:01 +02:00 |
|
|
ansuz
|
b5b84f540e
|
fix preview mode class
|
2017-09-20 12:02:46 +02:00 |
|
|
ansuz
|
53b98c12c9
|
ignore broken stylesheet
|
2017-09-20 11:33:30 +02:00 |
|
|
ansuz
|
f990200996
|
drop any notion of crypto from sframe-listmap
|
2017-09-19 18:21:33 +02:00 |
|
|
ansuz
|
a1c124f1be
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-19 15:38:21 +02:00 |
|
|
ansuz
|
c9223cb942
|
listmap does not care about 'readOnly' mode anymore
|
2017-09-19 15:38:06 +02:00 |
|
|
ansuz
|
d2b27f3588
|
resolve merge conflicts
|
2017-09-19 14:24:26 +02:00 |
|
|
ansuz
|
f127240a2f
|
add poll to main.less
|
2017-09-19 14:23:54 +02:00 |
|
|
ansuz
|
4af01e6e9e
|
make listmap consume cpNfInner
|
2017-09-19 14:16:13 +02:00 |
|
|
ansuz
|
029a8e3023
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-19 10:27:30 +02:00 |
|
|
ansuz
|
d72146ba7f
|
use setAttribute for assigning attributes in hyperscript
|
2017-09-19 10:27:19 +02:00 |
|
|
ansuz
|
937d323780
|
don't assume anything ckeditor-related is lint compliant
|
2017-09-18 15:31:02 +02:00 |
|
|
ansuz
|
5c405090e1
|
pin ckeditor version
|
2017-09-18 15:09:39 +02:00 |
|
|
ansuz
|
f9d27d2783
|
WIP secure contacts
|
2017-09-18 15:09:01 +02:00 |
|
|
ansuz
|
08e0ae424d
|
log errors in less compilation
|
2017-09-14 18:13:03 +02:00 |
|
|
ansuz
|
927a4b948f
|
Merge branch 'soon' into staging
|
2017-09-14 14:05:55 +02:00 |
|
|
ansuz
|
15db6b180c
|
copy bug fixes from changes
|
2017-09-14 13:43:13 +02:00 |
|
|
ansuz
|
5b45e92250
|
delete range requests after they have completed
|
2017-09-14 12:08:41 +02:00 |
|