Commit Graph

4581 Commits (f9b37e253c5696bcb34fa8465b7e322614daa077)

Author SHA1 Message Date
ansuz f9b37e253c Merge branch 'keywords' of github.com:xwiki-labs/cryptpad into keywords 2018-02-01 11:43:39 +01:00
ansuz a281869bba make things actually work 2018-02-01 11:43:29 +01:00
yflory 83eb304716 lint compliance 2018-02-01 11:16:34 +01:00
ansuz 0672c2f41a implement a running diff 2018-02-01 11:09:24 +01:00
yflory 970122b41d Send the channel id to the text analyzer 2018-02-01 11:08:04 +01:00
yflory 80df45f257 Get text from ckeditor 2018-02-01 10:09:08 +01:00
yflory fb192a2c45 Add a configurable background color in the file app in view mode 2018-01-31 14:42:34 +01:00
yflory 91e42f1518 Fix the bug introduced in the share modal fix 2018-01-31 12:11:10 +01:00
yflory 0b1795e5a1 Fix an issue preventing the share modal to be used more than once 2018-01-31 12:08:55 +01:00
yflory f6926699bc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-29 19:04:14 +01:00
yflory ad2cde4705 Add warning about anonymous drive in localStorage 2018-01-29 19:04:00 +01:00
yflory e80e8339c2 Typo in translation 2018-01-29 16:16:50 +01:00
ansuz de838a3184 fix usage bar styles 2018-01-29 16:12:35 +01:00
ansuz e6ce06184a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-29 15:49:04 +01:00
ansuz 5db0274fc3 add default config for new server options 2018-01-29 15:48:53 +01:00
yflory 8294686f80 Fix assert translations for deprecated keys 2018-01-29 15:37:23 +01:00
yflory 8a1c04ff58 Missing french translation keys 2018-01-29 15:33:34 +01:00
yflory 1fd4f43c7c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-29 15:18:40 +01:00
yflory bdafc101c9 Ability to remove owned channels from the drive 2018-01-29 15:17:53 +01:00
yflory 1c39e8b1bb Fix worker app 2018-01-29 15:17:20 +01:00
ansuz 66f1b55d9a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-29 14:26:42 +01:00
ansuz 8e2c9ebfa3 lint compliance or something 2018-01-29 14:26:24 +01:00
yflory b6e91c772e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-29 12:45:44 +01:00
yflory a1d9f44bbd Delete owned pads from server when removed from the owner's drive 2018-01-29 12:45:38 +01:00
ansuz f134f11b73 new getDeletedPads rpc 2018-01-29 12:40:09 +01:00
yflory 5089f1206d Pad creation screen translations and link to settings 2018-01-29 10:38:00 +01:00
yflory 74deb60f0f Fix issues with the new context menu in drive 2018-01-26 16:34:36 +01:00
yflory 003b672d31 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-26 15:44:58 +01:00
yflory 36550b781f Don't check for stronger hash if we have an edit hash 2018-01-26 15:44:38 +01:00
ansuz 0747cd0563 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-26 15:24:21 +01:00
ansuz b4b51ed86a add a subsystem for scheduling tasks 2018-01-26 15:24:07 +01:00
yflory 462c229b17 Add links to features table 2018-01-26 12:52:25 +01:00
yflory 86144eda22 Display a message about pads deleted from the server 2018-01-26 12:26:58 +01:00
yflory 7f21b8a566 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-25 17:54:34 +01:00
yflory 9a317018e2 Remove deleted pads from the drive 2018-01-25 17:54:21 +01:00
ansuz 89ab37f1bf
Merge pull request #222 from kpcyrd/docker-fix
Fix docker build
2018-01-25 14:56:03 +01:00
yflory e50b99d5f7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-25 14:21:08 +01:00
yflory 3d3f58b3fc Improve share modal customization to make it work with async functions 2018-01-25 14:20:55 +01:00
kpcyrd d2b0c8a5cd Add docker build to travis tests 2018-01-25 14:04:55 +01:00
kpcyrd 8dd1c97d6c Fix docker build 2018-01-25 14:04:55 +01:00
ansuz 1817a7924f don't require heapdump by default 2018-01-25 12:17:35 +01:00
yflory fd4ed3ce3b Fix subscription button in settings 2018-01-25 12:14:46 +01:00
yflory 548a32090e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-25 12:09:36 +01:00
yflory 4d0312115a Add a link to the account server for subscribers in settings 2018-01-25 12:09:20 +01:00
ansuz 2b8414ca78 provide hints for running CryptPad 2018-01-24 16:16:46 +01:00
ansuz 80cd3e208a lint compliance 2018-01-24 11:35:05 +01:00
ansuz a5b7b0191f correct validation for 'channelName' 2018-01-24 11:31:34 +01:00
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