Commit graph

112 commits

Author SHA1 Message Date
ansuz
7665720d77 integrate task execution into the server directly 2019-04-23 13:28:05 +02:00
yflory
e0665cb190 Use the new logging API for the history keeper 2019-04-17 15:28:29 +02:00
ansuz
d5a9eacef0 standardize loading of server configuration 2019-04-17 13:48:39 +02:00
ansuz
4e9273f35c improved logger behaviour and updated default configuration 2019-04-09 11:40:51 +02:00
ansuz
78749456d6 more notes for later 2019-04-08 18:39:45 +02:00
ansuz
e1e6d51038 new logging api 2019-04-08 18:11:36 +02:00
ansuz
dd6767e267 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-04-01 16:35:58 +02:00
yflory
f9fc154979 Add mastodon and display admin email in the contact page 2019-04-01 14:39:32 +02:00
ansuz
4566bf4ed8 drop support for various serverside config points 2019-04-01 12:09:11 +02:00
yflory
f24d34c0af History keeper is now separated from chainpad-server 2019-03-29 17:03:53 +01:00
ansuz
744f212b26 keep config.js in config/
and persist it via various docker mechanisms
2019-03-28 17:35:30 +01:00
ansuz
8aeb6246d8 expose admin email via /api/config 2019-03-28 17:18:04 +01:00
ansuz
322ceb7ea1 process admin keys at startup, instead of on demand 2019-03-28 17:17:40 +01:00
yflory
7d4589bdb0 Send valid admin keys to the clients 2019-03-27 18:12:34 +01:00
yflory
bb5f03bd0f Add admin panel 2019-03-27 17:00:28 +01:00
yflory
9ceebb603d Reorder config file 2019-02-28 17:08:19 +01:00
yflory
0e61c46dcf Move fonts to the onlyoffice build 2019-01-28 17:06:17 +01:00
ansuz
1281c9b2be remove some dead serverside code 2019-01-28 15:28:38 +01:00
yflory
d5f98c916b Update CSP for OnlyOffice apps 2019-01-28 12:18:18 +01:00
ansuz
9d0e0a4efa log font path to make sure it's working 2019-01-24 18:42:29 +01:00
ansuz
802075f83c log errors when trying to serve fonts 2019-01-24 18:41:14 +01:00
ansuz
f775d395f4 serve cached onlyoffice-compatible fonts 2019-01-24 18:40:12 +01:00
yflory
dbe8571a40 Removing console.log in the server about onlyoffice fonts 2019-01-24 16:23:07 +01:00
yflory
29f8cfbfe0 Remove sockjs dependency and ooserver code 2019-01-21 10:44:39 +01:00
yflory
1e672c4a6b Use onlyoffice spreadsheets without ooserver 2019-01-07 12:02:38 +01:00
yflory
760f58b74c Merge branch 'staging' into oo2 2018-12-13 16:24:11 +01:00
ansuz
26540b4b94 correctly support httpSafeOrigin loaded from configuration file 2018-10-17 13:48:31 +02:00
yflory
874156ccf0 Prevent shared folders from being moved to the trash using the del key 2018-09-17 17:53:18 +02:00
yflory
bd1b120ab1 Add feedback about crowdfunding 2018-09-17 16:02:52 +02:00
yflory
bf9cf95292 Merge branch 'staging' into oo2 2018-09-03 10:49:12 +02:00
yflory
846755b0a7 Increase requirejs timeout (thanks Firefox...) 2018-07-02 14:02:05 +02:00
ansuz
7aa7b82c60 merge staging 2018-06-28 13:33:54 +02:00
ansuz
02169bfa83 Revert "Use socket.io instead of WebSocket"
In hindsight this may have been a terrible idea.

RIP uptime.

This reverts commit 9195c57445.
2018-06-26 15:30:40 +02:00
ansuz
a037f46b62 Merge branch 'staging' into modern-users 2018-06-22 10:28:11 +02:00
ansuz
9d3d8c3ba2 initial implementation of serverside password change RPCs 2018-06-19 11:31:15 +02:00
yflory
9195c57445 Use socket.io instead of WebSocket 2018-06-04 14:59:37 +02:00
Caleb James DeLisle
2897a14869 Expose the datastore as an http endpoint 2018-04-13 17:49:17 +02:00
ansuz
bc35c3349f set content-type headers for the 404 page 2018-04-12 17:24:51 +02:00
ansuz
5b84bc1a25 simplify server 2018-02-28 18:15:01 +01:00
yflory
db71fe5bf8 Rename font files 2018-02-20 15:23:24 +01:00
yflory
7cb3282634 New apps for text, slide and spreadsheet 2018-02-19 18:52:57 +01:00
yflory
5c1e5a3f49 Merge branch 'staging' into oo 2018-02-19 12:11:06 +01:00
Nicolas Parquet
3b46578621 Fix main pages customization
Co-authored-by: fvn-linagora <fvignon@linagora.com>
2018-02-09 16:17:40 +01:00
Caleb James DeLisle
e78cc4ce7e manual merge 2018-02-06 11:41:57 +01:00
Caleb James DeLisle
cac5e75a99 Add a repl to improve debugging on the prod server 2018-02-06 11:35:24 +01:00
ansuz
b4b51ed86a add a subsystem for scheduling tasks 2018-01-26 15:24:07 +01:00
yflory
5827905dbd Import OnlyOffice code from the 'onlyoffice' branch and sframe it 2018-01-25 11:06:58 +01:00
ansuz
acd5574008 send httpUnsafeOrigin via /api/config 2018-01-23 16:41:54 +01:00
ansuz
5f0a865028 implement 'FRESH MODE' 2017-12-11 11:13:06 +01:00
Caleb James DeLisle
ba74f9d37a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-05 18:32:29 +01:00