yflory
c9e1de042c
Remove common-interface dependency from cryptpad-common
2017-11-13 12:00:26 +01:00
yflory
dc207393fd
Separate UI elements from cryptpad-common
2017-11-13 10:23:18 +01:00
Caleb James DeLisle
50da6b3b2e
Needs to be handled in chainpad-listmap
...
Revert "Do content checks on the drive so if it gets corrupted, the patch will be rejected"
This reverts commit eaa7b6e8e5ed4e7a6abc229233d460d32dfb3330.
2017-11-11 01:34:20 +01:00
Caleb James DeLisle
eaa7b6e8e5
Do content checks on the drive so if it gets corrupted, the patch will be rejected
2017-11-11 01:26:54 +01:00
yflory
354c63bd64
Clean old code
2017-11-09 18:17:49 +01:00
Caleb James DeLisle
ac66511f0a
Merge branch 'staging' into new-diff
2017-11-09 17:44:45 +01:00
yflory
be848c1bec
Fix broken readonly link in drive
2017-11-09 17:27:50 +01:00
yflory
f931574dac
lint compliance
2017-11-09 17:23:13 +01:00
Caleb James DeLisle
7b62a8042e
Remove TextPatcher and begin to include ChainPad directly using requirejs instead of sniffing off the window
2017-11-09 17:07:04 +01:00
Caleb James DeLisle
840cd91bcb
manual merge
2017-11-09 15:38:32 +01:00
Caleb James DeLisle
75130150d5
Refactored out TextPatcher and JsonOT and replaced with new ChainPad
2017-11-09 15:36:49 +01:00
yflory
cf5ccf04f2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-11-09 14:23:54 +01:00
yflory
101482b8cc
Migrate settings to use a sandboxed iframe
2017-11-09 14:23:40 +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
yflory
c1ba08cfc6
Make sure thumbnails are .png
2017-11-07 15:04:45 +01:00
yflory
0956905ca8
Wipe localForage on log out
2017-11-07 14:56:50 +01:00
yflory
6b9ffe8dd1
Make thumbnails more secure
2017-11-07 14:51:53 +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
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
