ansuz
|
12ae657422
|
Merge branch 'staging' into soon
|
2017-11-07 12:07:25 +01:00 |
|
yflory
|
2ff66e1a7c
|
Update french translation
|
2017-11-06 17:39:41 +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 |
|
yflory
|
0149347d1b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-11-06 15:49:46 +01:00 |
|
yflory
|
a592317e35
|
lint compliance
|
2017-11-06 15:49:40 +01:00 |
|
yflory
|
fef97ed60e
|
Fix an creating duplicates mediatags in markdown preview
|
2017-11-06 15:47:18 +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 |
|
yflory
|
9060464f37
|
Create thumbnails only when the tab is not focused
|
2017-11-06 13:36:54 +01:00 |
|
yflory
|
a37e6c7979
|
lint compliance
|
2017-11-03 18:39:06 +01:00 |
|
yflory
|
2a3a5c4342
|
Ability to disable thumbnails
|
2017-11-03 18:38:27 +01:00 |
|
yflory
|
5dff9a32b6
|
Fix comments order in polls
|
2017-11-03 18:38:04 +01:00 |
|
yflory
|
1871749b6f
|
Fix -1 viewer in the userlist when disconnected
|
2017-11-03 15:14:23 +01:00 |
|
yflory
|
cf3024ef5b
|
Ability to display an error in the toolbar state
|
2017-11-03 14:30:59 +01:00 |
|
yflory
|
8de9a596f1
|
Fix cursor in thumbnails
|
2017-11-02 19:11:27 +01:00 |
|
yflory
|
fd7bb3aadb
|
Make sure the infinite spinner modal is not displayed multiple times
|
2017-11-02 17:47:19 +01:00 |
|
yflory
|
3ebb5ca493
|
Fix issue in diffMarked creating text nodes for each character
|
2017-10-31 18:19:30 +01:00 |
|
yflory
|
5438970ab4
|
typo
|
2017-10-31 11:30:13 +01:00 |
|
yflory
|
e0f7df80b3
|
Fix avatar upload and use less2 everywhere in profile
|
2017-10-31 11:11:29 +01:00 |
|
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 |