54d5c658bd
Merge branch 'develop' into feature/two-factor-auth
2021-06-07 11:54:06 +03:00
Artem Tarasov
b3bccbb98d
Web: People: added usage setFirsLoad
2021-06-07 01:15:07 +03:00
Artem Tarasov
6d7361ecd0
Web: People: added HOC withLoader
2021-06-07 01:09:13 +03:00
Artem Tarasov
9f21862f51
Merge branch 'develop' into bugfix/fixed-styles
2021-06-07 00:24:19 +03:00
Artem Tarasov
fac8dafe1e
Web: Files: fixed width of unselected node in settings tree
2021-06-07 00:21:40 +03:00
Artem Tarasov
9a798506e0
Web: deleted unnecessary code
2021-06-06 23:43:20 +03:00
Artem Tarasov
acd4a3893c
Web: added rule to webpack.config for woff, woff2
2021-06-06 23:39:52 +03:00
Artem Tarasov
7db667108b
Web: added font-family Opne-Sans to /public, added import fonts to custom.scss
2021-06-06 23:35:56 +03:00
fc20a742a1
crm: refactoring
2021-06-04 19:27:44 +03:00
58e7e41cdd
crm: code cleanup
2021-06-04 17:38:42 +03:00
Artem Tarasov
645030cd25
Merge branch 'develop' into feature/thumbnails
2021-06-04 16:40:24 +03:00
1cbe04f044
Merge pull request #270 from ONLYOFFICE/feature/remove-unused-dep
...
Feature/remove unused dep
2021-06-04 15:06:47 +03:00
5754a9b753
Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal
2021-06-04 14:43:10 +03:00
d01ef10cc5
Web: NavMenu/PageLayout: Was done:
...
- fixed loaders: two rectangle loader combined into one
- fixed loaders at index.html: two rectangle loader combined into one
- hide NavItem component
- hide click on Headline component
- fixed article padding style for desktop
- added new logo.
2021-06-04 14:42:21 +03:00
SuhorukovAnton
860b682594
replace "DeleteOldEvents" in new service
2021-06-04 14:10:37 +03:00
a4ee59974e
Web: People: Profile: Fixed displaying user information for "personal" setting
2021-06-04 12:47:37 +03:00
d465b105e7
Web: Client: NavMenu: Fixed opening "My" profile at new tab
2021-06-04 12:03:40 +03:00
914b975ada
Web: Files: Store: Fixed files and folders actions for "personal" setting
2021-06-04 11:28:44 +03:00
Vladislav Makhov
da8503612e
web: files: private room: fix upload dialog
2021-06-04 11:23:00 +03:00
Artem Tarasov
fd88de8064
Merge branch 'develop' into bugfix/fixed-styles
2021-06-04 10:35:37 +03:00
e8516f7b34
Merge branch 'develop' into feature/two-factor-auth
2021-06-03 20:27:57 +03:00
a682cdd3f7
Web: Client: fixed settings tree
2021-06-03 20:25:54 +03:00
ce35405190
Web: Client: deleted duplicate key
2021-06-03 20:25:35 +03:00
209f3b174c
Web: Files: added tReady to ConvertDialog
2021-06-03 17:29:06 +03:00
Vladislav Makhov
0af3acb46b
web: common: add redirect from root in personal
2021-06-03 16:30:56 +03:00
944966b67b
WebSocker: repair service
2021-06-03 16:13:22 +03:00
ba41a5aecb
Merge branch 'develop' into feature/restore-files-convertation
2021-06-03 15:59:24 +03:00
531233a9a8
Web: Files: added new translations, fixed conversion
2021-06-03 15:56:14 +03:00
Vladislav Makhov
61abe6a2fc
web: common: fix default page
2021-06-03 15:52:07 +03:00
c04dc44e36
crm: refacroting
2021-06-03 15:51:29 +03:00
Vladislav Makhov
4a3b61dda8
web: common: fix default page
2021-06-03 15:48:19 +03:00
Vladislav Makhov
a071470ff2
Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal
2021-06-03 14:30:10 +03:00
Vladislav Makhov
e209f2c4b1
web: files: hide tp settings in personal
2021-06-03 14:29:54 +03:00
Vladislav Makhov
6f5c5d2524
web: files: move files setting fetching to store
2021-06-03 14:29:30 +03:00
62b57fa313
Web: Files: refactoring UploadDataStore
2021-06-03 14:23:25 +03:00
cefc4c417a
Web: Files: hide share button in upload panel
2021-06-03 12:53:08 +03:00
43de25b62a
Merge branch 'develop' into feature/remove-unused-dep
...
# Conflicts:
# common/ASC.Data.Storage/ASC.Data.Storage.csproj
# common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
2021-06-03 12:52:21 +03:00
a7edb118ac
Web: Files: added conversion for upload action
2021-06-03 12:50:01 +03:00
bcc9e6c34b
ResManager: additional feature
2021-06-03 12:48:25 +03:00
9a6139f081
Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal
2021-06-03 12:47:01 +03:00
e62d8c7ec9
Web: Files: sharing dialog for personal
2021-06-03 12:46:36 +03:00
374f34a78e
Personal: fix login
2021-06-03 12:34:28 +03:00
f21188b5cb
Web: Client: fixed wizard culture
2021-06-03 12:22:38 +03:00
ceb19659f3
Merge pull request #264 from ONLYOFFICE/feature/thirdparty_for_two_frameworks
...
Feature/thirdparty for two frameworks
2021-06-03 12:19:27 +03:00
Vladislav Makhov
bdaeb27fd1
web: files: filter options for personal
2021-06-03 11:01:19 +03:00
Vladislav Makhov
dbb6562b88
web: files: rename isPersonal to personal according to settings api key
2021-06-03 10:34:53 +03:00
Vladislav Makhov
889bba78b1
web: common: fix default value
2021-06-03 10:32:33 +03:00
Vladislav Makhov
2ae98f6cf4
web: common: rename isPersonal to personal according to settings api key
2021-06-03 10:30:09 +03:00
Vladislav Makhov
04c56a7f57
Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal
2021-06-03 10:16:11 +03:00
Vladislav Makhov
30bb8e7e02
web: files: Can connect a third-party service only in My Documents, if personal mode
2021-06-03 08:22:42 +03:00
