Commit Graph

5176 Commits (ef73cf89cdbfecd8f0dd5bc081199a63bdf175b8)
 

Author SHA1 Message Date
yflory f931574dac lint compliance
Caleb James DeLisle 7b62a8042e Remove TextPatcher and begin to include ChainPad directly using requirejs instead of sniffing off the window
Caleb James DeLisle 840cd91bcb manual merge
Caleb James DeLisle 75130150d5 Refactored out TextPatcher and JsonOT and replaced with new ChainPad
yflory cf5ccf04f2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 101482b8cc Migrate settings to use a sandboxed iframe
ansuz 7f8147b18b Merge branch 'soon'
ansuz 4bfd13d291 Merge branch 'staging' into soon
yflory c1ba08cfc6 Make sure thumbnails are .png
yflory 0956905ca8 Wipe localForage on log out
yflory 6b9ffe8dd1 Make thumbnails more secure
ansuz 454fc8498c remove old* apps
ansuz 12ae657422 Merge branch 'staging' into soon
yflory 2ff66e1a7c Update french translation
ansuz 2c9df23849 update english text for removing from trash in the drive
ansuz e07bb0f7b3 roll back to old transform function, except in pad
ansuz d10f752457 s/delete/move to trash
yflory 0149347d1b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory a592317e35 lint compliance
yflory fef97ed60e Fix an creating duplicates mediatags in markdown preview
ansuz 402fae442d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz c5f6491c37 bump footer and package.json to latest version
yflory 9060464f37 Create thumbnails only when the tab is not focused
yflory a37e6c7979 lint compliance
yflory 2a3a5c4342 Ability to disable thumbnails
yflory 5dff9a32b6 Fix comments order in polls
yflory 1871749b6f Fix -1 viewer in the userlist when disconnected
yflory cf3024ef5b Ability to display an error in the toolbar state
yflory 8de9a596f1 Fix cursor in thumbnails
yflory fd7bb3aadb Make sure the infinite spinner modal is not displayed multiple times
yflory 3ebb5ca493 Fix issue in diffMarked creating text nodes for each character
yflory 5438970ab4 typo
yflory e0f7df80b3 Fix avatar upload and use less2 everywhere in profile
yflory 7f9b21405b Add missing files for profile
yflory e99836bae2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 4250688856 Migrate profile to use sframe
ansuz 744809101c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 867df1db56 fix '+New' button in drive toolbar
yflory 907e2cb517 lint compliance
yflory abc511a56e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 68accaf653 Todo in sframe with less2
ansuz 11b8b380fd Merge branch 'staging' into evilham
ansuz 04f26ff886 Merge branch 'staging' of github.com:evilham/cryptpad into evilham
ansuz 0a14c715ad add test for support of invite urls
Evilham 5dcfbd07ab Merge branch 'theming-improvement' into staging
Evilham 4933aafbc8 Added default values to avoid breaking existing themes.
ansuz 4c0049ad55 don't log presence of other users as 'joins' when you have first joined
ansuz 325f685f3e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 1cbf1aec92 prevent undefined access in non-sframe apps
yflory ac1b67ad67 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging