1822 Commits

Author SHA1 Message Date
yflory
014e12b5b5 Ability to update the username from the userlist 2017-11-15 11:32:54 +01:00
yflory
7cfe64fc5b Remove cryptpad-common dependency for some inner apps 2017-11-13 18:09:19 +01:00
yflory
1514ad5df3 Move the 'logged out' screen inside the sframe 2017-11-13 17:29:00 +01:00
yflory
5a2afb5c95 Remove Realtime and Messaging from common 2017-11-13 17:01:09 +01:00
yflory
30c8c253dd Remove util and hash from common 2017-11-13 16:32:40 +01:00
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
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
101482b8cc Migrate settings to use a sandboxed iframe 2017-11-09 14:23:40 +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
e07bb0f7b3 roll back to old transform function, except in pad 2017-11-06 17:18:10 +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
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
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
4250688856 Migrate profile to use sframe 2017-10-30 18:49:28 +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
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
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
yflory
6f020b67ca Add thumbnails to framework apps 2017-10-26 12:31:16 +02:00
yflory
bf817f20ee Fix file upload in code and slide 2017-10-25 12:31:22 +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
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