|
|
5587c01502
|
Shared:Api:Files: add a new method for duplication
|
2024-06-24 03:23:10 +07:00 |
|
Akmal Isomadinov
|
fb940c9add
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# packages/client/public/locales/en/EmptyView.json
# packages/client/src/components/Article/MainButton/index.js
# packages/client/src/components/EmptyContainer/sub-components/EmptyViewContainer/EmptyViewContainer.helpers.tsx
|
2024-06-11 20:15:15 +05:00 |
|
|
|
e2dfd760be
|
Accounts: Filter: Change filtration status to EmployeeStatus totally (+new pending)
|
2024-06-10 23:23:30 +04:00 |
|
Akmal Isomadinov
|
a43d7a0500
|
Merge branch 'develop' into feature/form-room
|
2024-06-03 12:58:59 +05:00 |
|
Akmal Isomadinov
|
bf4cf3a495
|
Client: Added the creation of a room from a pdf form
|
2024-05-29 16:48:03 +05:00 |
|
|
|
84e0edd5d6
|
Merge pull request #423 from ONLYOFFICE/feature/language-combobox
Feature/language combobox
|
2024-05-28 17:22:15 +04:00 |
|
|
|
c39fe6c943
|
Merge branch 'develop' into feature/language-combobox
|
2024-05-27 21:10:02 +04:00 |
|
|
|
db22ee0060
|
Merge branch 'develop' into feature/selector-input
|
2024-05-27 17:32:14 +03:00 |
|
|
|
410f69e130
|
Merge branch 'develop' into feature/editor-in-same-tab
|
2024-05-27 16:31:42 +04:00 |
|
|
|
8ed897cde2
|
Merge branch 'develop' into feature/selector-input
|
2024-05-27 10:21:52 +03:00 |
|
|
|
8cda03a93f
|
Merge branch 'develop' into feature/language-combobox
|
2024-05-27 11:01:36 +04:00 |
|
|
|
8138752496
|
Merge branch 'develop' into feature/copy-folder-link
|
2024-05-24 17:40:07 +04:00 |
|
|
|
ddd7ccbd84
|
Merge branch 'develop' into feature/editor-in-same-tab
|
2024-05-24 15:06:55 +03:00 |
|
|
|
a18a99bf81
|
Fixed after merge.
|
2024-05-23 15:05:07 +03:00 |
|
|
|
594e3eba89
|
Shared:Selectors:Files: add create folder
|
2024-05-23 14:44:57 +03:00 |
|
|
|
d157e93d8a
|
Web: Files: Public: added folder copy link
|
2024-05-23 14:07:46 +03:00 |
|
|
|
e5a3b7ac10
|
Login: Added language combobox.
|
2024-05-23 09:05:08 +03:00 |
|
|
|
a75a754263
|
Rewritten in typescript.
|
2024-05-21 17:14:21 +03:00 |
|
|
|
aae967468e
|
Merge branch 'develop' into feature/language-combobox
# Conflicts:
# packages/login/index.d.ts
# packages/login/src/client/components/Login.tsx
# packages/login/src/components/LoginForm/index.tsx
# packages/login/src/server/lib/helpers/index.ts
# packages/shared/utils/loginUtils.ts
|
2024-05-21 14:43:22 +03:00 |
|
|
|
13a2daf4c0
|
Shared: add type
|
2024-05-21 13:01:19 +03:00 |
|
|
|
c61ecb2b65
|
Shared: API: add changeOpenEditorInSameTab
|
2024-05-17 15:55:42 +03:00 |
|
|
|
f900585de5
|
Merge branch 'hotfix/v2.5.1' into develop
|
2024-05-15 18:36:42 +04:00 |
|
|
|
247cc04924
|
Fixed Bug 67937 - Files.Trash.Search. Error ‘Request failed with status code 400’ when selecting a room based on a third-party storage in the Search options panel.
|
2024-05-14 13:10:25 +03:00 |
|
|
|
e1b3dff05c
|
Merge branch 'hotfix/v2.5.1' into develop
# Conflicts:
# packages/login/src/components/Login/index.tsx
|
2024-05-06 20:06:08 +04:00 |
|
|
|
9dca2aa67d
|
Fix Bug 67840
The message that room is unavailable appears for a second
|
2024-05-06 13:37:23 +03:00 |
|
|
|
c2dee92e6a
|
Merge pull request #390 from ONLYOFFICE/feature/login-nextjs
Feature/login nextjs
|
2024-05-03 19:58:01 +04:00 |
|
|
|
4e1553d9be
|
Merge branch 'develop' into feature/public-preview
|
2024-05-03 15:36:07 +04:00 |
|
|
|
6381efe2ca
|
Merge branch 'develop' into feature/login-nextjs
|
2024-05-03 00:20:34 +04:00 |
|
Vladimir Khvan
|
aa878a4d3c
|
Merge branch 'develop' into feature/connecting-storage
Conflicts:
packages/shared/api/files/index.ts
|
2024-04-30 14:38:43 +05:00 |
|
Akmal Isomadinov
|
d8f37f482d
|
Shared:Components:MediaViewer Added error handler
|
2024-04-30 12:17:52 +05:00 |
|
|
|
e5a031dafa
|
Merge branch 'develop' into feature/login-nextjs
|
2024-04-26 13:51:53 +03:00 |
|
Akmal Isomadinov
|
165918c051
|
Merge branch 'develop' into feature/public-preview
|
2024-04-26 12:18:11 +05:00 |
|
Akmal Isomadinov
|
78ecd38694
|
Shared:Api:Files: Added request token
|
2024-04-25 18:43:36 +05:00 |
|
|
|
fbb60df665
|
Merge branch 'develop' into feature/login-nextjs
|
2024-04-25 16:41:49 +03:00 |
|
Vladimir Khvan
|
0b349e32d7
|
Web: Client: Connecting storage: integrated connecting storages data from API
|
2024-04-25 14:06:20 +05:00 |
|
Akmal Isomadinov
|
68615654b4
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# packages/client/src/components/Article/MainButton/index.js
|
2024-04-24 14:09:05 +05:00 |
|
|
|
434986bb88
|
Merge branch 'hotfix/v2.5.1' into develop
|
2024-04-24 11:01:44 +04:00 |
|
namushka
|
fc47412b44
|
fixed trash tooltips not working with personal files
|
2024-04-23 14:49:16 +03:00 |
|
|
|
621b75bb38
|
Merge branch 'develop' into feature/login-nextjs
|
2024-04-23 12:51:03 +03:00 |
|
Akmal Isomadinov
|
0623e57d9e
|
Merge branch 'develop' into feature/form-room
# Conflicts:
# packages/doceditor/src/utils/index.ts
|
2024-04-19 16:42:10 +05:00 |
|
|
|
8a202e1d79
|
Merge branch 'release/v2.5.0' into develop
# Conflicts:
# packages/client/src/components/Article/MainButton/index.js
# packages/shared/utils/common.ts
|
2024-04-19 13:13:00 +04:00 |
|
|
|
3990c6d001
|
Fix Bug 67516 - Rooms.Search.Tag. The tag is broken down character by character on the page when you select a search by tag.
|
2024-04-18 15:48:18 +04:00 |
|
|
|
d4f66f20de
|
Merge branch 'release/v2.5.0' into feature/language-combobox
# Conflicts:
# packages/client/src/components/NavMenu/sub-components/header-unauth.js
# packages/login/src/client/components/Login.tsx
# packages/login/src/client/components/sub-components/LoginForm.tsx
# packages/login/src/server/lib/helpers/index.ts
# packages/shared/api/user/index.js
# packages/shared/utils/common.ts
|
2024-04-18 11:52:48 +03:00 |
|
|
|
22c73d5bfa
|
Login/Shared: Added support for changing the language when logging in via social networks.
|
2024-04-17 13:38:59 +03:00 |
|
|
|
918daa782c
|
Web: Added changing the language without reloading the page.
|
2024-04-16 16:12:02 +03:00 |
|
Akmal Isomadinov
|
c4e5b3f891
|
Doceditor:Hooks:useEditorEvents Added api method start filling
|
2024-04-12 17:12:51 +05:00 |
|
|
|
e893dd568a
|
Merge branch 'develop' into feature/login-nextjs
|
2024-04-11 11:27:37 +03:00 |
|
|
|
7206ee6205
|
Merge branch 'release/v2.5.0' into develop
# Conflicts:
# packages/client/src/store/DialogsStore.js
|
2024-04-10 20:09:16 +04:00 |
|
|
|
e998e52e49
|
Shared: API: add skip logout
|
2024-04-10 15:01:25 +03:00 |
|
|
|
f68db1622c
|
Merge branch 'develop' into refactoring/remove-personal
# Conflicts:
# packages/client/src/components/dialogs/ConnectDialog/index.js
# packages/client/src/pages/About/AboutContent.js
|
2024-04-08 01:23:49 +04:00 |
|
