Commit Graph

6722 Commits (4680a247912bd5ff9667b9c571be220834d7fff3)

Author SHA1 Message Date
yflory f0bc1cfe99 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-02-27 17:39:27 +01:00
yflory 60b2384885 Move initial state into a help block 2018-02-27 17:38:29 +01:00
ansuz 66d83dc045 update version 2018-02-27 15:13:39 +01:00
yflory 5c53868c3b Delete pads after 3 months of inactivity 2018-02-26 18:34:05 +01:00
ansuz 50adcc791c
Merge pull request #231 from sairim/patch-1
Update readme.md
2018-02-26 13:56:51 +01:00
yflory 329fd61bb1 Remove lag when creating a pad from the pad creation screen 2018-02-26 10:49:35 +01:00
yflory 22f130d948 Remove lag when displaying loading screen in login and register 2018-02-26 10:41:37 +01:00
sairim 9b94c9b762
Update readme.md
include a link to Docker wiki page under the 'Setup using Docker' section
2018-02-25 16:54:49 +02:00
yflory a697ad9762 Merge branch 'soon' 2018-02-22 17:05:58 +01:00
yflory 599afa4fc5 Merge branch 'soon' into staging 2018-02-22 15:57:08 +01:00
yflory 61dbf94f2d Fix pad attributes not working for readonly pads if you know the edit hash 2018-02-22 15:56:23 +01:00
ansuz 5cc1b3c779
Merge pull request #229 from neuhaus/patch-1
add license to package.json
2018-02-22 14:11:31 +01:00
ansuz 7cc4cca846
Merge branch 'master' into patch-1 2018-02-22 14:05:13 +01:00
Sven Neuhaus d2b3e078d5
updated version to resolve conflict 2018-02-22 13:05:00 +01:00
Sven Neuhaus c409cac280
changed to AGPL-3.0-or-later 2018-02-22 13:03:53 +01:00
yflory 8c42125ea0 Merge branch 'soon' 2018-02-22 12:44:28 +01:00
yflory 7ff9bbe2b0 Fix share modal with new pads 2018-02-22 12:43:16 +01:00
yflory a0ec51dde5 Fix share modal with new pads 2018-02-22 12:43:06 +01:00
yflory 480b499d7b Hack to remove onbeforeunload popup 2018-02-22 10:16:33 +01:00
yflory 7ede2e1a07 Fix cursor position when editing a task in todo 2018-02-20 18:43:25 +01:00
yflory c34161a988 Update oocell config 2018-02-20 18:36:00 +01:00
yflory acf09c807d Fix fonts 2018-02-20 16:09:49 +01:00
yflory 9ba912d953 Clean onlyoffice files 2018-02-20 15:47:07 +01:00
yflory db71fe5bf8 Rename font files 2018-02-20 15:23:24 +01:00
yflory d53ea25111 Merge branch 'soon' 2018-02-20 14:42:32 +01:00
yflory 5f50bedce2 Fix empty properties for readonly pads 2018-02-20 14:42:11 +01:00
yflory 15a8196037 Enable pad creation screen 2018-02-20 10:39:02 +01:00
yflory 70670f9732 Merge branch 'soon' 2018-02-20 10:24:03 +01:00
yflory 2eef1e96e6 Remove invalid error reports 2018-02-20 10:21:15 +01:00
yflory 75cb373136 Merge branch 'oo' of github.com:xwiki-labs/cryptpad into oo 2018-02-19 18:54:28 +01:00
yflory 7cb3282634 New apps for text, slide and spreadsheet 2018-02-19 18:52:57 +01:00
yflory 50ef40a862 Merge branch 'soon' into staging 2018-02-19 14:08:12 +01:00
yflory 766fa72841 Fix initial value of the preview link in the share modal 2018-02-19 14:07:21 +01:00
yflory 831c23b259 Merge branch 'staging' into oo 2018-02-19 12:11:58 +01:00
yflory 5d584625e4 FAQ pages 2018-02-19 12:11:45 +01:00
yflory 5c1e5a3f49 Merge branch 'staging' into oo 2018-02-19 12:11:06 +01:00
yflory 299a2f4c08 FAQ placeholder 2018-02-19 12:09:57 +01:00
yflory 1b7b53a164 Merge branch 'soon' 2018-02-19 11:39:55 +01:00
yflory 5dbc99343a Improve 'rename' input in the drive 2018-02-19 11:38:57 +01:00
yflory b04e3def64 Fix invalid translation key 2018-02-19 11:26:43 +01:00
ansuz c1a609e1d3 Merge branch 'soon' 2018-02-16 18:04:52 +01:00
yflory c10e50b5bb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-02-16 18:04:27 +01:00
yflory 16447e0313 Stop expiration code if no directories for tasks 2018-02-16 17:28:22 +01:00
ansuz 7cf8bdb841 Merge branch 'soon' 2018-02-16 17:08:38 +01:00
ansuz 91437c558e fix weird messages 2018-02-16 17:06:11 +01:00
ansuz 4426631793 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-02-16 16:13:17 +01:00
ansuz 11fabea327 update footer and package.json version 2018-02-16 16:13:01 +01:00
yflory 649fefad54 Send cookie when history keeper has changed 2018-02-16 15:25:53 +01:00
yflory 2ac9c3ba66 Report RPC errors when deleting owned pads 2018-02-16 12:33:33 +01:00
yflory 037a6ccc35 Fix INVALID_RESPONSE error in the file app 2018-02-16 12:02:20 +01:00