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 |