Commit Graph

4103 Commits (a592317e35a0932c46f11f86072da365b4521291)
 

Author SHA1 Message Date
Caleb James DeLisle abec07b1f9 If config.js is missing, fallback to config.example.js which is in the git repo
Caleb James DeLisle 818742dd56 Add frame-src for IE/Edge compatibility
ansuz 54eefd3d94 replace contacts with contacts2
ansuz 57d0c6c973 Merge branch 'new-messaging' into staging
ansuz 9e04d039d7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 22d754d514 handle user renames
Caleb James DeLisle 0a6f81850f Handle infinite-spinner errors and properly inform the user
ansuz a99eb9365e correctly set indentation preferences when changing languages
ansuz f9cdbe66a0 add forgotten translation string
ansuz f58d4c941f clean up a bit
ansuz ea5f47f0f9 remove some TODOs and solve some wee bugs
ansuz b75a951a98 encode messages with 'author' field instead of 'channel'
Caleb James DeLisle cbf63b4c52 jshintignore pad2/wysiwygarea-plugin.js
Caleb James DeLisle 35e7341f4d Merge branch 'ui-integration' into staging2
Caleb James DeLisle 7bbea28831 minor anti-xss changes...
ansuz 78404ce8b7 add npm sub-commands
ansuz 013b75ae67 implement history range requests
ansuz b71f1860db make uid function reusable
ansuz 443d8a8941 remove unnecessary files
Caleb James DeLisle 75fde58846 Well that was stupid... (fix bug introduced in acfaaa7d56 when trying to make jshint compliance)
Caleb James DeLisle dc283c2d74 Load 1, load 2... not load 1, load 3.
Caleb James DeLisle 5d9599c9b7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
Caleb James DeLisle cbac5e417c Make loading screen come much earlier on pad2
yflory b6881349be Fix an issue with the notifications in secure pads
yflory ec64ac485d Fix 'not a function' error
Caleb James DeLisle acfaaa7d56 jshint compliance
Caleb James DeLisle 2ad9fcee17 Manual merge of notify.js
Caleb James DeLisle 8a9755611a Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
Caleb James DeLisle 2dacd57e76 fix caching on favicon
yflory 33025a9df9 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
yflory c33b128bf4 Enable feedback in pad2
yflory e81bb3fe08 Fix profile link in the userlist
yflory d6c33fdf4f Ghost icon to add a pad
ansuz 89a13d4b21 work on contacts2 until feature parity is reached
ansuz 002eed0d6f make most of the messenger api async
Caleb James DeLisle d9f5e3638e Big caching improvements :D
yflory 98daf10ed1 Ability to collapse the root directory in the drive
yflory b4864b96ac Add a recent pads category in the drive
yflory 1752124071 Fix Iframe height in Edge
Caleb James DeLisle 4f3b4a30ee Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
Caleb James DeLisle 4b70fc9f49 Use resources from the original origin in pad2
yflory 20a68ad71c Hide the template button if the pad2 is a template
yflory aa9e0d3cd3 Enable AppConfig in pad2
yflory 4089803785 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
yflory f40d2c0b20 Add templates to pad2
yflory 8d020833af Add missing file
Caleb James DeLisle bffa4d01a8 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
Caleb James DeLisle b081603455 Update requirejs
yflory 8d837d22ea Add history to pad2
yflory b2e6df1f9d Add import & export in pad2