Commit graph

108 commits

Author SHA1 Message Date
Caleb James DeLisle
e04c0b89a1 manual merge of staging 2017-08-17 12:14:19 +02:00
Caleb James DeLisle
723151254c remove a debug line before release which killed CSP 2017-08-14 16:23:56 +02:00
Caleb James DeLisle
65dfd99171 major wip 2017-08-07 16:27:57 +02:00
Caleb James DeLisle
8404017af1 wip 2017-07-22 16:43:53 +02:00
ansuz
e4dccd7ea8 cache blobs for a year unless you're in dev mode 2017-06-19 11:29:13 +02:00
Caleb James DeLisle
7bee2ba27d Add a semicolon at the end of the CSP if none exists. 2017-06-15 14:45:01 +02:00
ansuz
e631818268 format probable server URL when printing to the console at launch 2017-06-14 10:27:29 +02:00
Caleb James DeLisle
aa9aaefdea Add frame-ancestors to allow remote auth 2017-06-07 09:51:10 +02:00
ansuz
605377cf31 update default configuration file with new attributes and comments 2017-05-30 15:35:51 +02:00
Caleb James DeLisle
66520b6041 cleaned up the accounts, limits and revenue sharing and unified the config in one place 2017-05-26 18:09:31 +02:00
ansuz
1378a0c1f6 serve blobs from configured location 2017-05-19 17:01:09 +02:00
yflory
d985b144cc Add a new hash version for the file viewer 2017-04-25 17:19:13 +02:00
ansuz
fd067510fe support logging feedback api via config.js 2017-04-18 15:51:42 +02:00
yflory
7c9adfbcb6 Replace the websocket server by the one in the chainpad-server repo 2017-03-16 15:57:13 +01:00
ansuz
612a00b484 implement serverside RPC infrastructure 2017-03-10 18:03:15 +01:00
ansuz
efdd999161 implement dev mode which busts cache all the time 2017-03-06 17:25:02 +01:00
Caleb James DeLisle
91eda5fa83 Implement stronger content-security-policy except in /pad/ which does not allow it.
Implement a "loader" which allows for applying a version number to everything.
Added a cache control for anything which has a version.
2017-03-01 21:06:53 +01:00
yflory
29578a7400 Merge branch 'hpbs' into newtoolbar 2017-01-30 14:45:02 +01:00
yflory
4aacd291b1 New config option to use an external websocket server 2017-01-27 16:45:41 +01:00
yflory
8ccd845d52 Merge branch 'newtoolbar' into hpbs 2017-01-24 12:54:32 +01:00
yflory
6652e9d6d9 Test new home page 2017-01-16 18:29:34 +01:00
ansuz
33b8de888e clean up unused files 2017-01-11 07:49:56 +01:00
ansuz
4cda1aeb2f add docker and docker-compose
thanks @felixboehm
2017-01-10 10:36:12 +01:00
felixboehm
7c0df5aed9 use wss if useSecureWebsockets is true
There are no certs / httpOtps set if proxy doing ssl offloading.
Better use useSecureWebsockets from config file.
2017-01-02 11:54:50 +01:00
ansuz
32d7fc55d2 make it easier to add pages at the document root 2016-12-28 17:11:06 +01:00
ansuz
2f9283a677 fix leaky global variable 2016-10-18 11:51:35 +02:00
ansuz
a2e5c96115 make http headers configurable, update default conf 2016-10-18 11:48:29 +02:00
ansuz
0fe62f8c75 make wss CSP headers configurable again 2016-10-12 13:03:36 +02:00
Caleb James DeLisle
72fc2e7068 Chuck a few more super-duper-security headers in there 2016-10-06 23:02:30 +02:00
Caleb James DeLisle
f8ac3a6ad3 Fix merge error 2016-10-06 22:48:30 +02:00
Caleb James DeLisle
83c3f6310a Don't make the codestyle any worse than it is 2016-10-06 22:44:58 +02:00
Caleb James DeLisle
12cdd1e76b Add a Content Security Policy which works for CryptPad 2016-10-06 22:37:25 +02:00
ansuz
3dfa19b786 more flexible websocket configuration (WIP) 2016-10-03 19:19:38 +02:00
ansuz
4b238de84c quieter stdout and stderr logs 2016-09-30 15:51:23 +02:00
Csaba Okrona
c82abd8780 reverting the style changes 2016-09-27 12:17:38 +02:00
Csaba Okrona
08064ae035 Using express.static instead of custom handler 2016-09-27 11:53:52 +02:00
ansuz
eb797aa7cd Support files other than index.html at server root 2016-08-16 17:28:49 +02:00
ansuz
e73d93031c use an absolutely specific regex for the document root 2016-07-12 12:44:44 +02:00
ansuz
ad370d9216 implement more seamless customization (with fallbacks) 2016-07-12 12:17:03 +02:00
ansuz
ba3e120fbf remove everything related to jquery sheet since we're not using it 2016-06-03 13:12:40 +02:00
ansuz
d59824929d pass config object into NetfluxServer 2016-05-14 12:52:34 +02:00
ansuz
b09b73fcc6 remove chainpad server 2016-04-27 14:09:01 +02:00
Yann Flory
692fe24b32 Ability to use the old Chainpad server in parallel of the netflux server 2016-04-11 14:27:58 +02:00
Yann Flory
ba4faea939 Update the pads to run with the latest improvements to the websocket server 2016-04-05 12:17:43 +02:00
Yann Flory
c7d190f1c0 Improve the server so that both protocol (WebSocket and WebRTC) can use the same port 2016-03-16 16:34:27 +01:00
Yann Flory
ae8f6f7f2c Ability to choose which protocol to use (Websocket or WebRTC) with Netflux 2016-03-10 14:03:31 +01:00
Yann Flory
870b2dbb7e Add the WebRTC server in Cryptpad 2016-03-08 11:45:03 +01:00
Yann Flory
09a06a8bc5 Replace the chainpad server by the netflux server 2016-03-07 17:35:31 +01:00
ansuz
278c4ab32f even more jshint compliance 2016-02-15 16:47:53 +01:00
ansuz
967d636df9 address more jshint complaints 2016-02-12 11:39:37 +01:00
ansuz
3928c89d35 relocate and rename Storage.js. implement a simple, non-persistent in memory datastore for those who'd rather not bother with mongodb. Continue to default to previous values. 2015-10-25 19:35:25 -04:00
Caleb James DeLisle
51544db9a2 Completed adding of customization system and bottom infobar 2015-02-02 16:01:33 +01:00
Caleb James DeLisle
84164123b6 not quite finished 2015-01-30 18:12:20 +01:00
Caleb James DeLisle
50c10f818e Added cryptsheet to cryptpad suite! 2015-01-29 17:55:18 +01:00
Caleb James DeLisle
6687a1d5dc added ability to use https 2014-12-04 10:53:47 +01:00
Caleb James DeLisle
5ae599fa07 support different ports for websocket and http 2014-11-03 11:13:41 +01:00
kpcyrd
8d7c85f287 Move config from server.js into config.js.dist 2014-10-31 17:48:17 +01:00
Caleb James DeLisle
1508c7ba71 and so it begins 2014-10-31 16:42:58 +01:00