|
|
4ce9acce3d
|
Merge branch 'develop' into feature/sso
# Conflicts:
# products/ASC.Files/Server/DocStore
|
2022-07-22 17:23:36 +03:00 |
|
Artem Tarasov
|
345dad709c
|
Merge branch 'develop' into feature/doceditor-ssr
|
2022-07-21 16:02:48 +03:00 |
|
|
|
7045bd8540
|
Merge branch 'develop' into feature/sso
|
2022-07-21 13:07:36 +03:00 |
|
|
|
77d311b636
|
Merge branch 'develop' into feature/doceditor-ssr
|
2022-07-21 11:41:42 +03:00 |
|
TimofeyBoyko
|
66e4f2b12d
|
Web:Api: add withoutTags for rooms filter
|
2022-07-20 15:20:56 +03:00 |
|
TimofeyBoyko
|
f95d01dc7d
|
Web:Api:Rooms: add withoutMe to rooms filter
|
2022-07-20 15:11:14 +03:00 |
|
TimofeyBoyko
|
7a9114f562
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-20 14:29:04 +03:00 |
|
|
|
9e68c29d4f
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
# web/ASC.Web.Client/public/locales/en/Settings.json
|
2022-07-19 21:22:18 +03:00 |
|
TimofeyBoyko
|
fd818d148e
|
Web:Common:Api: disable search withSubfolders and searchInContent for rooms
|
2022-07-19 15:57:14 +03:00 |
|
TimofeyBoyko
|
f15894a7e9
|
Web:Common:Api: fix searchInContent
|
2022-07-18 19:34:04 +03:00 |
|
Artem Tarasov
|
10f2cde731
|
Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
# .gitignore
|
2022-07-18 17:05:53 +03:00 |
|
TimofeyBoyko
|
c3179249ef
|
Web:Common:Api: fix rooms withSubfolder
|
2022-07-18 16:11:10 +03:00 |
|
TimofeyBoyko
|
8832aece23
|
Web:Files: move logic from virtual room page to home page
|
2022-07-16 09:50:32 +03:00 |
|
|
|
ec80b996e7
|
Web: Common: add confirmKey for validate tfa
|
2022-07-14 15:27:48 +03:00 |
|
|
|
379ed60458
|
Web: Common: fix set tfa api
|
2022-07-14 14:43:29 +03:00 |
|
TimofeyBoyko
|
564fe335f2
|
Web:Common:Api: add isRoom params to folder in getRooms method
|
2022-07-14 07:42:25 +03:00 |
|
TimofeyBoyko
|
09122918f6
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-12 16:19:00 +03:00 |
|
TimofeyBoyko
|
6602a71fe6
|
Web:Common:API: add isArchive to archived rooms
|
2022-07-12 10:22:19 +03:00 |
|
TimofeyBoyko
|
2e72e298e6
|
Web:Common: fixed export and import decodeDisplayName
|
2022-07-08 18:29:50 +03:00 |
|
TimofeyBoyko
|
43b9b6183c
|
Web:Common:Api: add decodeDisplayName to getRooms and getRoom api rooms methods
|
2022-07-08 18:22:11 +03:00 |
|
TimofeyBoyko
|
2155df63fe
|
Web:Common:Api: move decodeDisplayName function from files api to utils
|
2022-07-08 18:20:25 +03:00 |
|
TimofeyBoyko
|
54435e755e
|
Web:Common:Api: fix equals rooms filter method
|
2022-07-08 14:50:42 +03:00 |
|
TimofeyBoyko
|
f9fa940fb2
|
Web:Common:Api: fix clone rooms filter
|
2022-07-08 14:40:30 +03:00 |
|
TimofeyBoyko
|
1e8859b29e
|
Web:Common:Api: add method to get all tags
|
2022-07-08 10:41:00 +03:00 |
|
TimofeyBoyko
|
a3ca2d6052
|
Web:Common:Api: fix subject id for rooms filter
|
2022-07-08 10:40:26 +03:00 |
|
|
|
0da612710d
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/security-settings
|
2022-07-07 19:39:12 +03:00 |
|
TimofeyBoyko
|
4b326c9dbc
|
Web:Common:Api: fix rooms filter
|
2022-07-05 10:02:45 +03:00 |
|
|
|
d4b9709d60
|
Web: Common: API: fix request
|
2022-07-04 11:56:22 +03:00 |
|
|
|
2a75edcfc5
|
Web: Common: API: fix sso path
|
2022-07-04 11:53:33 +03:00 |
|
Artem Tarasov
|
2ef94f75da
|
Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Editor/src/Editor.jsx
# web/ASC.Web.Editor/webpack.config.js
# yarn.lock
|
2022-07-01 23:41:10 +03:00 |
|
TimofeyBoyko
|
986b4d6d0a
|
Web:Common:Api: add new API methods for rooms
|
2022-07-01 18:28:24 +03:00 |
|
TimofeyBoyko
|
d699b30ed4
|
Web:Common:Api: add new api methods for archive and unarchive rooms
|
2022-07-01 11:58:41 +03:00 |
|
TimofeyBoyko
|
f34d5efa50
|
Web:Common:Api: change rooms filter search area with room search area const
|
2022-06-28 18:03:38 +03:00 |
|
TimofeyBoyko
|
1830b358f3
|
Web:Common:Api: update rooms API
|
2022-06-28 13:24:31 +03:00 |
|
TimofeyBoyko
|
a1ba434163
|
Web:Common:RoomFilter: update getFilter method
|
2022-06-23 20:03:28 +03:00 |
|
TimofeyBoyko
|
a5b78fa5e6
|
Web:Common:Api: add new rooms filter and get rooms api method
|
2022-06-23 12:52:09 +03:00 |
|
|
|
c8eb346edc
|
Web: Common: API: add getMetadata method
|
2022-06-22 17:39:20 +03:00 |
|
|
|
1ded44a64e
|
Web: Common: API: fix client response
|
2022-06-22 13:33:45 +03:00 |
|
TimofeyBoyko
|
f9479bf7ea
|
Web:Common:Api:Files: update getFoldersTree method for docspace
|
2022-06-22 11:57:54 +03:00 |
|
|
|
086dbf1a80
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
# packages/asc-web-components/field-container/index.js
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
|
2022-06-20 12:26:56 +03:00 |
|
|
|
a98e5d9c6a
|
Web: Files: Fix display name decoding ('Shared With Me' Author column issue)
|
2022-06-15 19:49:18 +03:00 |
|
|
|
e879d94bff
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
# packages/asc-web-common/api/settings/index.js
# packages/asc-web-components/checkbox/index.js
# packages/asc-web-components/file-input/index.js
# packages/asc-web-components/index.js
# packages/asc-web-components/label/index.js
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js
# web/ASC.Web.Client/src/components/pages/Settings/index.js
|
2022-06-15 13:52:00 +03:00 |
|
|
|
bef003446e
|
Merge branch 'feature/admin-messages' of github.com:ONLYOFFICE/AppServer into feature/session-lifetime
|
2022-06-07 13:40:56 +03:00 |
|
|
|
ab0f85d0e3
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-06-07 13:39:44 +03:00 |
|
|
|
a03e94d761
|
Web: Common: fixed create session arg
|
2022-06-01 17:47:54 +05:00 |
|
|
|
f8d05f8d08
|
Web: Common: added lastModified to create_session
|
2022-05-27 18:21:08 +05:00 |
|
|
|
fe4b4d3c2d
|
Merge branch 'feature/admin-messages' of github.com:ONLYOFFICE/AppServer into feature/session-lifetime
|
2022-05-03 21:22:47 +03:00 |
|
Artem Tarasov
|
38e06018e5
|
Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
# packages/asc-web-common/api/client.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateEmail.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeEmail.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeOwner.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePassword.js
# web/ASC.Web.Client/src/components/pages/Home/index.js
# web/ASC.Web.Editor/src/Editor.jsx
# web/ASC.Web.Editor/src/StyledEditor.js
# yarn.lock
|
2022-04-28 14:12:06 +03:00 |
|
|
|
175b934fc8
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/ip-security
# Conflicts:
# packages/asc-web-common/store/SettingsStore.js
|
2022-04-21 20:28:36 +03:00 |
|
|
|
78944a490e
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-21 18:55:41 +03:00 |
|
