|
|
2074cbb0d0
|
Web: Common: fixed StyledSectionFilter
|
2021-03-15 16:02:26 +03:00 |
|
|
|
8279174355
|
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
# products/ASC.Files/Client/src/Files.jsx
|
2021-03-15 14:57:44 +03:00 |
|
|
|
9ba58855d4
|
Web: Files: fixed EmptyContainer
|
2021-03-15 14:51:23 +03:00 |
|
|
|
b7a7be3d1f
|
Web: Refactoring
|
2021-03-13 18:33:43 +03:00 |
|
|
|
1cf7415db7
|
Web: Added changing of base href on page load
|
2021-03-13 18:29:26 +03:00 |
|
|
|
ad8d6d89d2
|
Web: Shell: Added virtualPath (proxy: /appserver)
|
2021-03-13 16:03:31 +03:00 |
|
|
|
372c06f911
|
Web: Fix Module not found: Error: Can't resolve 'people/GroupSelector'
|
2021-03-13 16:02:22 +03:00 |
|
|
|
8e1f5b30b5
|
Merge branch 'develop' into feature/workspaces
# Conflicts:
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/package.json
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/yarn.lock
# yarn.lock
|
2021-03-13 16:01:41 +03:00 |
|
|
|
e514fe1a57
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
# web/ASC.Web.Client/src/Shell.jsx
|
2021-03-12 14:58:24 +03:00 |
|
|
|
e8e78604f1
|
Web: Added products/apps dynamic loading
|
2021-03-12 13:52:30 +03:00 |
|
Ilya Oleshko
|
ba92cfa107
|
Web: Components: PageLayout: Fixed SelectedFrame value level
|
2021-03-12 12:58:28 +03:00 |
|
Vladislav Makhov
|
66daf1e21f
|
web: common: remove not needed import
|
2021-03-12 10:17:38 +03:00 |
|
Vladislav Makhov
|
10763bd9a3
|
web: people: fix import
|
2021-03-12 09:10:09 +03:00 |
|
Viktor Fomin
|
4c28a12398
|
Web: Common: fixed icon position
|
2021-03-10 20:10:09 +03:00 |
|
|
|
877016d8e3
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-05 12:41:08 +03:00 |
|
TatianaLopaeva
|
e81d2c8bb7
|
Web: Common: Fixed logoUrl.
|
2021-03-05 11:01:49 +03:00 |
|
|
|
82a6dafb0f
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-04 19:09:58 +03:00 |
|
|
|
28a798c542
|
Web: Fixed work with translations + refactoring:
+ Login re-written to functional component
+ Replaced css to scss
|
2021-03-04 19:09:46 +03:00 |
|
Alexey Kostenko
|
b0f3a4e426
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-04 17:32:09 +03:00 |
|
Alexey Kostenko
|
7cb59e3189
|
Web: Files/People: fixed direct link transition
|
2021-03-04 17:31:37 +03:00 |
|
TatianaLopaeva
|
5c826bcf29
|
Web: Added top loading indicator for desktop.
|
2021-03-04 14:36:31 +03:00 |
|
Alexey Kostenko
|
9e80a2010c
|
Web: Common/Files/People: Refactoring routing (fixed transition between people module and files module)
|
2021-03-04 13:13:26 +03:00 |
|
|
|
47a030f5a1
|
Web: Restored process indication in Files
|
2021-03-03 17:58:56 +03:00 |
|
|
|
68930abdcb
|
Web: Move toastr function to Web Client (mf: "studio/toastr")
|
2021-03-03 16:46:04 +03:00 |
|
|
|
fe39c60633
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-03 16:19:09 +03:00 |
|
TatianaLopaeva
|
ada47512f1
|
Web: Moved PeopleSelector to the Web Client.
|
2021-03-03 15:41:28 +03:00 |
|
|
|
efaeaff894
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-03 14:46:45 +03:00 |
|
|
|
684c0e777f
|
Web: Refactoring
|
2021-03-03 14:46:37 +03:00 |
|
|
|
4db48870cf
|
Web: SettingsStore: Fixed warnings of mobx
|
2021-03-03 14:46:05 +03:00 |
|
|
|
8da0cbcb63
|
Web: Fixed displaying login errors
|
2021-03-03 14:09:00 +03:00 |
|
TatianaLopaeva
|
7b0faa4747
|
Web: Moved Main into the Web Client.
|
2021-03-03 13:02:56 +03:00 |
|
TatianaLopaeva
|
1e643edd16
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-03 12:48:07 +03:00 |
|
TatianaLopaeva
|
d6cf286cd0
|
Web: Moved Layout to the Web Client.
|
2021-03-03 12:47:28 +03:00 |
|
Vladislav Makhov
|
1dbfd7f105
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
|
2021-03-03 12:33:25 +03:00 |
|
TatianaLopaeva
|
90831adc31
|
Web: Moved GroupSelector to the People module.
|
2021-03-03 12:09:12 +03:00 |
|
Vladislav Makhov
|
c2a5eea4be
|
web: people: refactoring
|
2021-03-03 12:05:08 +03:00 |
|
TatianaLopaeva
|
988afe48fd
|
Web: Moved profile menu to the NavMenu.
|
2021-03-03 11:25:28 +03:00 |
|
TatianaLopaeva
|
5212633a8d
|
Web: Moved errors from Common to the Web Client.
|
2021-03-03 11:15:11 +03:00 |
|
TatianaLopaeva
|
0a97830634
|
Web: Common: Fix icon for menu.
|
2021-03-02 21:16:50 +03:00 |
|
|
|
bf7f680d08
|
Web: Moved NavMenu to Web Client
|
2021-03-02 18:25:20 +03:00 |
|
|
|
ab139d373a
|
Web: Changed opening @self profile without page refresh
|
2021-03-01 22:53:42 +03:00 |
|
|
|
8ee7563caf
|
Web: Client: fixed mobx warnings
|
2021-03-01 18:15:11 +03:00 |
|
Vladislav Makhov
|
f452b09ecd
|
web: fix icons
|
2021-03-01 16:11:45 +03:00 |
|
Vladislav Makhov
|
ea7697d461
|
web: common: fix import
|
2021-03-01 12:30:21 +03:00 |
|
Vladislav Makhov
|
1695b9649d
|
web: common: fix title
|
2021-03-01 12:03:12 +03:00 |
|
Vladislav Makhov
|
4f8ad66cc3
|
web: common: fix svg import
|
2021-03-01 11:56:44 +03:00 |
|
TatianaLopaeva
|
6d70daa26a
|
Web: Headline: Fix headline color.
|
2021-02-26 15:46:02 +03:00 |
|
TatianaLopaeva
|
ca0c86f2d4
|
Web/Common: Fix active title of menu, fix transition without redirect.
|
2021-02-26 13:50:20 +03:00 |
|
Artem Tarasov
|
487fd2affc
|
Web: Components/Common: fix imports
|
2021-02-26 00:19:45 +03:00 |
|
Artem Tarasov
|
c35d0612f0
|
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
# products/ASC.Files/Client/src/store/InitFilesStore.js
|
2021-02-25 18:42:10 +03:00 |
|
