dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,846 Commits 92 Branches 135 Tags 578 MiB
Commit Graph

3846 Commits

Author SHA1 Message Date
ansuz a99eb9365e correctly set indentation preferences when changing languages 2017-08-24 17:31:04 +02:00
ansuz f9cdbe66a0 add forgotten translation string 2017-08-24 17:20:59 +02:00
ansuz f58d4c941f clean up a bit 2017-08-24 17:19:57 +02:00
ansuz ea5f47f0f9 remove some TODOs and solve some wee bugs 2017-08-24 17:18:59 +02:00
ansuz b75a951a98 encode messages with 'author' field instead of 'channel' 2017-08-24 17:14:03 +02:00
Caleb James DeLisle cbf63b4c52 jshintignore pad2/wysiwygarea-plugin.js 2017-08-24 14:01:18 +02:00
Caleb James DeLisle 35e7341f4d Merge branch 'ui-integration' into staging2 2017-08-24 13:54:55 +02:00
Caleb James DeLisle 7bbea28831 minor anti-xss changes... 2017-08-24 13:53:42 +02:00
ansuz 78404ce8b7 add npm sub-commands 2017-08-24 11:34:46 +02:00
ansuz 013b75ae67 implement history range requests 2017-08-24 11:34:05 +02:00
ansuz b71f1860db make uid function reusable 2017-08-24 11:31:20 +02:00
ansuz 443d8a8941 remove unnecessary files 2017-08-24 11:29:42 +02:00
Caleb James DeLisle 75fde58846 Well that was stupid... (fix bug introduced in acfaaa7d56 when trying to make jshint compliance) 2017-08-23 16:18:47 +02:00
Caleb James DeLisle dc283c2d74 Load 1, load 2... not load 1, load 3. 2017-08-23 15:49:51 +02:00
Caleb James DeLisle 5d9599c9b7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-23 12:15:01 +02:00
Caleb James DeLisle cbac5e417c Make loading screen come much earlier on pad2 2017-08-23 12:14:51 +02:00
yflory b6881349be Fix an issue with the notifications in secure pads 2017-08-23 11:39:53 +02:00
yflory ec64ac485d Fix 'not a function' error 2017-08-23 11:06:55 +02:00
Caleb James DeLisle acfaaa7d56 jshint compliance 2017-08-23 11:04:44 +02:00
Caleb James DeLisle 2ad9fcee17 Manual merge of notify.js 2017-08-23 10:45:55 +02:00
Caleb James DeLisle 8a9755611a Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 2017-08-23 10:21:53 +02:00
Caleb James DeLisle 2dacd57e76 fix caching on favicon 2017-08-23 10:21:41 +02:00
yflory 33025a9df9 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 2017-08-22 18:19:06 +02:00
yflory c33b128bf4 Enable feedback in pad2 2017-08-22 18:18:58 +02:00
yflory e81bb3fe08 Fix profile link in the userlist 2017-08-22 18:18:48 +02:00
yflory d6c33fdf4f Ghost icon to add a pad 2017-08-22 17:33:48 +02:00
ansuz 89a13d4b21 work on contacts2 until feature parity is reached 2017-08-22 15:55:49 +02:00
ansuz 002eed0d6f make most of the messenger api async 2017-08-22 15:55:00 +02:00
Caleb James DeLisle d9f5e3638e Big caching improvements :D 2017-08-22 15:50:10 +02:00
yflory 98daf10ed1 Ability to collapse the root directory in the drive 2017-08-22 14:54:41 +02:00
yflory b4864b96ac Add a recent pads category in the drive 2017-08-22 14:28:17 +02:00
yflory 1752124071 Fix Iframe height in Edge 2017-08-22 11:50:52 +02:00
Caleb James DeLisle 4f3b4a30ee Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 2017-08-21 18:38:16 +02:00
Caleb James DeLisle 4b70fc9f49 Use resources from the original origin in pad2 2017-08-21 18:38:07 +02:00
yflory 20a68ad71c Hide the template button if the pad2 is a template 2017-08-21 18:31:15 +02:00
yflory aa9e0d3cd3 Enable AppConfig in pad2 2017-08-21 18:30:51 +02:00
yflory 4089803785 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 2017-08-21 18:22:08 +02:00
yflory f40d2c0b20 Add templates to pad2 2017-08-21 18:21:53 +02:00
yflory 8d020833af Add missing file 2017-08-21 18:21:25 +02:00
Caleb James DeLisle bffa4d01a8 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 2017-08-21 18:08:46 +02:00
Caleb James DeLisle b081603455 Update requirejs 2017-08-21 18:08:37 +02:00
yflory 8d837d22ea Add history to pad2 2017-08-21 17:40:21 +02:00
yflory b2e6df1f9d Add import & export in pad2 2017-08-21 15:34:21 +02:00
yflory 1da11a1883 Disable edition in readonly mode in pad2 2017-08-21 15:30:48 +02:00
yflory e2d39de143 Forget button in pad2 2017-08-21 15:20:38 +02:00
yflory e4020ba8d4 Fix pad creation in pad2 2017-08-21 14:41:56 +02:00
yflory 140c6f3776 Add limit warning in pad2 2017-08-21 12:24:33 +02:00
yflory 30aef71603 Enable avatars in pad2 2017-08-21 12:01:38 +02:00
yflory f88a6f63fe Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 2017-08-21 11:08:38 +02:00
yflory fb4808e1e1 Fix queries callback arguments 2017-08-21 11:08:27 +02:00