ansuz
|
dd6767e267
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
6 years ago |
|
yflory
|
f9fc154979
|
Add mastodon and display admin email in the contact page
|
6 years ago |
|
ansuz
|
4566bf4ed8
|
drop support for various serverside config points
|
6 years ago |
|
yflory
|
f24d34c0af
|
History keeper is now separated from chainpad-server
|
6 years ago |
|
ansuz
|
744f212b26
|
keep config.js in config/
and persist it via various docker mechanisms
|
6 years ago |
|
ansuz
|
8aeb6246d8
|
expose admin email via /api/config
|
6 years ago |
|
ansuz
|
322ceb7ea1
|
process admin keys at startup, instead of on demand
|
6 years ago |
|
yflory
|
7d4589bdb0
|
Send valid admin keys to the clients
|
6 years ago |
|
yflory
|
bb5f03bd0f
|
Add admin panel
|
6 years ago |
|
yflory
|
9ceebb603d
|
Reorder config file
|
6 years ago |
|
yflory
|
0e61c46dcf
|
Move fonts to the onlyoffice build
|
6 years ago |
|
ansuz
|
1281c9b2be
|
remove some dead serverside code
|
6 years ago |
|
yflory
|
d5f98c916b
|
Update CSP for OnlyOffice apps
|
6 years ago |
|
ansuz
|
9d0e0a4efa
|
log font path to make sure it's working
|
6 years ago |
|
ansuz
|
802075f83c
|
log errors when trying to serve fonts
|
6 years ago |
|
ansuz
|
f775d395f4
|
serve cached onlyoffice-compatible fonts
|
6 years ago |
|
yflory
|
dbe8571a40
|
Removing console.log in the server about onlyoffice fonts
|
6 years ago |
|
yflory
|
29f8cfbfe0
|
Remove sockjs dependency and ooserver code
|
6 years ago |
|
yflory
|
1e672c4a6b
|
Use onlyoffice spreadsheets without ooserver
|
6 years ago |
|
yflory
|
760f58b74c
|
Merge branch 'staging' into oo2
|
6 years ago |
|
ansuz
|
26540b4b94
|
correctly support httpSafeOrigin loaded from configuration file
|
6 years ago |
|
yflory
|
874156ccf0
|
Prevent shared folders from being moved to the trash using the del key
|
6 years ago |
|
yflory
|
bd1b120ab1
|
Add feedback about crowdfunding
|
6 years ago |
|
yflory
|
bf9cf95292
|
Merge branch 'staging' into oo2
|
6 years ago |
|
yflory
|
846755b0a7
|
Increase requirejs timeout (thanks Firefox...)
|
7 years ago |
|
ansuz
|
7aa7b82c60
|
merge staging
|
7 years ago |
|
ansuz
|
02169bfa83
|
Revert "Use socket.io instead of WebSocket"
In hindsight this may have been a terrible idea.
RIP uptime.
This reverts commit 9195c57445.
|
7 years ago |
|
ansuz
|
a037f46b62
|
Merge branch 'staging' into modern-users
|
7 years ago |
|
ansuz
|
9d3d8c3ba2
|
initial implementation of serverside password change RPCs
|
7 years ago |
|
yflory
|
9195c57445
|
Use socket.io instead of WebSocket
|
7 years ago |
|
Caleb James DeLisle
|
2897a14869
|
Expose the datastore as an http endpoint
|
7 years ago |
|
ansuz
|
bc35c3349f
|
set content-type headers for the 404 page
|
7 years ago |
|
ansuz
|
5b84bc1a25
|
simplify server
|
7 years ago |
|
yflory
|
db71fe5bf8
|
Rename font files
|
7 years ago |
|
yflory
|
7cb3282634
|
New apps for text, slide and spreadsheet
|
7 years ago |
|
yflory
|
5c1e5a3f49
|
Merge branch 'staging' into oo
|
7 years ago |
|
Nicolas Parquet
|
3b46578621
|
Fix main pages customization
Co-authored-by: fvn-linagora <fvignon@linagora.com>
|
7 years ago |
|
Caleb James DeLisle
|
e78cc4ce7e
|
manual merge
|
7 years ago |
|
Caleb James DeLisle
|
cac5e75a99
|
Add a repl to improve debugging on the prod server
|
7 years ago |
|
ansuz
|
b4b51ed86a
|
add a subsystem for scheduling tasks
|
7 years ago |
|
yflory
|
5827905dbd
|
Import OnlyOffice code from the 'onlyoffice' branch and sframe it
|
7 years ago |
|
ansuz
|
acd5574008
|
send httpUnsafeOrigin via /api/config
|
7 years ago |
|
ansuz
|
5f0a865028
|
implement 'FRESH MODE'
|
7 years ago |
|
Caleb James DeLisle
|
ba74f9d37a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
Caleb James DeLisle
|
c702a23c77
|
Initial work on the 'pad will expire' logic
|
7 years ago |
|
ansuz
|
b5516ddcd0
|
send 404 page from server
|
7 years ago |
|
Caleb James DeLisle
|
abec07b1f9
|
If config.js is missing, fallback to config.example.js which is in the git repo
|
7 years ago |
|
Caleb James DeLisle
|
ad9f2ff223
|
Made pad2 server more generic and easy to implement
|
7 years ago |
|
Caleb James DeLisle
|
e04c0b89a1
|
manual merge of staging
|
7 years ago |
|
Caleb James DeLisle
|
723151254c
|
remove a debug line before release which killed CSP
|
7 years ago |
|
Caleb James DeLisle
|
65dfd99171
|
major wip
|
7 years ago |
|
Caleb James DeLisle
|
8404017af1
|
wip
|
8 years ago |
|
ansuz
|
e4dccd7ea8
|
cache blobs for a year unless you're in dev mode
|
8 years ago |
|
Caleb James DeLisle
|
7bee2ba27d
|
Add a semicolon at the end of the CSP if none exists.
|
8 years ago |
|
ansuz
|
e631818268
|
format probable server URL when printing to the console at launch
|
8 years ago |
|
Caleb James DeLisle
|
aa9aaefdea
|
Add frame-ancestors to allow remote auth
|
8 years ago |
|
ansuz
|
605377cf31
|
update default configuration file with new attributes and comments
|
8 years ago |
|
Caleb James DeLisle
|
66520b6041
|
cleaned up the accounts, limits and revenue sharing and unified the config in one place
|
8 years ago |
|
ansuz
|
1378a0c1f6
|
serve blobs from configured location
|
8 years ago |
|
yflory
|
d985b144cc
|
Add a new hash version for the file viewer
|
8 years ago |
|
ansuz
|
fd067510fe
|
support logging feedback api via config.js
|
8 years ago |
|
yflory
|
7c9adfbcb6
|
Replace the websocket server by the one in the chainpad-server repo
|
8 years ago |
|
ansuz
|
612a00b484
|
implement serverside RPC infrastructure
|
8 years ago |
|
ansuz
|
efdd999161
|
implement dev mode which busts cache all the time
|
8 years ago |
|
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.
|
8 years ago |
|
yflory
|
29578a7400
|
Merge branch 'hpbs' into newtoolbar
|
8 years ago |
|
yflory
|
4aacd291b1
|
New config option to use an external websocket server
|
8 years ago |
|
yflory
|
8ccd845d52
|
Merge branch 'newtoolbar' into hpbs
|
8 years ago |
|
yflory
|
6652e9d6d9
|
Test new home page
|
8 years ago |
|
ansuz
|
33b8de888e
|
clean up unused files
|
8 years ago |
|
ansuz
|
4cda1aeb2f
|
add docker and docker-compose
thanks @felixboehm
|
8 years ago |
|
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.
|
8 years ago |
|
ansuz
|
32d7fc55d2
|
make it easier to add pages at the document root
|
8 years ago |
|
ansuz
|
2f9283a677
|
fix leaky global variable
|
8 years ago |
|
ansuz
|
a2e5c96115
|
make http headers configurable, update default conf
|
8 years ago |
|
ansuz
|
0fe62f8c75
|
make wss CSP headers configurable again
|
8 years ago |
|
Caleb James DeLisle
|
72fc2e7068
|
Chuck a few more super-duper-security headers in there
|
8 years ago |
|
Caleb James DeLisle
|
f8ac3a6ad3
|
Fix merge error
|
8 years ago |
|
Caleb James DeLisle
|
83c3f6310a
|
Don't make the codestyle any worse than it is
|
8 years ago |
|
Caleb James DeLisle
|
12cdd1e76b
|
Add a Content Security Policy which works for CryptPad
|
8 years ago |
|
ansuz
|
3dfa19b786
|
more flexible websocket configuration (WIP)
|
8 years ago |
|
ansuz
|
4b238de84c
|
quieter stdout and stderr logs
|
8 years ago |
|
Csaba Okrona
|
c82abd8780
|
reverting the style changes
|
8 years ago |
|
Csaba Okrona
|
08064ae035
|
Using express.static instead of custom handler
|
8 years ago |
|
ansuz
|
eb797aa7cd
|
Support files other than index.html at server root
|
8 years ago |
|
ansuz
|
e73d93031c
|
use an absolutely specific regex for the document root
|
9 years ago |
|
ansuz
|
ad370d9216
|
implement more seamless customization (with fallbacks)
|
9 years ago |
|
ansuz
|
ba3e120fbf
|
remove everything related to jquery sheet since we're not using it
|
9 years ago |
|
ansuz
|
d59824929d
|
pass config object into NetfluxServer
|
9 years ago |
|
ansuz
|
b09b73fcc6
|
remove chainpad server
|
9 years ago |
|
Yann Flory
|
692fe24b32
|
Ability to use the old Chainpad server in parallel of the netflux server
|
9 years ago |
|
Yann Flory
|
ba4faea939
|
Update the pads to run with the latest improvements to the websocket server
|
9 years ago |
|
Yann Flory
|
c7d190f1c0
|
Improve the server so that both protocol (WebSocket and WebRTC) can use the same port
|
9 years ago |
|
Yann Flory
|
ae8f6f7f2c
|
Ability to choose which protocol to use (Websocket or WebRTC) with Netflux
|
9 years ago |
|
Yann Flory
|
870b2dbb7e
|
Add the WebRTC server in Cryptpad
|
9 years ago |
|
Yann Flory
|
09a06a8bc5
|
Replace the chainpad server by the netflux server
|
9 years ago |
|
ansuz
|
278c4ab32f
|
even more jshint compliance
|
9 years ago |
|
ansuz
|
967d636df9
|
address more jshint complaints
|
9 years ago |
|
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.
|
9 years ago |
|
Caleb James DeLisle
|
51544db9a2
|
Completed adding of customization system and bottom infobar
|
10 years ago |