Commit Graph

827 Commits

Author SHA1 Message Date
52d74baf18 Merge branch 'develop' into feature/form-room-pdf 2024-01-18 13:18:42 +03:00
4563d158a3 Merge branch 'hotfix/v2.0.1' into develop 2024-01-15 11:59:24 +04:00
6c29cf7508
fix Bug 65729 - Add private IP and link-local addresses to the blacklist (#117) 2024-01-13 16:16:10 +03:00
f6c2a78c8d bug 65729 2024-01-11 16:20:36 +03:00
9abc4e8149 FormRoomPdf: .oform has been removed from form filling formats 2023-12-28 11:30:56 +03:00
1c7a26aa34 added pdf as a form filling format 2023-12-26 14:10:17 +03:00
830c93f2a7
Merge pull request #113 from ONLYOFFICE/feature/add-pdf-in-encrypted-docs
add pdf in encrypted-docs
2023-12-21 15:18:27 +03:00
6c0491f479 Merge branch 'hotfix/v2.0.1' into develop 2023-12-21 14:13:51 +04:00
2ca6c15c85 add pdf encrypted-docs 2023-12-21 12:56:53 +03:00
96ac38206c cfg: firebaseio.com added to scp rules 2023-12-21 11:17:59 +03:00
6c2211e231 Merge branch 'hotfix/v2.0.1' into develop
# Conflicts:
#	install/OneClickInstall/install-Debian.sh
#	install/deb/debian/rules
2023-12-13 20:00:06 +04:00
71ab067f76 fix 2023-12-13 17:51:07 +03:00
7124919ad5 Settings: ForumLink 2023-12-13 17:45:34 +03:00
1c9e58095d Nginx: Restored nocache for api.js 2023-12-13 15:52:50 +04:00
087574d441
Merge pull request #106 from ONLYOFFICE/feature/plugins-cfg-refactoring
Feature/plugins cfg refactoring
2023-12-13 12:06:06 +03:00
67b7fcfe89 fixed cultures order 2023-12-12 17:03:22 +03:00
888df52b99 appsettings: WebPluginSettings: the array of allowed actions is divided into separate fields 2023-12-12 14:44:19 +03:00
7f95eabddd redis: configure PoolSize and WorkCount 2023-12-08 18:31:44 +03:00
2c5af9dfa4
Merge pull request #75 from ONLYOFFICE/feature/management
Feature/management
2023-12-07 18:20:50 +04:00
f05326047b
Merge pull request #68 from ONLYOFFICE/feature/distributed-lock
Feature/distributed lock
2023-12-07 05:32:05 -08:00
f7ced5afec Merge branch 'hotfix/v2.0.1' into develop 2023-12-06 15:51:24 +04:00
945aaa4bea
Fix bug 64321 (#95) 2023-12-04 17:39:20 +03:00
f4a5755811 Merge branch 'release/v2.0.0' into develop 2023-12-04 13:47:20 +04:00
bd1d5921d9
Allow upload and delete plugins (#93) 2023-12-01 16:33:29 +03:00
ed09909094 Fix This document requires 'TrustedScriptURL' assignment in Chrome docker dev 2023-11-30 19:03:55 +04:00
ff453ea19e cfg: storage: visible false for systemwebplugins 2023-11-29 18:23:07 +03:00
0ec94ce27a
Implement OWASP recomendations (#79) 2023-11-29 13:30:42 +03:00
71d0ff0c6a Merge branch 'develop' into feature/management 2023-11-28 17:10:57 +04:00
a374e9aefe added zookeeper test configuration 2023-11-28 15:28:10 +03:00
47626e599a Removed useless files and scripts for ASC.TelegramReports 2023-11-28 15:43:48 +04:00
1a3e3f69e0 dynamoDB:tableName 2023-11-27 16:03:41 +03:00
e6bc5bceea
fix Bug 64628 - Fix log level for error failed to get redis key (#70) 2023-11-24 16:17:39 +03:00
540811f08d added zookeeper configuration 2023-11-23 13:43:16 +03:00
b064d127fe Merge branch 'develop' into feature/management 2023-11-21 12:37:38 +04:00
baa76f4994 fix Bug 65120 2023-11-15 11:04:54 +03:00
55ab636f41
Merge pull request #61 from ONLYOFFICE/feature/scripts-caching
Restored cache control for some files in client/public/scripts
2023-11-14 14:15:32 +04:00
5a20174e70
increase alias max lenght 2023-11-14 11:52:59 +03:00
0ebba09b22 fix Bug 65064 2023-11-13 10:33:58 +03:00
24a174e26c Restored cache control for some files in client/public/scripts 2023-11-13 03:27:19 +04:00
bf46514e13 Merge branch 'develop' into feature/management 2023-11-10 14:23:08 +04:00
8b4c71be7e
Merge pull request #54 from ONLYOFFICE/bugfix/64923
Bugfix/64923
2023-11-09 07:18:39 -08:00
79a4e818d2 Merge branch 'develop' into feature/management
# Conflicts:
#	build.backend.docker.ps1
#	build.backend.docker.sh
#	clear.backend.docker.ps1
#	clear.backend.docker.sh
#	start/start.backend.docker.ps1
#	start/start.backend.docker.sh
2023-11-09 19:00:55 +05:00
6ac0c7e783 Merge remote-tracking branch 'remotes/origin/release/v2.0.0' into bugfix/64923
# Conflicts:
#	config/appsettings.json
2023-11-09 15:42:05 +03:00
8ce55ae9b9 fix Bug 64923 ( added frame-src, connect-src, media-src ) 2023-11-09 15:35:20 +03:00
8e8d381514 fix bug 65011 2023-11-09 15:17:43 +03:00
1d5a4ffea8 Merge branch 'release/v2.0.0' into bugfix/64787 2023-11-09 13:58:52 +04:00
ae6e20522a csp only for html 2023-11-08 23:53:42 +03:00
374099b1e5 csp only for html 2023-11-08 19:19:04 +03:00
d7fe0c18d3 OFormSettings: added dashboard path 2023-11-07 15:28:04 +03:00
c85d82d4d2 added AWS DynamoDB connection string 2023-11-07 13:09:44 +03:00