Commit Graph

  • c1a609e1d3 Merge branch 'soon' ansuz 2018-02-16 18:04:52 +01:00
  • c10e50b5bb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-02-16 18:04:27 +01:00
  • 16447e0313 Stop expiration code if no directories for tasks yflory 2018-02-16 17:28:22 +01:00
  • 7cf8bdb841 Merge branch 'soon' ansuz 2018-02-16 17:08:38 +01:00
  • 91437c558e fix weird messages ansuz 2018-02-16 17:06:11 +01:00
  • 4426631793 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2018-02-16 16:13:17 +01:00
  • 11fabea327 update footer and package.json version ansuz 2018-02-16 16:13:01 +01:00
  • 649fefad54 Send cookie when history keeper has changed yflory 2018-02-16 15:25:53 +01:00
  • 2ac9c3ba66 Report RPC errors when deleting owned pads yflory 2018-02-16 12:33:33 +01:00
  • 037a6ccc35 Fix INVALID_RESPONSE error in the file app yflory 2018-02-16 12:02:20 +01:00
  • 54a91f1153 Ability to reorder and edit tasks yflory 2018-02-15 15:38:39 +01:00
  • 70e014cdfc Hide infinite spinner and disconnect modals when pad is deleted yflory 2018-02-15 11:34:44 +01:00
  • ef0c08130d Stop the process when expire-channels is done yflory 2018-02-15 11:33:31 +01:00
  • f004c4d701 lint compliance yflory 2018-02-14 19:42:00 +01:00
  • e83e589cf0 Kick from pad when an owned channel is deleted + whiteboard and poll yflory 2018-02-14 19:41:07 +01:00
  • be0842c66d add license to package.json Sven Neuhaus 2018-02-14 15:47:17 +01:00
  • 728a6a868d Manage expired channels yflory 2018-02-13 18:20:13 +01:00
  • 8f7489576f Merge pull request #228 from fvn-linagora/PR-logout-page ansuz 2018-02-12 16:33:07 +01:00
  • ac527c6411 add a logout page Fabien Vignon 2018-02-09 11:57:45 +01:00
  • 99b509b229 Merge pull request #227 from nparquet/fix-mainpages ansuz 2018-02-12 10:36:25 +01:00
  • 3b46578621 Fix main pages customization Nicolas Parquet 2018-02-09 16:17:40 +01:00
  • 223ed73ae1 French translation for the pad creation screen yflory 2018-02-09 15:47:52 +01:00
  • 3bb6d5a83c Remove full history timeout yflory 2018-02-09 15:47:29 +01:00
  • 0b022af5db Fix style issues in IE and mobiles yflory 2018-02-09 15:45:47 +01:00
  • ea7a3c75fa Fix hidden content in the pad creation screen with smaller screen or zoom yflory 2018-02-08 14:06:40 +01:00
  • 81ea3b14d7 Fix usage bar position in the settings app yflory 2018-02-08 12:28:53 +01:00
  • c9243b7b46 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-02-08 12:24:49 +01:00
  • f18917f0ac Fix race condition at registration yflory 2018-02-08 12:24:34 +01:00
  • b5bb83b700 lint compliance yflory 2018-02-08 12:24:19 +01:00
  • 1191c14a29 lint compliance ansuz 2018-02-08 11:11:51 +01:00
  • f8399eaaa6 avoid concatenating 'undefined' in drive interface ansuz 2018-02-08 11:08:10 +01:00
  • c210f097c0 Refactor login part two yflory 2018-02-07 17:14:15 +01:00
  • ff151869de Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-02-07 13:08:12 +01:00
  • 7ebfa43408 Improve assert translations to detect issues in objects (tips, type, etc.) yflory 2018-02-07 13:08:03 +01:00
  • d676a5e7db Merge branch 'staging' of github.com:xwiki-labs/cryptpad into keywords ansuz 2018-02-07 11:14:19 +01:00
  • bee5494abb add some sanity checks to the todo app ansuz 2018-02-07 11:07:45 +01:00
  • a0ff3370a2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2018-02-07 10:27:24 +01:00
  • 66f38fa476 WIP file expiration script ansuz 2018-02-07 10:27:16 +01:00
  • 218b1fb328 set messages.el.js to non-executable ansuz 2018-02-07 10:24:40 +01:00
  • a1f05e4bf1 update pad creation screen text ansuz 2018-02-07 10:24:04 +01:00
  • 5bba9b6c39 Refactor login to remove duplicate code yflory 2018-02-06 18:45:12 +01:00
  • c2e9c60756 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-02-06 17:36:44 +01:00
  • 4df4c48fbd Improve UI for pad creation screen yflory 2018-02-06 17:36:37 +01:00
  • e78cc4ce7e manual merge Caleb James DeLisle 2018-02-06 11:41:57 +01:00
  • cac5e75a99 Add a repl to improve debugging on the prod server Caleb James DeLisle 2018-02-06 11:35:24 +01:00
  • 8213d0d926 guard against null pointer exception ansuz 2018-02-05 15:24:30 +01:00
  • f9b37e253c Merge branch 'keywords' of github.com:xwiki-labs/cryptpad into keywords ansuz 2018-02-01 11:43:39 +01:00
  • a281869bba make things actually work ansuz 2018-02-01 11:43:29 +01:00
  • 83eb304716 lint compliance yflory 2018-02-01 11:16:34 +01:00
  • 0672c2f41a implement a running diff ansuz 2018-02-01 11:09:24 +01:00
  • 970122b41d Send the channel id to the text analyzer yflory 2018-02-01 11:08:04 +01:00
  • 80df45f257 Get text from ckeditor yflory 2018-02-01 10:09:08 +01:00
  • 336d717c67 fix text ansuz 2018-01-31 15:29:57 +01:00
  • fb192a2c45 Add a configurable background color in the file app in view mode yflory 2018-01-31 14:42:34 +01:00
  • 91e42f1518 Fix the bug introduced in the share modal fix yflory 2018-01-31 12:11:10 +01:00
  • 0b1795e5a1 Fix an issue preventing the share modal to be used more than once yflory 2018-01-31 12:08:55 +01:00
  • f6926699bc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-29 19:04:14 +01:00
  • ad2cde4705 Add warning about anonymous drive in localStorage yflory 2018-01-29 19:04:00 +01:00
  • e80e8339c2 Typo in translation yflory 2018-01-29 16:16:42 +01:00
  • de838a3184 fix usage bar styles ansuz 2018-01-29 16:12:35 +01:00
  • e6ce06184a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2018-01-29 15:49:04 +01:00
  • 5db0274fc3 add default config for new server options ansuz 2018-01-29 15:48:53 +01:00
  • 8294686f80 Fix assert translations for deprecated keys yflory 2018-01-29 15:37:23 +01:00
  • 8a1c04ff58 Missing french translation keys yflory 2018-01-29 15:33:34 +01:00
  • 1fd4f43c7c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-29 15:18:40 +01:00
  • bdafc101c9 Ability to remove owned channels from the drive yflory 2018-01-29 15:17:53 +01:00
  • 1c39e8b1bb Fix worker app yflory 2018-01-29 15:17:20 +01:00
  • 66f1b55d9a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2018-01-29 14:26:42 +01:00
  • 8e2c9ebfa3 lint compliance or something ansuz 2018-01-29 14:26:24 +01:00
  • b6e91c772e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-29 12:45:44 +01:00
  • a1d9f44bbd Delete owned pads from server when removed from the owner's drive yflory 2018-01-29 12:45:38 +01:00
  • f134f11b73 new getDeletedPads rpc ansuz 2018-01-29 12:40:09 +01:00
  • 5089f1206d Pad creation screen translations and link to settings yflory 2018-01-29 10:38:00 +01:00
  • 74deb60f0f Fix issues with the new context menu in drive yflory 2018-01-26 16:34:36 +01:00
  • 003b672d31 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-26 15:44:58 +01:00
  • 36550b781f Don't check for stronger hash if we have an edit hash yflory 2018-01-26 15:44:34 +01:00
  • 0747cd0563 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2018-01-26 15:24:21 +01:00
  • b4b51ed86a add a subsystem for scheduling tasks ansuz 2018-01-26 15:24:07 +01:00
  • 462c229b17 Add links to features table yflory 2018-01-26 12:52:25 +01:00
  • 86144eda22 Display a message about pads deleted from the server yflory 2018-01-26 12:26:58 +01:00
  • 7f21b8a566 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-25 17:54:34 +01:00
  • 9a317018e2 Remove deleted pads from the drive yflory 2018-01-25 17:54:21 +01:00
  • 89ab37f1bf Merge pull request #222 from kpcyrd/docker-fix ansuz 2018-01-25 14:56:03 +01:00
  • e50b99d5f7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-25 14:21:08 +01:00
  • 3d3f58b3fc Improve share modal customization to make it work with async functions yflory 2018-01-25 14:20:55 +01:00
  • d2b0c8a5cd Add docker build to travis tests kpcyrd 2018-01-23 10:47:20 +01:00
  • 8dd1c97d6c Fix docker build kpcyrd 2018-01-23 10:28:58 +01:00
  • 1817a7924f don't require heapdump by default ansuz 2018-01-25 12:17:35 +01:00
  • fd4ed3ce3b Fix subscription button in settings yflory 2018-01-25 12:10:46 +01:00
  • 548a32090e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-25 12:09:36 +01:00
  • 4d0312115a Add a link to the account server for subscribers in settings yflory 2018-01-25 12:09:20 +01:00
  • 0c55c3e91b Enable onLocal yflory 2018-01-25 11:32:20 +01:00
  • 5827905dbd Import OnlyOffice code from the 'onlyoffice' branch and sframe it yflory 2018-01-25 11:06:58 +01:00
  • 2b8414ca78 provide hints for running CryptPad ansuz 2018-01-24 16:16:46 +01:00
  • 80cd3e208a lint compliance ansuz 2018-01-24 11:35:05 +01:00
  • a5b7b0191f correct validation for 'channelName' ansuz 2018-01-24 11:31:34 +01:00
  • 4e8335bfdd fix support for custom button classes ansuz 2018-01-24 11:01:15 +01:00
  • c50b8dd3e9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2018-01-23 19:03:45 +01:00
  • 166a9e71cf Add a features comparison page yflory 2018-01-23 19:03:31 +01:00
  • a3a739e504 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2018-01-23 18:54:57 +01:00