Commit Graph

28377 Commits

Author SHA1 Message Date
Elyor Djalilov
3211ccf761 not found keys fixed 2022-11-28 23:26:44 +05:00
Elyor Djalilov
80b65ca16f not found keys fixed 2022-11-28 23:22:20 +05:00
Elyor Djalilov
af4bcf4c05 deleted duplicate keys 2022-11-28 23:01:07 +05:00
Elyor Djalilov
89fe900387 deleted duplicate keys 2022-11-28 22:54:54 +05:00
Elyor Djalilov
8951cf62fc deleted duplicate keys 2022-11-28 22:50:56 +05:00
Elyor Djalilov
04db0e8f0a deleted duplicate key and was moved to the Common 2022-11-28 22:46:57 +05:00
Elyor Djalilov
23109e30c2 deleted duplicate keys and was moved to the Common 2022-11-28 22:19:57 +05:00
Elyor Djalilov
7f89e3d2bf unused key removed 2022-11-28 22:12:23 +05:00
Elyor Djalilov
642e7d4036 unused key removed 2022-11-28 22:11:18 +05:00
Elyor Djalilov
b3b6615226 deleted duplicate key 2022-11-28 22:03:20 +05:00
Elyor Djalilov
d88331c704 deleted duplicate keys 2022-11-28 21:41:21 +05:00
Elyor Djalilov
b924f1582d deleted duplicate keys and was moved to the Common 2022-11-28 15:37:10 +05:00
Elyor Djalilov
3c637dbaa2 deleted duplicate keys and was moved to the Common 2022-11-28 15:19:44 +05:00
Elyor Djalilov
6ac2aceb64 deleted duplicate keys and was moved to the Common 2022-11-28 14:55:18 +05:00
Elyor Djalilov
d3c02d495e added prefix Common 2022-11-28 13:28:46 +05:00
Elyor Djalilov
c628368e9b deleted duplicate keys 2022-11-28 13:26:08 +05:00
Elyor Djalilov
c6f5db2486 unused key removed 2022-11-28 12:12:42 +05:00
Elyor Djalilov
91932d5715 unused key removed 2022-11-28 12:10:01 +05:00
Elyor Djalilov
7b19ca5754 empty value keys fixed 2022-11-28 12:07:17 +05:00
Elyor Djalilov
6fffbed1e3 unused key removed 2022-11-28 12:02:58 +05:00
Elyor Djalilov
254e21515b unused key removed 2022-11-28 11:58:42 +05:00
Elyor Djalilov
fc59726fe1 empty value keys fixed and deleted duplicate keys 2022-11-28 11:46:04 +05:00
Elyor Djalilov
b3ce916889 empty value keys fixed 2022-11-26 15:01:16 +05:00
Elyor Djalilov
ad1a6c4d4d Fix bad merge 2022-11-26 14:41:58 +05:00
Elyor Djalilov
a54463de2a empty value keys fixed 2022-11-26 14:28:36 +05:00
Elyor Djalilov
d462eac7c3 empty value keys fixed 2022-11-26 14:19:37 +05:00
Elyor Djalilov
1775ba9fe9 empty value keys fixed 2022-11-26 14:18:20 +05:00
Elyor Djalilov
bc729a8847 Fix bad merge 2022-11-26 13:47:40 +05:00
Elyor Djalilov
34954cd9e0 Fix bad merge 2022-11-25 17:51:13 +05:00
Elyor Djalilov
bb5000fb82 Fix bad merge 2022-11-25 16:42:35 +05:00
Elyor Djalilov
b8348af578 Merge branch 'develop' into feature/new-docspace-translations
# Conflicts:
#	packages/client/public/locales/en/DeleteDialog.json
#	packages/client/public/locales/en/Files.json
#	packages/client/public/locales/en/InfoPanel.json
#	packages/client/public/locales/en/InviteDialog.json
#	packages/client/public/locales/en/Payments.json
#	packages/client/public/locales/en/Profile.json
#	packages/client/public/locales/en/Settings.json
#	packages/client/public/locales/en/Translations.json
#	packages/client/public/locales/ru/Files.json
#	packages/client/public/locales/ru/InfoPanel.json
#	packages/client/public/locales/ru/Payments.json
#	packages/client/src/components/GlobalEvents/RenameEvent.js
#	packages/client/src/pages/Home/Section/Filter/index.js
2022-11-25 16:27:23 +05:00
14aae505bc
Merge pull request #1061 from ONLYOFFICE/bugfix/access-rights
Bugfix/access rights
2022-11-24 22:15:08 +03:00
a714937a2c Merge branch 'develop' into bugfix/access-rights 2022-11-24 22:14:26 +03:00
f8165f7640 Fixed Dockerfile.dev after merge 2022-11-24 21:36:13 +03:00
b77c6c9c03 Update Dockerfile.dev
Fix unknown "service_migration" variable
2022-11-24 21:35:00 +03:00
fa0146416b Update docspace.dev.yml
Restored variables for nginx upstream
2022-11-24 21:23:38 +03:00
23a7210fbc Merge branch 'develop' into bugfix/access-rights 2022-11-24 20:33:59 +03:00
18b89b1517 nlog: fixed 2022-11-24 19:18:27 +03:00
Sergey Kirichenko
dfa948d5b3
Delete docker services (#1081) 2022-11-24 17:47:27 +03:00
db7dffe624 refactoring 2022-11-24 17:22:34 +03:00
ac8293d7f7 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop 2022-11-24 17:22:02 +03:00
8d421a3b24 refactoring 2022-11-24 17:21:34 +03:00
c040870df1 Update build.backend.docker.ps1 2022-11-24 17:20:02 +03:00
6765a2eeb8
Merge pull request #1079 from ONLYOFFICE/bugfix/crlf-docker-build
Bugfix/crlf docker build
2022-11-24 16:06:38 +03:00
924a317839
Merge pull request #1080 from ONLYOFFICE/bugfix/save-as-dialog
Bugfix/save as dialog
2022-11-24 16:02:45 +03:00
35698e1ea6 Web: Added temp path. 2022-11-24 16:00:32 +03:00
6933d668eb Build: Added passing variable from command line 2022-11-24 15:39:38 +03:00
90db4721d6 Web: Fixed getting the correct folder when opening a dialog inside a room. 2022-11-24 15:33:10 +03:00
97b0fe6e75 Merge branch 'develop' into bugfix/crlf-docker-build 2022-11-24 15:09:33 +03:00
1f56cdf94b Build: Commented ASC.Notify and ASC.ApiSystem for Dockerfile.dev 2022-11-24 15:05:06 +03:00