 ansuz
|
aca83ce72a
|
expose self as global for linter
|
2017-11-30 17:25:05 +01:00 |
|
|
ansuz
|
3f892e04a5
|
fix codemirror overflow css
|
2017-11-30 17:24:43 +01:00 |
|
|
ansuz
|
96cf83af34
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-11-27 18:26:11 +01:00 |
|
|
ansuz
|
385ac9607c
|
pass 'self' into common-util instead of using window
|
2017-11-27 18:26:04 +01:00 |
|
|
ansuz
|
97d56303bc
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-11-27 17:59:07 +01:00 |
|
|
ansuz
|
1d0da582b4
|
update bower.json
|
2017-11-27 17:58:50 +01:00 |
|
|
ansuz
|
22c5ff757b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-11-27 15:05:07 +01:00 |
|
|
ansuz
|
650d26afea
|
use unified listmap in profile app
|
2017-11-27 15:04:59 +01:00 |
|
|
ansuz
|
5eacc158d9
|
make tests pass again
|
2017-11-27 13:45:40 +01:00 |
|
|
ansuz
|
812df7de6f
|
Merge branch 'merge-staging' into staging
|
2017-11-27 12:18:34 +01:00 |
|
|
ansuz
|
be5c5831dd
|
lint compliance
|
2017-11-27 12:18:04 +01:00 |
|
|
ansuz
|
77c81f2426
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into merge-staging
|
2017-11-27 12:16:47 +01:00 |
|
|
ansuz
|
4ff4ccd1d3
|
use faster and more correct 'find' implementation
|
2017-11-27 11:30:50 +01:00 |
|
|
ansuz
|
e3f04ef076
|
Merge branch 'soon' into staging
|
2017-11-27 11:11:49 +01:00 |
|
|
ansuz
|
71cf3a4ddf
|
fix creation of personal todo list
|
2017-11-27 11:09:28 +01:00 |
|
|
ansuz
|
701af29192
|
fix broken register/login process
|
2017-11-24 15:12:00 +01:00 |
|
|
ansuz
|
a3c093838c
|
merge latest staging and resolve conflicts
|
2017-11-24 13:46:59 +01:00 |
|
|
ansuz
|
56102d3689
|
use unified listmap
|
2017-11-24 13:40:21 +01:00 |
|
|
ansuz
|
661db129b2
|
lint compliance
|
2017-11-24 10:32:58 +01:00 |
|
|
ansuz
|
80978377f2
|
return transformed cursor value
|
2017-11-24 10:03:45 +01:00 |
|
|
ansuz
|
2e00214783
|
drop unreachable code
|
2017-11-23 16:57:01 +01:00 |
|
|
ansuz
|
ee6c2097f5
|
resolve merge conflicts
|
2017-11-23 16:56:49 +01:00 |
|
|
ansuz
|
1e9856647e
|
lint compliance
|
2017-11-22 17:40:00 +01:00 |
|
|
ansuz
|
98c2b0c802
|
Merge branch 'soon' into staging
|
2017-11-22 17:38:49 +01:00 |
|
|
ansuz
|
3ff0eb116b
|
don't let search interfere with renaming
|
2017-11-22 17:23:14 +01:00 |
|
|
ansuz
|
eac6afba24
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-11-21 18:22:08 +01:00 |
|
|
ansuz
|
c196b98eb2
|
add a script to check accounts server for registered users
|
2017-11-21 18:22:01 +01:00 |
|
|
ansuz
|
60c4973d62
|
resolve merge conflicts
|
2017-11-21 17:22:06 +01:00 |
|
|
ansuz
|
585f9d2e4e
|
repair broken 'clear channel' button
|
2017-11-21 17:19:35 +01:00 |
|
|
ansuz
|
2ff1a17ade
|
Merge branch 'soon' into staging
|
2017-11-21 17:02:59 +01:00 |
|
|
ansuz
|
8150abddbe
|
remove dead code from pages.js
|
2017-11-21 15:52:37 +01:00 |
|
|
ansuz
|
4ffb59dce9
|
bump to version 1.21.0
|
2017-11-21 15:47:06 +01:00 |
|
|
ansuz
|
9d662bd337
|
fix right-click pad creation in drive
|
2017-11-21 15:21:37 +01:00 |
|
|
ansuz
|
d726c95f0b
|
fix namespace collision
|
2017-11-21 15:10:28 +01:00 |
|
|
ansuz
|
c8a9afb6c8
|
remove duplicate loading screen
|
2017-11-21 15:09:53 +01:00 |
|
|
ansuz
|
78e972201a
|
bump CryptPad version
|
2017-11-20 14:16:55 +01:00 |
|
|
ansuz
|
a8d5a68eb5
|
open links correctly in contacts app
|
2017-11-20 14:06:19 +01:00 |
|
|
ansuz
|
7441a68fb9
|
update test after merging api changes
|
2017-11-20 12:22:26 +01:00 |
|
|
ansuz
|
d1beb6493b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-11-20 12:20:13 +01:00 |
|
|
ansuz
|
b96ea47f1f
|
strip tracking parameters when parsing urls
|
2017-11-20 12:09:17 +01:00 |
|
|
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 |
|