dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,792 Commits 73 Branches 132 Tags 560 MiB
Commit Graph

98 Commits

Author SHA1 Message Date
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
Caleb James DeLisle c702a23c77 Initial work on the 'pad will expire' logic 2017-12-05 17:48:30 +01:00
ansuz b5516ddcd0 send 404 page from server 2017-11-30 19:19:21 +01:00
Caleb James DeLisle abec07b1f9 If config.js is missing, fallback to config.example.js which is in the git repo 2017-08-28 11:21:01 +02:00
Caleb James DeLisle ad9f2ff223 Made pad2 server more generic and easy to implement 2017-08-17 15:41:04 +02:00
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