Commit Graph

  • b63d1527a0 Small bit of better logging Caleb James DeLisle 2018-01-23 18:54:52 +01:00
  • 2995782079 Different colors for ok and cancel in alertify yflory 2018-01-23 17:02:32 +01:00
  • 8d87a66284 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2018-01-23 16:42:08 +01:00
  • acd5574008 send httpUnsafeOrigin via /api/config ansuz 2018-01-23 16:41:54 +01:00
  • 4de6bd6195 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2018-01-23 16:32:05 +01:00
  • 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 Caleb James DeLisle 2018-01-23 16:31:59 +01:00
  • 35d65e248f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-23 15:57:17 +01:00
  • 8628f2831e Fix 404 page inside iframe yflory 2018-01-23 15:53:00 +01:00
  • 044384a576 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2018-01-23 15:51:37 +01:00
  • 30c6ab4717 Add meta description tag yflory 2018-01-23 15:17:06 +01:00
  • 492fcf0bb6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-23 14:36:20 +01:00
  • 69c33e2f83 Ability to disable profile yflory 2018-01-23 14:24:40 +01:00
  • 1f34e47cbf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2018-01-23 14:15:44 +01:00
  • b3a873bbc9 Fix flow Caleb James DeLisle 2018-01-23 14:15:38 +01:00
  • a34e227d37 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-23 13:48:38 +01:00
  • 51587d1006 Ability to disable feedback on the entire instance yflory 2018-01-23 13:47:30 +01:00
  • 88f3e730b9 Update package.json and sync file.js Caleb James DeLisle 2018-01-23 12:18:08 +01:00
  • 006d99e19a Fix undefined friends yflory 2018-01-23 12:09:54 +01:00
  • af2bde27c6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-22 16:56:55 +01:00
  • c90ba890ca Add more configurable options and add a new way to use custom config yflory 2018-01-22 16:56:37 +01:00
  • ffa392a7e2 Merge pull request #221 from ryanpcmcquen/patch-1 ansuz 2018-01-22 10:44:33 +01:00
  • a790dd0398 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-19 17:04:08 +01:00
  • 2e436f16c9 Refactor context menu in drive yflory 2018-01-19 17:03:58 +01:00
  • 3c1779a667 give function a more sensible name ansuz 2018-01-19 10:27:16 +01:00
  • 5114292b43 implement 'removeOwnedChannel' rpc and... ansuz 2018-01-19 10:26:21 +01:00
  • 544a26f6b3 fix a typo ansuz 2018-01-19 10:25:29 +01:00
  • ff4a49d59b Fix Org mode regex. Ryan P.C. McQuen 2018-01-18 08:32:37 -08:00
  • 4bea1aa2df Display default avatars in IE yflory 2018-01-18 15:25:45 +01:00
  • adf7e14891 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-18 15:04:17 +01:00
  • bc9a88fbe9 Add support for org-mode in th code app yflory 2018-01-18 15:04:06 +01:00
  • b08c1d94a1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2018-01-18 12:20:10 +01:00
  • 02dbe9e458 enforce maxUploadSize ansuz 2018-01-18 12:19:58 +01:00
  • 6a906e3770 Fix share modal extension point yflory 2018-01-18 11:16:30 +01:00
  • caf9797c7c add customize/ to jshintignore yflory 2018-01-18 11:16:10 +01:00
  • e791add4ec Remove + icons from folders in the trash yflory 2018-01-18 11:06:47 +01:00
  • 51b4d269be Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-18 10:54:08 +01:00
  • 6e086ee779 Add shortcuts in the share modal yflory 2018-01-18 10:53:36 +01:00
  • fc8847dae4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2018-01-18 10:32:27 +01:00
  • 04b862352f update style for usage bar ansuz 2018-01-18 10:31:56 +01:00
  • 08ae327386 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-17 18:40:09 +01:00
  • c5ebbe1a56 New share menu yflory 2018-01-17 18:39:45 +01:00
  • 4f42e8a282 bump to version 1.25.0 ansuz 2018-01-17 14:28:20 +01:00
  • e52c1fe65c remove Symbol polyfill ansuz 2018-01-17 14:27:26 +01:00
  • a91a047d73 more polyfill for IE ansuz 2018-01-16 18:15:08 +01:00
  • 50e3e3ce91 polyfill Symbol for IE ansuz 2018-01-16 18:12:33 +01:00
  • 1dd07ea48a polyfill MAX_SAFE_INTEGER everywhere ansuz 2018-01-16 18:03:55 +01:00
  • 3858aa976a better warning in case of errors in /file/ ansuz 2018-01-16 16:52:06 +01:00
  • 4c49cd7592 Fix template picker not displayed anymore in framework yflory 2018-01-16 14:39:52 +01:00
  • c77e4adf1e Use local name instead of title in filepicker if it exists yflory 2018-01-16 14:32:49 +01:00
  • 2f74324dac Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-16 12:05:37 +01:00
  • f79e1dfda0 Fix a race condition that could wiped the content of coed and slide yflory 2018-01-16 12:05:26 +01:00
  • 79fa732128 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2018-01-16 11:53:41 +01:00
  • 137c6428e8 Introducing heapdump to allow collecting more data from the server Caleb James DeLisle 2018-01-16 11:53:23 +01:00
  • 3118dd8312 set logLevel to 2 by default for sframe apps ansuz 2018-01-16 11:52:04 +01:00
  • f3167964f4 In case there is an error parsing one of the messages in a file, catch rather than blowing up Caleb James DeLisle 2018-01-16 11:51:09 +01:00
  • 88a04fdb07 Don't create sfcommon a second time in code and slide yflory 2018-01-16 11:26:16 +01:00
  • 4fc1079d67 translate some stuff ansuz 2018-01-15 17:43:58 +01:00
  • 3c9a025a4a Merge branch 'soon' ansuz 2018-01-15 15:51:09 +01:00
  • ee605183e5 Make sure we don't have duplicates in the webchannel members yflory 2018-01-15 15:40:52 +01:00
  • f11960d047 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-15 15:38:28 +01:00
  • 20f05d2f6f Fix Phantom viewers' revenge yflory 2018-01-15 15:38:18 +01:00
  • 4afc04f64c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2018-01-15 14:14:50 +01:00
  • b933c062a7 Merge branch 'use-less-memory' of github.com:xwiki-labs/cryptpad into origin/use-less-memory ansuz 2018-01-15 14:07:28 +01:00
  • edeb1e25d3 Bad solution to a bad problem Caleb James DeLisle 2018-01-15 13:55:52 +01:00
  • f3d8fd3590 Ability to import local pads on login yflory 2018-01-12 18:17:32 +01:00
  • a5b75e0164 Fix default config for anynymous drive yflory 2018-01-12 18:15:06 +01:00
  • 8ced81d8d7 lint compliance yflory 2018-01-12 17:45:52 +01:00
  • 50eb803c95 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-12 17:45:10 +01:00
  • 47203c37f1 Remove console error caused by setTimeout called with undefined yflory 2018-01-12 17:44:56 +01:00
  • b630fb95e2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2018-01-12 17:39:43 +01:00
  • a018b7db9e only show availablePadTypes on the home page ansuz 2018-01-12 17:39:36 +01:00
  • a40315aff7 Remove ability to delete comments in polls for readonly users yflory 2018-01-12 17:15:11 +01:00
  • 85edc028ff Remove logging about filepicker rpc yflory 2018-01-12 17:10:55 +01:00
  • dffa117f4d lint compliance yflory 2018-01-12 17:09:33 +01:00
  • a4b35728dc Todo app has a hash in the omnibar yflory 2018-01-12 17:08:41 +01:00
  • 68ce7fe53d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-12 15:55:00 +01:00
  • d59bc4612d Ability to disable the drive for anonymous users yflory 2018-01-12 15:54:36 +01:00
  • 844d04df87 allow custom logout hooks defined in app config ansuz 2018-01-12 15:49:01 +01:00
  • 5b4e5480cb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2018-01-12 14:51:53 +01:00
  • 9b78580d8e make usage-bar display optional ansuz 2018-01-12 14:50:56 +01:00
  • db0d2e161c Hide pad creation screen features if it is disabled in app config yflory 2018-01-12 14:50:39 +01:00
  • b01d00f74a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-12 09:50:17 +01:00
  • daef08a9b3 Add an advanced new pad modal yflory 2018-01-12 09:48:40 +01:00
  • cd26a4c093 Added a test of /login/ Caleb James DeLisle 2018-01-11 18:11:06 +01:00
  • e377d606be Fix spinner style in the new settings category yflory 2018-01-11 17:15:39 +01:00
  • 69aee6c21b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2018-01-11 17:09:06 +01:00
  • 378322a521 Don't finish the test until ChainPad settles, trying to eliminate a flicker Caleb James DeLisle 2018-01-11 17:08:47 +01:00
  • 02d1f10231 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-11 16:09:41 +01:00
  • c460e2820e Fix a 1px offset for the userlist in Firefox/Windows yflory 2018-01-11 16:09:29 +01:00
  • 2c9e21b2de Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2018-01-11 16:07:10 +01:00
  • a8e0cf2ed0 We should remove datastore between tests Caleb James DeLisle 2018-01-11 16:06:58 +01:00
  • bd9c44dbb2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-11 16:02:18 +01:00
  • ef480fea79 Add a settings category for the pad creation screen yflory 2018-01-11 16:02:05 +01:00
  • dc376fdb1c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2018-01-11 15:58:16 +01:00
  • 4808c8b374 Fixed poll which was not working with automated testing Caleb James DeLisle 2018-01-11 15:57:09 +01:00
  • 05ad38cfe1 add more config parameters to share menu extension ansuz 2018-01-10 12:52:18 +01:00
  • c31b5aa6c0 make extension point cover share menu for files ansuz 2018-01-10 11:59:06 +01:00
  • 13b704d9f6 Fix undefined webchannel when uploading a file yflory 2018-01-10 11:47:52 +01:00
  • ca3697ae3a implement extension point for share menu ansuz 2018-01-10 11:49:16 +01:00
  • 5346afe51f step towards customizable login functionality ansuz 2018-01-10 10:14:49 +01:00