Commit Graph

4769 Commits (8bf9617dd6af0b4b1bcf91b1d48685dc0d25ff7c)

Author SHA1 Message Date
yflory 69c33e2f83 Ability to disable profile 2018-01-23 14:24:40 +01:00
Caleb James DeLisle 1f34e47cbf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-23 14:15:44 +01:00
Caleb James DeLisle b3a873bbc9 Fix flow 2018-01-23 14:15:38 +01:00
yflory a34e227d37 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-23 13:48:38 +01:00
yflory 51587d1006 Ability to disable feedback on the entire instance 2018-01-23 13:47:30 +01:00
Caleb James DeLisle 88f3e730b9 Update package.json and sync file.js 2018-01-23 12:18:08 +01:00
yflory 006d99e19a Fix undefined friends 2018-01-23 12:09:54 +01:00
yflory af2bde27c6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-22 16:56:55 +01:00
yflory c90ba890ca Add more configurable options and add a new way to use custom config 2018-01-22 16:56:37 +01:00
ansuz ffa392a7e2
Merge pull request #221 from ryanpcmcquen/patch-1
Fix Org mode regex.
2018-01-22 10:44:33 +01:00
yflory a790dd0398 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-19 17:04:08 +01:00
yflory 2e436f16c9 Refactor context menu in drive 2018-01-19 17:03:58 +01:00
ansuz 3c1779a667 give function a more sensible name 2018-01-19 10:27:16 +01:00
ansuz 5114292b43 implement 'removeOwnedChannel' rpc and...
additional checks for rpc permissions
2018-01-19 10:26:21 +01:00
ansuz 544a26f6b3 fix a typo 2018-01-19 10:25:29 +01:00
Ryan P.C. McQuen ff4a49d59b
Fix Org mode regex.
More details here: https://github.com/mickael-kerjean/nuage/pull/16
2018-01-18 08:32:37 -08:00
yflory 4bea1aa2df Display default avatars in IE 2018-01-18 15:25:45 +01:00
yflory adf7e14891 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-18 15:04:17 +01:00
yflory bc9a88fbe9 Add support for org-mode in th code app 2018-01-18 15:04:06 +01:00
ansuz b08c1d94a1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-18 12:20:10 +01:00
ansuz 02dbe9e458 enforce maxUploadSize 2018-01-18 12:19:58 +01:00
yflory 6a906e3770 Fix share modal extension point 2018-01-18 11:16:30 +01:00
yflory caf9797c7c add customize/ to jshintignore 2018-01-18 11:16:10 +01:00
yflory e791add4ec Remove + icons from folders in the trash 2018-01-18 11:06:47 +01:00
yflory 51b4d269be Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-18 10:54:08 +01:00
yflory 6e086ee779 Add shortcuts in the share modal 2018-01-18 10:53:43 +01:00
ansuz fc8847dae4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-18 10:32:27 +01:00
ansuz 04b862352f update style for usage bar 2018-01-18 10:31:56 +01:00
yflory 08ae327386 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-17 18:40:09 +01:00
yflory c5ebbe1a56 New share menu 2018-01-17 18:39:45 +01:00
ansuz 4f42e8a282 bump to version 1.25.0 2018-01-17 14:28:20 +01:00
ansuz e52c1fe65c remove Symbol polyfill 2018-01-17 14:27:26 +01:00
ansuz a91a047d73 more polyfill for IE 2018-01-16 18:15:08 +01:00
ansuz 50e3e3ce91 polyfill Symbol for IE 2018-01-16 18:12:33 +01:00
ansuz 1dd07ea48a polyfill MAX_SAFE_INTEGER everywhere 2018-01-16 18:03:55 +01:00
ansuz 3858aa976a better warning in case of errors in /file/ 2018-01-16 16:52:06 +01:00
yflory 4c49cd7592 Fix template picker not displayed anymore in framework 2018-01-16 14:39:56 +01:00
yflory c77e4adf1e Use local name instead of title in filepicker if it exists 2018-01-16 14:32:49 +01:00
yflory 2f74324dac Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-16 12:05:37 +01:00
yflory f79e1dfda0 Fix a race condition that could wiped the content of coed and slide 2018-01-16 12:05:26 +01:00
Caleb James DeLisle 79fa732128 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-16 11:53:41 +01:00
Caleb James DeLisle 137c6428e8 Introducing heapdump to allow collecting more data from the server 2018-01-16 11:53:23 +01:00
ansuz 3118dd8312 set logLevel to 2 by default for sframe apps 2018-01-16 11:52:04 +01:00
Caleb James DeLisle f3167964f4 In case there is an error parsing one of the messages in a file, catch rather than blowing up 2018-01-16 11:51:09 +01:00
yflory 88a04fdb07 Don't create sfcommon a second time in code and slide 2018-01-16 11:26:16 +01:00
ansuz 4fc1079d67 translate some stuff 2018-01-15 17:43:58 +01:00
ansuz 3c9a025a4a Merge branch 'soon' 2018-01-15 15:51:09 +01:00
yflory ee605183e5 Make sure we don't have duplicates in the webchannel members 2018-01-15 15:40:52 +01:00
yflory f11960d047 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-15 15:38:28 +01:00
yflory 20f05d2f6f Fix Phantom viewers' revenge 2018-01-15 15:38:18 +01:00