4634 Commits

Author SHA1 Message Date
ansuz
4e8335bfdd fix support for custom button classes 2018-01-24 11:01:15 +01:00
yflory
c50b8dd3e9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-23 19:03:45 +01:00
yflory
166a9e71cf Add a features comparison page 2018-01-23 19:03:31 +01:00
Caleb James DeLisle
a3a739e504 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-23 18:54:57 +01:00
Caleb James DeLisle
b63d1527a0 Small bit of better logging 2018-01-23 18:54:52 +01:00
yflory
2995782079 Different colors for ok and cancel in alertify 2018-01-23 17:02:32 +01:00
ansuz
8d87a66284 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-23 16:42:08 +01:00
ansuz
acd5574008 send httpUnsafeOrigin via /api/config 2018-01-23 16:41:54 +01:00
Caleb James DeLisle
4de6bd6195 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-23 16:32:05 +01:00
Caleb James DeLisle
014aacc76a Added a new RPC to get file offsets of messages by hash or of last 2 checkpoints, also improved checking of valid channel names and fixed a pull-stream bug and exposed async-store to the window 2018-01-23 16:31:59 +01:00
yflory
35d65e248f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-23 15:57:17 +01:00
yflory
8628f2831e Fix 404 page inside iframe 2018-01-23 15:53:00 +01:00
ansuz
044384a576 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-23 15:51:37 +01:00
yflory
30c6ab4717 Add meta description tag 2018-01-23 15:17:06 +01:00
yflory
492fcf0bb6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-23 14:36:20 +01:00
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