|
|
dec07c931c
|
moved from d50a38db
|
2021-11-29 18:40:22 +03:00 |
|
|
|
08746974f4
|
Web: SW: Added SW unregister + refactoring
|
2021-11-25 15:08:18 +03:00 |
|
|
|
f675415228
|
Merge branch 'master' into release/v1.1.0
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# packages/asc-web-components/package.json
# packages/browserslist-config-asc/package.json
# packages/debug-info/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/public/locales/en/SelectFile.json
# products/ASC.Files/Client/public/locales/en/SelectFolder.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.People/Client/public/locales/en/Translations.json
# products/ASC.People/Client/public/locales/ru/Translations.json
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Login/package.json
|
2021-11-21 14:26:20 +03:00 |
|
|
|
1a282c2073
|
Config: Extra comma removed
|
2021-11-17 16:35:22 +03:00 |
|
|
|
cc35174d16
|
moved from 043e301
|
2021-11-16 20:40:15 +03:00 |
|
Sergey Kirichenko
|
48cf953913
|
Add cache for locales *.json
|
2021-11-12 19:17:09 +03:00 |
|
Sergey Kirichenko
|
34378fa1e6
|
Modify nginx config (#401)
* Modify nginx config
* Cosmetic modify
* Cosmetic modify
* Cosmetic modify
* Cosmetic modify
* Cosmetic modify
* Cosmetic modify
|
2021-10-19 11:52:15 +03:00 |
|
Sergey Kirichenko
|
e85ed7a878
|
Add debuginfo.md to no-cache status
|
2021-10-17 21:18:01 +03:00 |
|
Sergey Kirichenko
|
439f1d0c18
|
Fix, do not cache remoteEntry.js
|
2021-10-15 12:52:13 +03:00 |
|
Sergey Kirichenko
|
86abb2812f
|
Fix Bug 53063 (#397)
|
2021-10-14 11:26:32 +03:00 |
|
Sergey Kirichenko
|
5d1bfbefa4
|
Modify docker images build (#380)
* Modify images build config
* Cosmetic modify
* Modify git clone ind Dockerfile
|
2021-10-06 16:43:18 +03:00 |
|
|
|
5d3d8f4d45
|
Web: Changed opportunity to show/hide DebugInfo to appsettings.json param "debug-info:enabled" and 'api/2.0/settings.json'
|
2021-10-05 11:13:38 +03:00 |
|
|
|
9ce696e624
|
Web: Studio: Init Debug Info
+ Added About version from package.json
+ Fix DocumentServer version
|
2021-10-04 17:08:03 +03:00 |
|
|
|
febec81e59
|
Merge branch 'release/1.0.0' of https://github.com/ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-27 13:22:59 +03:00 |
|
|
|
3d0622c68b
|
Workbox: Config: Removed html from cache (issue with login/logout)
|
2021-09-27 13:22:52 +03:00 |
|
|
|
590db7bb67
|
Merge pull request #347 from ONLYOFFICE/feature/third
Feature/third
|
2021-09-27 12:35:07 +03:00 |
|
|
|
4531d38e6f
|
Web: Removed duplicates
|
2021-09-24 21:18:50 +03:00 |
|
|
|
6ada582cc5
|
Web: service-worker updates optimization
|
2021-09-24 20:10:54 +03:00 |
|
|
|
e755d2eda8
|
renamed providers to lowercase
|
2021-09-24 17:36:46 +03:00 |
|
|
|
bd9492b533
|
fixed version number
|
2021-09-24 11:06:57 +03:00 |
|
|
|
77323e02cc
|
fix Bug 50294
|
2021-09-14 22:19:26 +03:00 |
|
|
|
ea2c45ec55
|
Merge branch 'release/1.0.0' into bugfix/mousewheel-opening-files
|
2021-09-03 14:57:01 +03:00 |
|
|
|
fa204303f5
|
Merge branch 'develop' into release/1.0.0
|
2021-09-01 16:08:41 +03:00 |
|
|
|
9be5858ae7
|
Merge branch 'release/1.0.0' into bugfix/mousewheel-opening-files
|
2021-09-01 13:23:33 +05:00 |
|
|
|
fce956991e
|
nginx: fix
|
2021-08-31 18:38:59 +03:00 |
|
|
|
c66268a9c2
|
Merge branch 'develop' into release/1.0.0
# Conflicts:
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/helpers/utils.js
|
2021-08-26 13:49:25 +03:00 |
|
|
|
cc2e2764d2
|
Merge branch 'release/1.0.0' into bugfix/mousewheel-opening-files
|
2021-08-23 14:47:02 +05:00 |
|
|
|
61528fb9c2
|
Merge branch 'develop' into feature/file-folder-selectors
|
2021-08-20 17:35:31 +03:00 |
|
|
|
9207238d8d
|
Merge branch 'develop' into release/1.0.0
|
2021-08-20 16:12:40 +03:00 |
|
|
|
9f83801f88
|
Nlog: optimization
|
2021-08-20 15:42:43 +03:00 |
|
|
|
f1e5076cb1
|
Web: added scripts path in nginx
|
2021-08-19 13:32:31 +03:00 |
|
|
|
3b8cf0a275
|
Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/helpers/utils.js
# web/ASC.Web.Editor/src/Editor.jsx
|
2021-08-19 10:08:14 +03:00 |
|
|
|
9873ea6fa0
|
Nginx: config for developers
|
2021-08-16 19:26:16 +03:00 |
|
|
|
f3ec5bb0e0
|
Nginx: static config
|
2021-08-16 15:18:45 +03:00 |
|
|
|
7e249a170e
|
removed socketio config
|
2021-08-12 15:58:56 +03:00 |
|
|
|
9aafaa21ea
|
Merge pull request #319 from ONLYOFFICE/feature/log
Feature/log
|
2021-08-12 15:00:53 +03:00 |
|
|
|
999e1157d5
|
Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
# web/ASC.Web.Editor/src/Editor.jsx
|
2021-08-11 09:59:57 +03:00 |
|
|
|
af18e175dc
|
Merge branch 'develop' into release/1.0.0
|
2021-08-10 11:13:17 +03:00 |
|
|
|
e5c4770ae6
|
DB: fix connection string
|
2021-08-10 11:07:40 +03:00 |
|
|
|
5d840f65b1
|
DB: fix connection string
|
2021-08-10 11:03:11 +03:00 |
|
|
|
16469eb138
|
Api: added ConfigureNLogLogging
|
2021-08-08 15:56:54 +03:00 |
|
|
|
b6258b4ff1
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into release/1.0.0
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withLoader.js
|
2021-07-28 20:15:09 +03:00 |
|
|
|
75e7ca893f
|
Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Editor/src/Editor.jsx
|
2021-07-28 17:19:05 +03:00 |
|
|
|
cf7d002bc1
|
Merge branch 'develop' into feature/calendar
|
2021-07-28 12:16:39 +03:00 |
|
|
|
93d1cb0f38
|
Fix Bug 51344 "downloadable font: kern: Too large subtable..." on FF
|
2021-07-27 15:56:19 +03:00 |
|
|
|
f1668a3b43
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar
|
2021-07-27 12:43:01 +03:00 |
|
|
|
e2d3f3195d
|
Merge branch 'develop' into release/1.0.0
|
2021-07-26 15:40:05 +03:00 |
|
|
|
cd8e752c03
|
Workbox config: minimized globPatterns (only js and css)
|
2021-07-26 15:38:55 +03:00 |
|
|
|
0f27a6c673
|
Merge branch 'develop' into release/1.0.0
|
2021-07-23 17:34:43 +03:00 |
|
|
|
675fb8de21
|
Web: Fix caching remoteEntry.js
|
2021-07-23 17:20:42 +03:00 |
|
