yflory
|
7f9b21405b
|
Add missing files for profile
|
2017-10-31 10:27:41 +01:00 |
|
yflory
|
e99836bae2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-30 18:49:43 +01:00 |
|
yflory
|
4250688856
|
Migrate profile to use sframe
|
2017-10-30 18:49:28 +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 |
|
yflory
|
907e2cb517
|
lint compliance
|
2017-10-30 15:13:27 +01:00 |
|
yflory
|
abc511a56e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-30 15:12:29 +01:00 |
|
yflory
|
68accaf653
|
Todo in sframe with less2
|
2017-10-30 15:12:15 +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 |
|
Evilham
|
5dcfbd07ab
|
Merge branch 'theming-improvement' into staging
|
2017-10-27 18:32:08 +02:00 |
|
Evilham
|
4933aafbc8
|
Added default values to avoid breaking existing themes.
|
2017-10-27 18:31:52 +02: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 |
|
yflory
|
ac1b67ad67
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-27 13:31:54 +02:00 |
|
yflory
|
1245b4d244
|
Enable thumbnails in poll and whiteboard
|
2017-10-27 13:31:41 +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 |
|
Evilham
|
735f0a7e30
|
Merge branch 'theming-improvement' into staging
|
2017-10-26 20:44:56 +02:00 |
|
Evilham
|
83da9cf752
|
Moved colours to colortheme.less to enable theming
|
2017-10-26 20:29:14 +02:00 |
|
yflory
|
8251247da2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-26 12:31:33 +02:00 |
|
yflory
|
6f020b67ca
|
Add thumbnails to framework apps
|
2017-10-26 12:31:16 +02:00 |
|
yflory
|
26c4bda4cd
|
Fix file upload in code and slide
|
2017-10-25 13:09:56 +02:00 |
|
ansuz
|
98c66ef8f6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-25 13:04:08 +02:00 |
|
yflory
|
bf817f20ee
|
Fix file upload in code and slide
|
2017-10-25 12:31:22 +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 |
|
yflory
|
24572a40d2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-24 18:50:19 +02:00 |
|
yflory
|
f4adbd980e
|
Thumbnails for the code app
|
2017-10-24 18:49:58 +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 |
|
Caleb James DeLisle
|
027b9fa383
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-24 18:03:31 +03:00 |
|
Caleb James DeLisle
|
aa37997aa3
|
Enable JSON-OT again because it is working now that the arguments are passed in the right order <facepalm>
|
2017-10-24 18:02:03 +03: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 |
|
yflory
|
bac10472f3
|
lint compliance
|
2017-10-24 14:32:47 +02:00 |
|
yflory
|
39b4cb9226
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-24 14:31:56 +02:00 |
|
yflory
|
18b5b20d27
|
Add thumbnails for PDFs
|
2017-10-24 14:31:42 +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 |
|
yflory
|
30a69fae13
|
Add thumbnails for videos
|
2017-10-24 12:26:04 +02:00 |
|
yflory
|
21f8ae7570
|
Keep the correct ratio for image thumbnails
|
2017-10-24 11:45:07 +02:00 |
|