Commit Graph

  • 5bba9b6c39 Refactor login to remove duplicate code yflory 2018-02-06 18:45:12 +0100
  • c2e9c60756 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-02-06 17:36:44 +0100
  • 4df4c48fbd Improve UI for pad creation screen yflory 2018-02-06 17:36:37 +0100
  • e78cc4ce7e manual merge Caleb James DeLisle 2018-02-06 11:41:57 +0100
  • cac5e75a99 Add a repl to improve debugging on the prod server Caleb James DeLisle 2018-02-06 11:35:24 +0100
  • 8213d0d926 guard against null pointer exception ansuz 2018-02-05 15:24:30 +0100
  • f9b37e253c Merge branch 'keywords' of github.com:xwiki-labs/cryptpad into keywords ansuz 2018-02-01 11:43:39 +0100
  • a281869bba make things actually work ansuz 2018-02-01 11:43:29 +0100
  • 83eb304716 lint compliance yflory 2018-02-01 11:16:34 +0100
  • 0672c2f41a implement a running diff ansuz 2018-02-01 11:09:24 +0100
  • 970122b41d Send the channel id to the text analyzer yflory 2018-02-01 11:08:04 +0100
  • 80df45f257 Get text from ckeditor yflory 2018-02-01 10:09:08 +0100
  • 336d717c67 fix text ansuz 2018-01-31 15:29:57 +0100
  • fb192a2c45 Add a configurable background color in the file app in view mode yflory 2018-01-31 14:42:34 +0100
  • 91e42f1518 Fix the bug introduced in the share modal fix yflory 2018-01-31 12:11:10 +0100
  • 0b1795e5a1 Fix an issue preventing the share modal to be used more than once yflory 2018-01-31 12:08:55 +0100
  • f6926699bc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-29 19:04:14 +0100
  • ad2cde4705 Add warning about anonymous drive in localStorage yflory 2018-01-29 19:04:00 +0100
  • e80e8339c2 Typo in translation yflory 2018-01-29 16:16:42 +0100
  • de838a3184 fix usage bar styles ansuz 2018-01-29 16:12:35 +0100
  • e6ce06184a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2018-01-29 15:49:04 +0100
  • 5db0274fc3 add default config for new server options ansuz 2018-01-29 15:48:53 +0100
  • 8294686f80 Fix assert translations for deprecated keys yflory 2018-01-29 15:37:23 +0100
  • 8a1c04ff58 Missing french translation keys yflory 2018-01-29 15:33:34 +0100
  • 1fd4f43c7c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-29 15:18:40 +0100
  • bdafc101c9 Ability to remove owned channels from the drive yflory 2018-01-29 15:17:53 +0100
  • 1c39e8b1bb Fix worker app yflory 2018-01-29 15:17:20 +0100
  • 66f1b55d9a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2018-01-29 14:26:42 +0100
  • 8e2c9ebfa3 lint compliance or something ansuz 2018-01-29 14:26:24 +0100
  • b6e91c772e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-29 12:45:44 +0100
  • a1d9f44bbd Delete owned pads from server when removed from the owner's drive yflory 2018-01-29 12:45:38 +0100
  • f134f11b73 new getDeletedPads rpc ansuz 2018-01-29 12:40:09 +0100
  • 5089f1206d Pad creation screen translations and link to settings yflory 2018-01-29 10:38:00 +0100
  • 74deb60f0f Fix issues with the new context menu in drive yflory 2018-01-26 16:34:36 +0100
  • 003b672d31 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-26 15:44:58 +0100
  • 36550b781f Don't check for stronger hash if we have an edit hash yflory 2018-01-26 15:44:34 +0100
  • 0747cd0563 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2018-01-26 15:24:21 +0100
  • b4b51ed86a add a subsystem for scheduling tasks ansuz 2018-01-26 15:24:07 +0100
  • 462c229b17 Add links to features table yflory 2018-01-26 12:52:25 +0100
  • 86144eda22 Display a message about pads deleted from the server yflory 2018-01-26 12:26:58 +0100
  • 7f21b8a566 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-25 17:54:34 +0100
  • 9a317018e2 Remove deleted pads from the drive yflory 2018-01-25 17:54:21 +0100
  • 89ab37f1bf
    Merge pull request #222 from kpcyrd/docker-fix ansuz 2018-01-25 14:56:03 +0100
  • e50b99d5f7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-25 14:21:08 +0100
  • 3d3f58b3fc Improve share modal customization to make it work with async functions yflory 2018-01-25 14:20:55 +0100
  • d2b0c8a5cd Add docker build to travis tests kpcyrd 2018-01-23 10:47:20 +0100
  • 8dd1c97d6c Fix docker build kpcyrd 2018-01-23 10:28:58 +0100
  • 1817a7924f don't require heapdump by default ansuz 2018-01-25 12:17:35 +0100
  • fd4ed3ce3b Fix subscription button in settings yflory 2018-01-25 12:10:46 +0100
  • 548a32090e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-25 12:09:36 +0100
  • 4d0312115a Add a link to the account server for subscribers in settings yflory 2018-01-25 12:09:20 +0100
  • 0c55c3e91b Enable onLocal yflory 2018-01-25 11:32:20 +0100
  • 5827905dbd Import OnlyOffice code from the 'onlyoffice' branch and sframe it yflory 2018-01-25 11:06:58 +0100
  • 2b8414ca78 provide hints for running CryptPad ansuz 2018-01-24 16:16:46 +0100
  • 80cd3e208a lint compliance ansuz 2018-01-24 11:35:05 +0100
  • a5b7b0191f correct validation for 'channelName' ansuz 2018-01-24 11:31:34 +0100
  • 4e8335bfdd fix support for custom button classes ansuz 2018-01-24 11:01:15 +0100
  • c50b8dd3e9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-23 19:03:45 +0100
  • 166a9e71cf Add a features comparison page yflory 2018-01-23 19:03:31 +0100
  • a3a739e504 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2018-01-23 18:54:57 +0100
  • b63d1527a0 Small bit of better logging Caleb James DeLisle 2018-01-23 18:54:52 +0100
  • 2995782079 Different colors for ok and cancel in alertify yflory 2018-01-23 17:02:32 +0100
  • 8d87a66284 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2018-01-23 16:42:08 +0100
  • acd5574008 send httpUnsafeOrigin via /api/config ansuz 2018-01-23 16:41:54 +0100
  • 4de6bd6195 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2018-01-23 16:32:05 +0100
  • 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 +0100
  • 35d65e248f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-23 15:57:17 +0100
  • 8628f2831e Fix 404 page inside iframe yflory 2018-01-23 15:53:00 +0100
  • 044384a576 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2018-01-23 15:51:37 +0100
  • 30c6ab4717 Add meta description tag yflory 2018-01-23 15:17:06 +0100
  • 492fcf0bb6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-23 14:36:20 +0100
  • 69c33e2f83 Ability to disable profile yflory 2018-01-23 14:24:40 +0100
  • 1f34e47cbf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2018-01-23 14:15:44 +0100
  • b3a873bbc9 Fix flow Caleb James DeLisle 2018-01-23 14:15:38 +0100
  • a34e227d37 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-23 13:48:38 +0100
  • 51587d1006 Ability to disable feedback on the entire instance yflory 2018-01-23 13:47:30 +0100
  • 88f3e730b9 Update package.json and sync file.js Caleb James DeLisle 2018-01-23 12:18:08 +0100
  • 006d99e19a Fix undefined friends yflory 2018-01-23 12:09:54 +0100
  • af2bde27c6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-22 16:56:55 +0100
  • c90ba890ca Add more configurable options and add a new way to use custom config yflory 2018-01-22 16:56:37 +0100
  • ffa392a7e2
    Merge pull request #221 from ryanpcmcquen/patch-1 ansuz 2018-01-22 10:44:33 +0100
  • a790dd0398 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-19 17:04:08 +0100
  • 2e436f16c9 Refactor context menu in drive yflory 2018-01-19 17:03:58 +0100
  • 3c1779a667 give function a more sensible name ansuz 2018-01-19 10:27:16 +0100
  • 5114292b43 implement 'removeOwnedChannel' rpc and... ansuz 2018-01-19 10:26:21 +0100
  • 544a26f6b3 fix a typo ansuz 2018-01-19 10:25:29 +0100
  • ff4a49d59b
    Fix Org mode regex. Ryan P.C. McQuen 2018-01-18 08:32:37 -0800
  • 4bea1aa2df Display default avatars in IE yflory 2018-01-18 15:25:45 +0100
  • adf7e14891 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-18 15:04:17 +0100
  • bc9a88fbe9 Add support for org-mode in th code app yflory 2018-01-18 15:04:06 +0100
  • b08c1d94a1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2018-01-18 12:20:10 +0100
  • 02dbe9e458 enforce maxUploadSize ansuz 2018-01-18 12:19:58 +0100
  • 6a906e3770 Fix share modal extension point yflory 2018-01-18 11:16:30 +0100
  • caf9797c7c add customize/ to jshintignore yflory 2018-01-18 11:16:10 +0100
  • e791add4ec Remove + icons from folders in the trash yflory 2018-01-18 11:06:47 +0100
  • 51b4d269be Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-18 10:54:08 +0100
  • 6e086ee779 Add shortcuts in the share modal yflory 2018-01-18 10:53:36 +0100
  • fc8847dae4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2018-01-18 10:32:27 +0100
  • 04b862352f update style for usage bar ansuz 2018-01-18 10:31:56 +0100
  • 08ae327386 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-17 18:40:09 +0100