fd704ab12a
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 20:58:06 +03:00
5dd30c9502
Web: Client: fixed owner change
2021-03-22 20:56:53 +03:00
4ce205fe9a
Web: Client: Commented not used code
2021-03-22 20:00:38 +03:00
b0c430b7ba
Merge branch 'develop' into feature/workspaces
2021-03-22 19:46:49 +03:00
950506a59c
calendar: migrate extension for DateTime
2021-03-22 19:13:15 +03:00
7c96b2f625
core: migrate several interfaces
2021-03-22 19:04:37 +03:00
e4897160a9
fixed SendEmailActivationInstructions
2021-03-22 18:56:04 +03:00
f19ee78c0f
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 18:52:33 +03:00
dea3f3bb20
Web: Fixed login redirect
2021-03-22 18:52:25 +03:00
TatianaLopaeva
26ef7bdd65
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 18:31:41 +03:00
e279ece3c4
Removed commented code
2021-03-22 18:24:19 +03:00
ce86b6014b
Web: Settings: Add URL proxy
2021-03-22 18:24:03 +03:00
TatianaLopaeva
9baae539d2
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 18:11:45 +03:00
TatianaLopaeva
24cc620904
Web: Fixed displaying of shared files at aside & Deleted useless code.
2021-03-22 18:11:39 +03:00
d7981f3f53
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 17:35:41 +03:00
a8a6121e59
Web: Proxy fixes
2021-03-22 17:35:33 +03:00
Viktor Fomin
0da17ef641
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 16:15:07 +03:00
Viktor Fomin
74e5686a0e
Web: Client: fixed language-timezone settings
2021-03-22 16:14:41 +03:00
89f2431e1c
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 15:33:50 +03:00
Alexey Kostenko
3524f3b6c6
Web: Client/Common: Fixed Route to homepage (Incorrect header on homepage)
2021-03-22 15:27:36 +03:00
83e9a8b4a4
Web: Add URL proxy on tryRedirectTo usage
2021-03-22 12:16:41 +03:00
b6a5249147
Web: Editor: Add URL proxy
2021-03-22 12:12:34 +03:00
Viktor Fomin
d3fdc2d8a3
Web: Client: fixed greeting settings
2021-03-22 11:57:08 +03:00
25bbd0cf2a
Merge branch 'develop' into feature/workspaces
2021-03-22 11:34:54 +03:00
d568693154
Big Fix commit:
...
+ Added new Clients for CRM/Products
+ Removed old fake coming-soon pages
+ Added combineUrl and AppSettingsConfig with proxyUrl
+ Added new fields to modules info on Server
+ Fixed work with icon and image urls
+ Added CRM/Projects to nginx/onlyoffice.conf
+ Applied combineUrl in studio links
+ Added and applied "id" field in package.json of all Clients
+ Added new bat files CrmClient.bat and ProjectsClient.bat
+ Fixed ProductClassName for Files
2021-03-22 00:34:21 +03:00
fc7bd11088
Fix getshortenlink
2021-03-21 18:29:35 +03:00
335cc31939
Notify: fix
2021-03-21 17:51:49 +03:00
accd318dc0
Web: Fixed z-index of #ipl-progress-indicator
2021-03-20 11:24:33 +03:00
6b8d644aab
Web: Replaced all homepages to config variant
2021-03-19 18:22:35 +03:00
1e02f165ca
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# products/ASC.People/Client/src/components/PeopleSelector/i18n.js
2021-03-19 10:55:22 +03:00
Artem Tarasov
dabf704485
Web: Client/Components: Wizard: layout fix
2021-03-18 22:55:15 +03:00
8e6b2c78d8
Web: Moved ipl-progress-indicator to NavMenu
2021-03-18 22:26:52 +03:00
f3f4037282
Web: Fixed Wizard
2021-03-18 21:54:03 +03:00
330c156cb8
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-18 18:20:31 +03:00
544abc2321
Web: Client: fixed changePassword form, removed debugger
2021-03-18 16:00:58 +03:00
TatianaLopaeva
2898cabc3f
Web: NavMenu: Fixed styles of title.
2021-03-18 13:53:21 +03:00
TatianaLopaeva
80247cbb1a
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-18 13:30:53 +03:00
TatianaLopaeva
242d6870aa
Web: PaymentsEnterprise: Fix styles & Added lost import.
2021-03-18 13:30:38 +03:00
23a23a0c68
Web: Client: fixed changeEmail confirm page
2021-03-18 12:29:16 +03:00
a861371826
Web: Client: fixed activateUser confirm page
2021-03-18 12:28:49 +03:00
6e2b2d5095
Web: Removed old svg
2021-03-17 21:26:28 +03:00
c3b49a713d
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-17 18:34:09 +03:00
409073eff7
Web: Client: fixed change password
2021-03-17 18:33:05 +03:00
Alexey Kostenko
15a212a567
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-17 17:02:30 +03:00
Alexey Kostenko
15c1d087f7
Web: Client: Hidden AdminsSettings
2021-03-17 17:01:59 +03:00
TatianaLopaeva
a6e3349d9e
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-17 16:46:25 +03:00
Alexey Kostenko
73727dc01f
Web: Client: Fixed infinity loading in language-and-time-zone page
2021-03-17 16:41:53 +03:00
TatianaLopaeva
7beba532dd
Web: Settings: Fixed displaying of icon.
2021-03-17 16:41:02 +03:00
86a63e6330
Web: Client: fixed createUser form
2021-03-17 16:35:45 +03:00
8036cb3401
Web: fixed confirm route
2021-03-17 15:56:09 +03:00
Alexey Kostenko
602ca59f2e
Web: Client: Close menu after switch module
2021-03-17 15:38:21 +03:00
Artem Tarasov
1841730e20
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-17 13:38:16 +03:00
Artem Tarasov
c9e4df5f1b
Web: moved PeopleSelector to People
2021-03-17 13:37:22 +03:00
062cc4cc78
Web: Disabled initialization of service-workers on development
2021-03-17 12:59:11 +03:00
f56970ed15
Web: Login: Fixed base urls
2021-03-17 12:48:22 +03:00
391b60c79d
Web: Login: Commented logs
2021-03-17 12:47:49 +03:00
Vladislav Makhov
b0c00fe749
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# products/ASC.People/Client/src/Routes.jsx
2021-03-16 16:33:18 +03:00
Vladislav Makhov
1c59410c38
web: client: remove history props drilling
2021-03-16 16:31:49 +03:00
7b5a9ab80d
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-16 14:10:29 +03:00
24a6d61205
Web: Added creation and run of service-worker to all client apps
2021-03-16 14:10:20 +03:00
Ilya Oleshko
d99e7b731f
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-15 17:58:45 +03:00
Ilya Oleshko
24d0af3851
Web: Client: Shell: Added route to ThirdPartyResponse page
2021-03-15 17:12:46 +03:00
Ilya Oleshko
c2902461cb
Web: Client: ThirdParty: Fixed import
2021-03-15 17:12:09 +03:00
TatianaLopaeva
eac9bb9b3b
Web: Settings: Fix icons displaying when moving from other modules.
2021-03-15 17:08:35 +03:00
a015b618a2
Web: Client: Added new service-worker on workbox v6
2021-03-14 23:36:20 +03:00
708a10a3f4
Web: Fixed logo displaying
2021-03-14 00:21:22 +03:00
b7a7be3d1f
Web: Refactoring
2021-03-13 18:33:43 +03:00
145d720299
Web: Webpack: Added base url and commented proxy
2021-03-13 18:31:09 +03:00
ad8d6d89d2
Web: Shell: Added virtualPath (proxy: /appserver)
2021-03-13 16:03:31 +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
4d5ca86a74
Merge branch 'master' into develop
...
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/.env
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/helpers/i18n.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/api/modules/index.js
# web/ASC.Web.Common/src/store/auth/reducer.js
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/yarn.lock
2021-03-12 19:52:01 +03:00
e8e1a176ea
Update yarn.lock files
2021-03-12 18:38:55 +03:00
94b6750a6b
web: common: bump version
2021-03-12 18:28:14 +03:00
22c3cfffcd
Web: Restored defaultPage
2021-03-12 18:27:52 +03:00
bc8943083f
Web: Clinet: Added default params to .env
2021-03-12 18:16:51 +03:00
c2338d6636
Merge branch 'hotfix/v0.0.11' of https://github.com/ONLYOFFICE/AppServer into hotfix/v0.0.11
2021-03-12 18:00:33 +03:00
e2061cd427
CustomNamingPeople: fix
2021-03-12 18:01:11 +03:00
b1dfa97386
Web: Client: Added support of homepage
2021-03-12 17:53:02 +03:00
ae7b7484b1
Web: Common: Fixed API proxy issue
2021-03-12 17:35:51 +03:00
b90876c97d
Bump version to v0.0.11
2021-03-12 17:20:24 +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
7465b6cda4
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-12 13:12:03 +03:00
25cbaf3c0c
Web: Files: fixed NavMenu clickOutsideAction
2021-03-12 13:11:53 +03:00
TatianaLopaeva
6c4329f9c7
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-12 13:10:26 +03:00
TatianaLopaeva
b68487716b
Web: Added translation for setting at Nav.
2021-03-12 13:09:58 +03:00
Alexey Kostenko
91b5fc5795
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-12 12:50:25 +03:00
TatianaLopaeva
dd92aa049f
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-12 12:06:32 +03:00
TatianaLopaeva
43d7f6ba68
Web: Fix translation.
2021-03-12 12:05:12 +03:00
Alexey Kostenko
16eca008cd
Web: Client: Added bodyLoader to accessRights page
2021-03-12 11:54:53 +03:00
Artem Tarasov
7846f41a06
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-12 10:12:12 +03:00
Viktor Fomin
ca4727978c
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-12 00:14:08 +03:00
Viktor Fomin
59aa9ccd8f
Web: Client: hide header in editor
2021-03-12 00:14:00 +03:00
Artem Tarasov
63f1e788ad
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-11 21:14:21 +03:00
Artem Tarasov
96271b4dfb
Web: Components/Client: changed the way of passing elements to TabContainer component
2021-03-11 13:43:54 +03:00
TatianaLopaeva
749e028beb
Web: Layout: Fixed displaying of article.
2021-03-11 13:12:35 +03:00
TatianaLopaeva
9362f3cd2d
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-11 10:20:25 +03:00
TatianaLopaeva
1afbcc0009
Web: Settings: Added top loading indicator.
2021-03-11 10:19:56 +03:00
392984ded3
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-10 19:33:18 +03:00
f0829f059d
Webpack: Fix loading react.svg
2021-03-10 19:33:10 +03:00
970ec1eecf
Web: Login: Modified production build
2021-03-10 19:24:15 +03:00
bac65c6744
Web: Client: Modified production build
2021-03-10 18:31:21 +03:00
6db29575b1
Web: Editor: Modified production build
2021-03-10 18:27:40 +03:00
Alexey Kostenko
26a4d5e4cf
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-10 13:41:02 +03:00
Alexey Kostenko
960342236d
Web: Client: Fixed transition from documents to settings
2021-03-10 13:40:39 +03:00
Viktor Fomin
585dbf3680
Web: fixed loader
2021-03-10 11:27:20 +03:00
40c7261fb1
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-10 10:36:14 +03:00
f962a2737b
Web: Remove slash
2021-03-10 10:35:43 +03:00
Viktor Fomin
9d06a6618a
Web: Client: change loader
2021-03-09 19:36:15 +03:00
b33b4990d1
Web: Login: fix register empty render
2021-03-09 13:58:03 +03:00
2a5a78bc74
Web: Packages: stable versions
2021-03-06 21:46:04 +03:00
20ef359023
Web: Restored package
2021-03-06 21:09:12 +03:00
fd05ceba27
Web: Editor: Upgrade dependencies
2021-03-06 18:54:32 +03:00
a8a55167eb
Web: Editor: Optimization
2021-03-06 18:50:06 +03:00
c96e783eab
Web: Added new @appserver/editor app
2021-03-05 21:15:48 +03:00
b65d83cc01
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-05 17:42:04 +03:00
32b8c7f6fe
Web: Fixed login work
2021-03-05 17:41:55 +03:00
TatianaLopaeva
289f749288
Web: About: Fix translation.
2021-03-05 14:24:34 +03:00
877016d8e3
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-05 12:41:08 +03:00
TatianaLopaeva
5412f7b860
Web: NavMenu: Fixed icon path, deleted useless icons from modules.
2021-03-05 11:09:23 +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
TatianaLopaeva
b64736c363
Web: Added translation to PeopleSelector.
2021-03-04 14:57:48 +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
Alexey Kostenko
b3a3851d68
Web: Client: Fixed the transition from the people module to the documents module
2021-03-03 19:17:00 +03:00
8e1d5fb0b4
Web: webpack: changed devtool
2021-03-03 17:58:16 +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
TatianaLopaeva
7b0faa4747
Web: Moved Main into the Web Client.
2021-03-03 13:02:56 +03:00
TatianaLopaeva
d6cf286cd0
Web: Moved Layout to the Web Client.
2021-03-03 12:47:28 +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
d6f593e4d4
Web: Fixed loading NavMenu translations on different pages
2021-03-02 20:21:37 +03:00
bf7f680d08
Web: Moved NavMenu to Web Client
2021-03-02 18:25:20 +03:00
b9ad73b9ce
Web: Added useful imports
2021-03-01 22:59:47 +03:00
94708ed455
Web: Fixed opening /products/(files|people) with /filter (or profile) + proxy
2021-03-01 22:48:48 +03:00
8a6afa8111
Web: Fixed load source maps
2021-03-01 18:21:40 +03:00
79cb70bc1f
Web: Added opportunity to load people page by primary link
2021-03-01 17:00:54 +03:00
Ilya Oleshko
c618740db1
Merge branch 'master' into develop
2021-03-01 16:46:32 +03:00
0cf1150288
Web: Added opportunity to load files page by primary link
2021-03-01 16:29:37 +03:00
Ilya Oleshko
0c1689bec5
Bump version to v0.0.10
2021-03-01 16:27:21 +03:00
Ilya Oleshko
66bb7567aa
web: common: bump version
2021-03-01 16:25:52 +03:00
Ilya Oleshko
cb861508d3
Web: Common: Added getting api url from package.json, fixed "hardcode" from api client.
2021-03-01 16:25:41 +03:00
d280a6dca7
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-01 15:29:00 +03:00
b9b4c4b1e2
Web: Added opportunity to load login page by primary link
2021-03-01 15:28:51 +03:00
Viktor Fomin
6dd4847ea9
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-01 15:16:17 +03:00
Viktor Fomin
149e44b088
Web: Client: fixed loader width
2021-03-01 15:16:09 +03:00
Vladislav Makhov
628916a1c1
web: people: fix svg import
2021-03-01 11:56:11 +03:00
TatianaLopaeva
b8fabd5de0
Update webpack.config for fix displaying of icons.
2021-02-28 21:59:50 +03:00
TatianaLopaeva
5ac0124640
Upgrade version of react-svg to remove additional wrapper and fix problem with displaying icons.
2021-02-28 21:39:50 +03:00
TatianaLopaeva
c52680d4c8
Web: Settings: Fix displaying of icons.
2021-02-28 21:25:14 +03:00
693a633dee
fix auth via password
2021-02-26 22:32:03 +03:00
Viktor Fomin
604ff5d925
Web: Client: added loading shell
2021-02-26 16:49:55 +03:00
TatianaLopaeva
ca0c86f2d4
Web/Common: Fix active title of menu, fix transition without redirect.
2021-02-26 13:50:20 +03:00
96c4d63abe
Web: Fixed Files opening + added devtool: "inline-source-map"
2021-02-26 12:02:54 +03:00
Artem Tarasov
904813031b
Web; People/Files/Login: fix imports
2021-02-26 00:19:04 +03:00
Artem Tarasov
7af174ca65
Web: Client: fix imports
2021-02-26 00:17:25 +03:00
Artem Tarasov
48b3c6b445
Web: Common: fix after merge, fix imports and hierarchy
2021-02-25 17:20:11 +03:00
Artem Tarasov
69ed46e8ae
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# products/ASC.People/Client/src/components/Article/Body/index.js
# web/ASC.Web.Login/src/Login.jsx
2021-02-25 15:27:36 +03:00
Artem Tarasov
989fba5ecc
Web: applied new import from appserver/common
2021-02-25 15:22:53 +03:00
55a4a53bbc
Web: Fixed 404 error on translation.json loading
2021-02-25 12:25:16 +03:00
b25dd2d6e2
.net 5
2021-02-25 12:02:28 +03:00
35a4eca247
Web: Login: Fixed translation
2021-02-25 11:44:46 +03:00
4a40c8f894
Fix dependencies
2021-02-25 10:29:57 +03:00
36f6feec83
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-02-24 20:26:01 +03:00
471dcb1de7
Removed useless import
2021-02-24 20:25:54 +03:00
72675eb198
Web: Client: Simplified imports
2021-02-24 20:24:38 +03:00
Artem Tarasov
69dd27fac7
Web: applied new import from appserver/components
2021-02-24 20:11:23 +03:00
507fadff55
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
# packages/asc-web-common/src/store/auth/selectors.js
# packages/asc-web-components/src/components/icons/svg/index.js
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/BadgesFileTile.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/ConnectedClouds.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/linkRow.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/ShareButton.js
# products/ASC.People/Client/src/components/Article/Body/index.js
# products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/userContent.js
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
# yarn.lock
2021-02-24 10:57:03 +03:00
34d9eed580
Merge branch 'develop' into feature/workspaces
...
# Conflicts:
# packages/asc-web-common/src/components/GroupSelector/GroupSelector.stories.js
# packages/asc-web-common/src/components/NavMenu/sub-components/header-nav.js
# packages/asc-web-common/src/components/NavMenu/sub-components/header.js
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-logo-item.js
# packages/asc-web-common/src/components/PageLayout/index.js
# packages/asc-web-common/src/components/PeopleSelector/PeopleSelector.stories.js
# packages/asc-web-common/src/components/PrivateRoute/PrivateRoute.js
# packages/asc-web-common/src/store/AuthStore.js
# packages/asc-web-common/src/store/ModuleStore.js
# packages/asc-web-common/src/store/SettingsStore.js
# packages/asc-web-common/src/store/UserStore.js
# packages/asc-web-common/src/store/auth/actions.js
# packages/asc-web-common/src/store/auth/index.js
# packages/asc-web-common/src/store/auth/reducer.js
# packages/asc-web-common/src/store/auth/selectors.js
# products/ASC.Files/Client/config-overrides.js
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
# products/ASC.Files/Client/src/components/Article/Body/index.js
# products/ASC.Files/Client/src/components/Article/Header/index.js
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
# products/ASC.Files/Client/src/components/dialogs/ConnectDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/ConvertDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DeleteThirdPartyDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/EmptyTrashDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/ThirdPartyMoveDialog/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/BadgesFileTile.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Paging/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/ConnectedClouds.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
# products/ASC.Files/Client/src/components/panels/AddGroupsPanel/index.js
# products/ASC.Files/Client/src/components/panels/AddUsersPanel/index.js
# products/ASC.Files/Client/src/components/panels/ChangeOwnerPanel/index.js
# products/ASC.Files/Client/src/components/panels/EmbeddingPanel/index.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/ShareButton.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/index.js
# products/ASC.Files/Client/src/components/panels/VersionHistoryPanel/index.js
# products/ASC.Files/Client/src/helpers/desktop.js
# products/ASC.Files/Client/src/helpers/i18n.js
# products/ASC.Files/Client/src/helpers/utils.js
# products/ASC.Files/Client/src/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/src/store/files/reducers.js
# products/ASC.Files/Client/src/store/rootReducer.js
# products/ASC.People/Client/config-overrides.js
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/App.js
# products/ASC.People/Client/src/components/Article/Body/index.js
# products/ASC.People/Client/src/components/Article/Header/index.js
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/components/dialogs/ChangeEmailDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangePasswordDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangePhoneDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangeUserStatusDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangeUserTypeDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DataLossWarningDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DeleteProfileEverDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DeleteSelfProfileDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DeleteUsersDialog/index.js
# products/ASC.People/Client/src/components/dialogs/InviteDialog/index.js
# products/ASC.People/Client/src/components/dialogs/SendInviteDialog/index.js
# products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/GroupAction/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/userContent.js
# products/ASC.People/Client/src/components/pages/Home/Section/Filter/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Paging/index.js
# products/ASC.People/Client/src/components/pages/Home/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Profile/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/avatarEditorPage.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createAvatarEditorPage.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.People/Client/src/components/pages/ProfileAction/index.js
# products/ASC.People/Client/src/components/pages/Reassign/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Reassign/index.js
# products/ASC.People/Client/src/helpers/i18n.js
# products/ASC.People/Client/src/helpers/utils.js
# products/ASC.People/Client/src/index.js
# products/ASC.People/Client/src/store/people/reducers.js
# products/ASC.People/Client/src/store/portal/actions.js
# products/ASC.People/Client/src/store/portal/reducers.js
# products/ASC.People/Client/src/store/profile/actions.js
# products/ASC.People/Client/src/store/profile/selectors.js
# products/ASC.People/Client/src/store/rootReducer.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/config-overrides.js
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/components/pages/About/index.js
# web/ASC.Web.Client/src/components/pages/Confirm/index.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateEmail.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateUser.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/Confirm/sub-components/changePhone.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/profileRemove.js
# web/ASC.Web.Client/src/components/pages/Home/index.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/index.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/advantagesContainer.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/buttonContainer.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/contactContainer.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/headerContainer.js
# web/ASC.Web.Client/src/components/pages/Settings/Layout/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/custom-titles.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/language-and-time-zone.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/whitelabel.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerModalDialog.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/thirdPartyServicesSettings.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/accessRights.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/modules.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/owner.js
# web/ASC.Web.Client/src/components/pages/ThirdParty/index.js
# web/ASC.Web.Client/src/components/pages/Wizard/index.js
# web/ASC.Web.Client/src/helpers/confirmRoute.js
# web/ASC.Web.Client/src/helpers/i18n.js
# web/ASC.Web.Client/src/helpers/utils.js
# web/ASC.Web.Client/src/index.js
# web/ASC.Web.Client/src/store/confirm/actions.js
# web/ASC.Web.Client/src/store/payments/actions.js
# web/ASC.Web.Client/src/store/settings/reducer.js
# web/ASC.Web.Client/src/store/settings/selectors.js
# web/ASC.Web.Client/src/store/store.js
# web/ASC.Web.Client/src/store/wizard/actions.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
# web/ASC.Web.Login/src/Login.jsx
# web/ASC.Web.Login/src/sub-components/register-container.js
# yarn.lock
2021-02-24 10:30:42 +03:00
TatianaLopaeva
3e3b079b5a
Web: Components: Deleted useless Icons component.
2021-02-23 22:14:42 +03:00
846af80668
Update react-script and yarn.lock files
2021-02-23 15:56:29 +03:00
5807e0c402
web: common: bump version
2021-02-23 12:50:20 +03:00
7c4c0bd1ce
web: components: bump version
2021-02-23 12:49:56 +03:00
d270048827
Web: Removed commented code
2021-02-23 12:46:33 +03:00
f5d1b6fc2b
Web: Common: Removed redux + fixed storybook start
2021-02-23 12:46:01 +03:00
ef067c6040
Web: Client: Moved translations to public folder
2021-02-23 12:10:31 +03:00
63584c3cc4
Web: Fixed displaying version
2021-02-23 12:06:59 +03:00
c32a2b64dc
Web: Client: Fixed open third-party dialog
2021-02-23 12:01:29 +03:00
7fc22ca874
Web: Fixed cast to boolean
2021-02-23 12:00:44 +03:00
09a600b042
Web: Client: Added config
2021-02-23 11:59:24 +03:00
b9a8f7b178
Web: Common: fixed getting modules
2021-02-20 20:17:27 +03:00
TatianaLopaeva
f3efd89bfc
Web: Added Setting Routing.
2021-02-20 18:41:26 +03:00
TatianaLopaeva
5fdb5c8508
Web: Fix not displaing of icons.
2021-02-20 18:25:46 +03:00
TatianaLopaeva
1f8fd0a9db
Web: Added styles for icons. Added common icons styles.
2021-02-20 17:54:12 +03:00
6c80ebdff0
Merge branch 'develop' into feature/mobx
...
# Conflicts:
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
# products/ASC.People/Client/src/App.js
# products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Home/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Profile/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/index.js
# products/ASC.People/Client/src/store/group/actions.js
# products/ASC.People/Client/src/store/people/actions.js
# products/ASC.People/Client/src/store/people/selectors.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/components/pages/About/index.js
# web/ASC.Web.Client/src/components/pages/Home/index.js
# web/ASC.Web.Client/src/store/settings/actions.js
# web/ASC.Web.Common/src/components/Layout/index.js
# web/ASC.Web.Common/src/components/NavMenu/index.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/header-nav.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/header-unauth.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/header.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/nav-item.js
# web/ASC.Web.Common/src/components/PageLayout/index.js
# web/ASC.Web.Common/src/store/auth/actions.js
# web/ASC.Web.Common/src/store/auth/reducer.js
# web/ASC.Web.Common/src/store/auth/selectors.js
# web/ASC.Web.Components/src/components/loader/types/rombs.js
2021-02-20 17:31:58 +03:00
Artem Tarasov
98d1fb376d
Web: LoginMobile: module moved to experimental
2021-02-20 13:41:59 +03:00
TatianaLopaeva
5d26bd5670
Web: Downgrade rc-tree package.
2021-02-20 13:19:01 +03:00
Artem Tarasov
a0badb257a
Web: LoginMobile: fixed condition for empty pass
2021-02-20 12:52:54 +03:00
TatianaLopaeva
b625eb3647
Web: Home: Revert file changes.
2021-02-20 11:53:29 +03:00
TatianaLopaeva
7023cf5f3a
Web: Transferring icons from a shared folder to modules. Icons are displayed by url.
2021-02-20 11:46:32 +03:00
a0ce9e0dc5
Merge branch 'develop' into feature/not-implemented-page
2021-02-20 11:35:52 +03:00
TatianaLopaeva
30d4c580ac
Web: Added ThemeProvider to the App.
2021-02-20 10:59:40 +03:00
Artem Tarasov
5983dc1e1d
Web: LoginMobile: refactoring, added checking value inside Fields
2021-02-20 03:04:51 +03:00
Artem Tarasov
e72cfce70e
Web: Login/Mobile: added translate
2021-02-20 03:03:13 +03:00
Artem Tarasov
c5cac001c8
Web: LoginMobile: added validation of pass for registration-form
2021-02-20 02:56:59 +03:00
87b1108147
Web: Turned debug in i18n
2021-02-19 21:59:33 +03:00
19c7104d3d
Web: Removed useless dev packages + fixed warnings of building
2021-02-19 20:51:44 +03:00
85a500eac6
Web: Client: Simplified translation
2021-02-19 20:26:41 +03:00
Artem Tarasov
1c42ea4165
Web: LoginMobile: refactoring fields
2021-02-19 20:14:54 +03:00
Artem Tarasov
993384c781
Web: LoginMobile: added RegistrationForm
2021-02-19 20:13:39 +03:00
e97ba3a8b3
Web: People: Simplified translation
2021-02-19 19:27:13 +03:00
bc30b1311e
Auth by thirdparty
2021-02-19 19:16:08 +03:00
Artem Tarasov
feba30cb34
Web: LoginMobile: refactoring
2021-02-19 14:06:38 +03:00
Artem Tarasov
6da8c9c0c4
Web: LoginMobile: components refactoring
2021-02-19 13:54:33 +03:00
Artem Tarasov
3070bb1a78
Web: LoginMobile: added TextField
2021-02-19 13:53:56 +03:00
Artem Tarasov
554ebc9d02
Web: LoginMobile: added Main component, refactoring
2021-02-19 13:53:12 +03:00
Ilya Oleshko
1c01c3ce3a
Web: Client: Fixed style for learn more links
2021-02-19 13:26:09 +03:00
Ilya Oleshko
fb25c6adf6
web: common: bump version
2021-02-19 13:22:06 +03:00
Ilya Oleshko
d8d850b089
Web: Client: Open app link allowed only for IOS devices, added learn more links
2021-02-19 13:21:33 +03:00
Ilya Oleshko
e49a502e9a
Web: Common: Added originUrl and helpUrl for modules, added description for dummy modules
2021-02-19 13:20:17 +03:00
Ilya Oleshko
6325ea33f7
web: common: bump version
2021-02-19 11:17:48 +03:00
Ilya Oleshko
38ef5a69bd
Web: Common: Changed position of settings element inside NavMenu
2021-02-19 11:17:37 +03:00
Ilya Oleshko
ebc6d5942e
Web: Client: Changed main container for ComingSoonPage at desktop version
2021-02-19 10:53:04 +03:00
Ilya Oleshko
fcf70b711a
web: common: bump version
2021-02-18 16:38:14 +03:00
Ilya Oleshko
9e95383d63
Web: Common: Fixed of modules order. Added new style for NavItem separator.
2021-02-18 16:38:07 +03:00
Ilya Oleshko
b53557cedc
Merge branch 'develop' into feature/not-implemented-page
2021-02-18 15:56:39 +03:00
Ilya Oleshko
1e10146d3c
web: common: bump version
2021-02-18 15:55:34 +03:00
Ilya Oleshko
cb72f2241b
Web: Added product version badge
2021-02-18 15:55:26 +03:00
Ilya Oleshko
07077ee655
Web: Common: Removed unused property
2021-02-18 15:53:42 +03:00
f36d05ccf4
Web: Fixed work process
2021-02-18 15:52:13 +03:00
Artem Tarasov
3b7ce182ed
Web: LoginMobile: refactoring EmailField, change validation
2021-02-18 14:13:55 +03:00
Artem Tarasov
8b99bf92bb
Web: LoginMobile: layout fix
2021-02-18 14:13:14 +03:00
Artem Tarasov
cd6f4c36e2
Web: LoginMobile: deleted fakeHash
2021-02-18 14:11:21 +03:00
Artem Tarasov
4f949a4e39
Web: LoginMobile: Layout fix
2021-02-18 11:54:04 +03:00
d81b0fd770
Web: Files: fixed treeFolders
2021-02-18 11:23:03 +03:00
Artem Tarasov
ad790e56db
Web: LoginMobile: added title in Registration component
2021-02-18 01:19:53 +03:00
Artem Tarasov
0d28c30636
Web: LoginMobile: replace Header
2021-02-18 00:19:17 +03:00
Artem Tarasov
302e9abe8f
Web: LoginMobile: refactorung, added Router
2021-02-18 00:01:49 +03:00
ca166e3c66
Web: People: Move from redux to mobx completely
2021-02-17 17:53:18 +03:00
Artem Tarasov
5e8293023b
Web: LoginMobile: refactoring
2021-02-17 15:15:59 +03:00
7da0b78e48
CustomingNamingPeople: fix
2021-02-16 21:45:17 +03:00
Ilya Oleshko
d818d2272c
Web: Client: Added new coming soon module page, fixed route, added translations
2021-02-16 16:11:49 +03:00
Ilya Oleshko
81f2458f94
Web: Common: Pages: Restored default coming soon error page
2021-02-16 16:10:46 +03:00
Artem Tarasov
5d6b66e295
Web: LoginMobile: added title for Login page
2021-02-16 13:45:28 +03:00
Artem Tarasov
0b521f6b48
Web: LoginMobile: added Header to App
2021-02-16 13:31:24 +03:00
Artem Tarasov
0298249ab4
Web: LoginMobile: added header
2021-02-16 13:30:35 +03:00
Ilya Oleshko
d204c9b6de
Merge branch 'develop' into feature/not-implemented-page
2021-02-16 13:22:34 +03:00
Artem Tarasov
42cb830a84
Web: LoginMobile: added custim.scss, changed webpack config (alias)
2021-02-16 12:48:35 +03:00
52c9e4daac
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
...
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
2021-02-16 12:16:13 +03:00
a1fc390bc2
Web: Files: created formatsStore
2021-02-16 12:01:51 +03:00
Artem Tarasov
b6882bb381
Web: LoginMobile: added module LoginMobile
2021-02-16 11:00:24 +03:00
722e04b458
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
...
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
# products/ASC.Files/Client/src/components/dialogs/ConnectDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/ConvertDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DeleteThirdPartyDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/ConnectedClouds.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Settings/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/components/panels/ChangeOwnerPanel/index.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/index.js
# products/ASC.People/Client/src/components/pages/Home/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
2021-02-15 23:03:15 +03:00
0b9a258f91
Web: Client: Moved to MobX
2021-02-15 22:43:07 +03:00
68910bfa04
Web: Files: removed redux provider from files
2021-02-15 15:11:26 +03:00
Ilya Oleshko
f2f2fbc07c
Merge branch 'develop' into feature/not-implemented-page
2021-02-15 10:58:34 +03:00
Artem Tarasov
99433c8539
Web: Common: FilterInput: fixed a bug with displaying an item in a hidden and open view at hte same time
2021-02-12 19:05:15 +03:00
Artem Tarasov
6024432747
Web: Components: backdrop: fixed ability to click on content behind the backdrop
2021-02-12 17:47:54 +03:00
Artem Tarasov
c7eb879ea6
web: components: bump version
2021-02-12 16:05:01 +03:00
Artem Tarasov
85be7db0f9
Web: Components: backdrop: fixed inability to close backdrop when tapping
2021-02-12 15:48:15 +03:00
Artem Tarasov
4e0e085bed
web: common: bump version
2021-02-12 13:10:53 +03:00
Artem Tarasov
1ddc2c951a
Merge branch 'develop' into feature/empty-group
...
# Conflicts:
# web/ASC.Web.Common/package.json
2021-02-12 13:10:41 +03:00
Artem Tarasov
22a33cd21b
Web: Common: PeopleSelector: deleted console.log
2021-02-12 13:08:54 +03:00
Artem Tarasov
5646ae7f7a
Web: Common: FilterInput: fixed changing the order of items in the filter when changing or adding PeopleSelector/GroupSelector
2021-02-12 13:08:28 +03:00
b09a9dc96c
Web: Common: Fixed NavMenu click
2021-02-12 10:31:54 +03:00
Artem Tarasov
95d6cd7185
Web: Common: FilterInput: added a function to check the order of elements
2021-02-11 16:51:42 +03:00
Ilya Oleshko
093ffd843c
web: components: bump version
2021-02-11 14:45:25 +03:00
Ilya Oleshko
30813be44a
Web: Components: Icons: Restored services icons after merge
2021-02-11 14:44:40 +03:00
1b585934ec
Studio: fix loginproviders
2021-02-11 12:40:30 +03:00
Viktor Fomin
60032dff9b
web: common: bump version
2021-02-08 16:03:52 +03:00
Viktor Fomin
e1292c0c1c
Web: Common: fixed padding
2021-02-08 15:56:15 +03:00
Viktor Fomin
4c50ae4eb5
Web: Common: fixed padding
2021-02-08 15:45:35 +03:00
Viktor Fomin
4d1beb69dc
Web: Common: fixed article header height
2021-02-08 15:15:27 +03:00
Viktor Fomin
45603744db
Web: Common: fixed padding
2021-02-08 14:38:50 +03:00
Viktor Fomin
8e177e4c1b
Web: Common: fix
2021-02-08 14:06:30 +03:00
fb6b345734
Web: Client: Fixed setDocumentTitle
2021-02-05 14:22:26 +03:00
2f60d7f355
Web: Refactoring: simplified moduleStore
2021-02-05 14:21:52 +03:00
Artem Tarasov
7a0c6ef772
Web: Components/Common: loader/PeopleSelector: fixed required passing of width and height props for Loader, removed console.log() in PeopleSelector
2021-02-05 13:47:17 +03:00
Artem Tarasov
89a21a6fca
Web: People/Common: fixed group reselect when exiting empty group editor, removed console.log() and unused code
2021-02-05 13:23:59 +03:00
91d07ca362
Web: Common: Removed comments
2021-02-05 11:29:19 +03:00
Artem Tarasov
b2ee7251b7
Web: Common: PeopleSelector: added the ability to send a list of groups to PeopleSelector without calling api
2021-02-04 17:32:28 +03:00
9413ea871a
Web: Files: moved App from redux to mobx
2021-02-04 12:52:43 +03:00
Viktor Fomin
1eb397e47d
web: common: bump version
2021-02-04 12:49:35 +03:00
Viktor Fomin
de3924c08b
Web: Common: fixed headline style
2021-02-04 12:49:21 +03:00
Artem Tarasov
7f972e615f
web: common: bump version
2021-02-04 11:06:33 +03:00
Artem Tarasov
b61d51fc31
web: components: bump version
2021-02-04 11:06:24 +03:00
Vladislav Makhov
4c3eb6622e
web: add properties to settings store
2021-02-03 17:34:26 +03:00
Artem Tarasov
5eef56b5d4
Web: People/Common: added and applied a method to request complete information for all groups
2021-02-03 17:25:13 +03:00
b9c2074fc4
Web: Settings fix key mapping
2021-02-03 17:06:47 +03:00
670ba9c4be
Web: Rewritten asc-web-common to mobx
2021-02-03 15:42:47 +03:00
Artem Tarasov
ecce59a4ff
Web: Common/People: Filter: renamed method resetWithoutGroup to reset'
2021-02-02 20:12:38 +03:00
Artem Tarasov
4eebd79dec
Web: Common: Filter: fixed resetting the order of blocks in the filter
2021-02-02 20:09:08 +03:00
560133f82c
Web: replaced components wrapper to mobx inject
2021-02-02 19:17:33 +03:00
2a79d8bb8d
Web: Moved code to AuthStore usage
2021-02-02 17:26:58 +03:00
Artem Tarasov
9ae026d23b
Web: Common: Filter: fixed unnecessary renders of Filter Component, fixed bugs with filter reset and navigation
2021-02-02 16:46:30 +03:00
Artem Tarasov
b2aac3838c
Web: People/Files/Common: Filter: fixed default value for Search
2021-02-02 16:35:06 +03:00
70c22c9d33
Web: Changes to AuthStore
2021-02-02 12:55:14 +03:00
Vladislav Makhov
26cdc94f1c
Merge branch 'feature/mobx' of github.com:ONLYOFFICE/AppServer into feature/mobx
...
# Conflicts:
# products/ASC.Files/Client/src/App.js
# products/ASC.People/Client/src/App.js
2021-02-02 10:43:37 +03:00
Vladislav Makhov
25e58bcdf3
web: add provider
2021-02-02 10:23:00 +03:00
f8e6a72460
Web: Changed work with settings data from redux to mobx
2021-02-02 09:48:57 +03:00
157c97ded7
Merge branch 'feature/mobx' of https://github.com/ONLYOFFICE/AppServer into feature/mobx
2021-02-01 20:33:51 +03:00
0577bb635d
Web: People: Changed work with user data from redux to mobx
2021-02-01 20:33:39 +03:00
TatianaLopaeva
af96aaf2b3
Web: Changed imports.
2021-02-01 16:10:02 +03:00
Vladislav Makhov
0c72a6a140
web: add mobx provider
2021-02-01 14:01:09 +03:00
Vladislav Makhov
de88da2fa7
Web: Changed work with user data from redux to mobx
2021-02-01 11:45:26 +03:00
Artem Tarasov
e791db684c
Web: Common: Filter: fixed value flickering in filter
2021-01-30 02:27:48 +03:00
f91ce2390b
Web: Changed work with modules from redux to mobx
2021-01-29 18:06:02 +03:00
TatianaLopaeva
ddab131a90
Web: Deleted useless import.
2021-01-29 17:41:35 +03:00
TatianaLopaeva
cf65b86b22
Web: Added Payments Routing.
2021-01-29 17:39:26 +03:00
9841b2ef1f
Web: Added mobx and mobx-react packages
2021-01-29 17:17:58 +03:00
Artem Tarasov
ddc6aeac40
Web: People/Common: Filter: added a method to the filter to reset the state (except for the currnent group and sort)
2021-01-29 16:46:14 +03:00
652c7bd906
Merge branch 'develop' into feature/workspaces
...
# Conflicts:
# packages/asc-web-common/src/components/Layout/MobileLayout.js
# packages/asc-web-common/src/components/Layout/ScrollToTop.js
# packages/asc-web-common/src/components/Layout/context.js
# packages/asc-web-common/src/components/Layout/index.js
# packages/asc-web-common/src/components/NavMenu/index.js
# packages/asc-web-common/src/components/NavMenu/sub-components/header-nav.js
# packages/asc-web-common/src/components/PageLayout/index.js
# packages/asc-web-common/src/components/PageLayout/sub-components/article.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section-header.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section.js
# packages/asc-web-components/src/components/icons/svg/button.cancel.react.svg
# packages/asc-web-components/src/components/icons/svg/clear.active.react.svg
# packages/asc-web-components/src/components/icons/svg/load.error.react.svg
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/App.js
# products/ASC.People/Client/src/components/pages/Profile/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/index.js
# 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.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
# yarn.lock
2021-01-29 16:39:00 +03:00
8a9bd141a5
Web: Added Error404 routing
2021-01-29 13:22:41 +03:00
Ilya Oleshko
8226d9185c
Merge branch 'develop' into feature/not-implemented-page
2021-01-29 12:38:22 +03:00
b0e8b9c6af
Bump version to v0.0.10
2021-01-29 11:13:27 +03:00
TatianaLopaeva
7730e43f5a
web: common: bump version
2021-01-28 16:27:35 +03:00
TatianaLopaeva
55b408a323
web: components: bump version
2021-01-28 16:27:11 +03:00
TatianaLopaeva
754a790d3f
Web: Common: Deleted useless import.
2021-01-28 16:23:56 +03:00
TatianaLopaeva
6782af330e
Web: Common: Deleted commented code.
2021-01-28 16:22:03 +03:00
TatianaLopaeva
a22e262310
Update yarn lock files
2021-01-28 16:18:22 +03:00
TatianaLopaeva
7ca066cea9
Web: Components: Added react device detect package
2021-01-28 16:17:36 +03:00
0b79d24b38
web: common: bump version
2021-01-28 15:08:55 +03:00
6dd906248a
web: components: bump version
2021-01-28 15:08:01 +03:00
ca5e60837b
Merge branch 'feature/fix-hide/show-header' of https://github.com/ONLYOFFICE/AppServer into feature/fix-hide/show-header
2021-01-28 15:07:48 +03:00
d2da68badf
Web: Common: fixed backdrop closing
2021-01-28 15:07:38 +03:00
TatianaLopaeva
3d0ad401e3
Web: Common: Fixed the problem with backdrop.
2021-01-28 14:45:57 +03:00
a5727795fc
web: components: bump version
2021-01-27 19:29:19 +03:00
666a390f13
Merge branch 'feature/fix-hide/show-header' of https://github.com/ONLYOFFICE/AppServer into feature/fix-hide/show-header
2021-01-27 19:28:45 +03:00
680622218e
Web: Components: fixed double opening of context menu for desktops
2021-01-27 19:28:34 +03:00
Artem Tarasov
93e6777b27
Merge branch 'develop' into feature/fix-hide/show-header
...
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/index.js
# web/ASC.Web.Common/src/components/PageLayout/index.js
# web/ASC.Web.Components/package.json
2021-01-27 18:03:12 +03:00
Viktor Fomin
32bfef070e
Update yarn.lock files
2021-01-27 17:23:40 +03:00
Viktor Fomin
93753dc753
web: common: bump version
2021-01-27 17:19:15 +03:00
Viktor Fomin
b0763ae1de
web: components: bump version
2021-01-27 17:19:07 +03:00
Viktor Fomin
6e6d706b23
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/upload-panel
2021-01-27 16:09:59 +03:00
Ilya Oleshko
0efe6140c9
web: common: bump version
2021-01-27 13:57:15 +03:00
Ilya Oleshko
5037c2210e
Web: Common: Selectors: Fixed module wrapper, if dummy module comes from api.
2021-01-27 13:57:04 +03:00
Ilya Oleshko
bd38b065cb
Web: Common: Api: Get modules with info
2021-01-27 13:55:31 +03:00
TatianaLopaeva
0cf5c0e39f
Web:Common: ScrollToTop component refactoring.
2021-01-27 11:09:28 +03:00
436bf7a06e
Web: People: Added routes
2021-01-27 10:31:29 +03:00
Artem Tarasov
8829da29b0
Web: Common: Layout: fixed recalculation of height in Safari for large tablets
2021-01-26 20:20:21 +03:00
TatianaLopaeva
943015a8d6
Web: Fixed after merge.
2021-01-26 18:59:19 +03:00
TatianaLopaeva
951961ad35
Web: Refactoring.
2021-01-26 18:21:50 +03:00
Artem Tarasov
7bd819a1ae
Merge branch 'feature/fix-hide/show-header' of github.com:ONLYOFFICE/AppServer into feature/fix-hide/show-header
2021-01-26 16:29:06 +03:00
3efedf74eb
Web: Fixed routing on Module link
2021-01-26 16:28:51 +03:00
Artem Tarasov
8082be3eb4
Web: Common: Layout: fixed page height for large tablets
2021-01-26 16:28:45 +03:00
TatianaLopaeva
99162c3c2a
Web: Common: PageLayout: Deleted useless condition.
2021-01-26 16:25:53 +03:00
TatianaLopaeva
3ccf73adb7
Web: Common: PageLayout: Fixed margin top for Ipad.
2021-01-26 15:41:03 +03:00
TatianaLopaeva
40d94e48e5
Web: Common: PageLayout: Changed the height of section header for Ipad.
2021-01-26 15:06:02 +03:00
TatianaLopaeva
d8a17e6443
Web: Common: PageLayout: Added the condition for margin top for Ipad.
2021-01-26 14:39:44 +03:00
TatianaLopaeva
2b8dfc80e9
Web: Common/Files/People: Fixed "jumps" when go to the next page.
2021-01-26 13:50:29 +03:00
36c7a171df
Web: Fixed load/unload People store
2021-01-26 13:36:05 +03:00
f0e227731f
Fixed loading products, lazy loading webitemmanager
2021-01-26 12:29:50 +03:00
b9ed789746
Web: Applied WP:ModuleFederation best practices
2021-01-26 00:55:46 +03:00
Artem Tarasov
4165af21ea
web: components: bump version
2021-01-25 19:41:07 +03:00
Artem Tarasov
d2e930a4a1
Web: Components: Backdrop: fixed the ability to scroll the page when the backdrop is active
2021-01-25 19:40:52 +03:00
64655a7da0
Api: modules. Added info method
2021-01-25 17:37:26 +03:00
Artem Tarasov
3c815511ac
Web: Common: Layout: fixed the ability to scroll the page when the dropdown is open
2021-01-25 16:34:56 +03:00
Ilya Oleshko
83ae407486
web: common: bump version
2021-01-25 15:03:20 +03:00
Ilya Oleshko
f95d9ea71f
Web: Common: Pages: ComingSoon: Added to title product name
2021-01-25 15:03:07 +03:00
Ilya Oleshko
d803f4a45b
web: common: bump version
2021-01-25 14:31:42 +03:00
Ilya Oleshko
1f5e6ab1f4
Web: Common: Selectors: Added missing props, fixed icons route
2021-01-25 14:31:34 +03:00
Ilya Oleshko
1eefebb69b
Web: Common: NavMenu: Beta badge only for menu icon
2021-01-25 14:30:36 +03:00
Ilya Oleshko
9f3d803af5
Web: Client: Fixed modules list
2021-01-25 14:29:42 +03:00
Ilya Oleshko
e486a7919a
Web: Fixed modules icons
2021-01-25 14:28:51 +03:00
Ilya Oleshko
f96a168b55
Web: Client: Added talk route, removed community
2021-01-25 14:27:49 +03:00
Ilya Oleshko
8a31b1d6d1
web: common: bump version
2021-01-25 12:49:28 +03:00
Ilya Oleshko
4df2c8d8b0
Web: Common: Selectors: Fixed inserting for dummy modules, added dummy community module
2021-01-25 12:49:15 +03:00
Ilya Oleshko
fe12c8f7d4
Web: Client: Home: Added selectors usage
2021-01-25 12:48:00 +03:00
Ilya Oleshko
bf0d15546e
Web: Client: Added redirect to coming soon page for community route
2021-01-25 12:47:18 +03:00
Ilya Oleshko
253d48b53c
Web: Restored default page, fixed infinite redirect loop on home page
2021-01-25 11:57:15 +03:00
Ilya Oleshko
6c5f58c351
web: common: bump version
2021-01-25 11:44:29 +03:00
Ilya Oleshko
6515b8c9ef
Web: Common: Selectors: Added dummy modules to module selector
2021-01-25 11:44:07 +03:00
Ilya Oleshko
554e16d47d
Web: Client: Added redirect to coming soon page for new dummy modules
2021-01-25 11:43:26 +03:00
Artem Tarasov
0622f3003f
Web: Client: App: fixed tag name
2021-01-25 10:36:50 +03:00
TatianaLopaeva
545dacc8ca
Web: Common: Fixed scrolling of article on small tablet and mobile, fixed margin top of unpin article.
2021-01-22 16:50:20 +03:00
036ddc87c3
5.0.2
2021-01-22 16:49:38 +03:00
f8be896241
Merge branch 'develop' into feature/dotnet5
...
# Conflicts:
# common/ASC.Common/ASC.Common.csproj
# common/ASC.Core.Common/ASC.Core.Common.csproj
# common/ASC.Core.Common/EF/Context/BaseDbContext.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
2021-01-22 16:34:40 +03:00
711fc4954e
web: components: bump version
2021-01-22 15:53:54 +03:00
167c20b06a
Web: Components: fixed drop-down event function
2021-01-22 15:53:31 +03:00
789b547ccf
Merge branch 'develop' into feature/workspaces
...
# Conflicts:
# packages/asc-web-components/src/components/icons/svg/icon_box.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_dropbox.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_google_drive.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_kdrive.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_nextcloud.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_onedrive.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_owncloud.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_sharepoint.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_webdav.react.svg
# packages/asc-web-components/src/components/icons/svg/icon_yandex_disk.react.svg
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# 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.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
# yarn.lock
2021-01-22 11:24:16 +03:00
Vladislav Makhov
93af940e51
web: commented console.log
2021-01-21 20:55:36 +03:00
4f1398e33e
web: common: bump version
2021-01-21 18:44:13 +03:00
3b43cfa334
Web: Files: fixed header styles
2021-01-21 18:43:48 +03:00
Artem Tarasov
cdecfc3ed3
Merge branch 'develop' into feature/fix-hide/show-header
...
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
# web/ASC.Web.Client/src/App.js
2021-01-21 16:45:35 +03:00
Artem Tarasov
560a12e157
Merge branch 'feature/fix-hide/show-header' of github.com:ONLYOFFICE/AppServer into feature/fix-hide/show-header
2021-01-21 16:27:35 +03:00
Artem Tarasov
50552cfb15
Web: Common: Layout: fixed bugs of recalculation of height on large tablets (ios)
2021-01-21 16:27:04 +03:00
TatianaLopaeva
e871a0793a
Web: Common: Fixed displaying of context menu.
2021-01-21 14:19:15 +03:00
TatianaLopaeva
16c6389215
Web:Common: Fixed styles for Ipad.
2021-01-21 13:41:59 +03:00
TatianaLopaeva
f44b086598
Web: Common: Fixed non-loadable content in the landscape version. (ios)
2021-01-21 13:03:00 +03:00
TatianaLopaeva
beb349e26a
Web: Common: Removed useless horizontal scroll bar.
2021-01-21 11:38:53 +03:00
TatianaLopaeva
d033841728
Web: Common: Removed scrolled of article on mobile/tablet devices.
2021-01-20 21:56:32 +03:00
TatianaLopaeva
4c262c2854
Web: Common: Changed mobile layout only for mobile/tablet devices.
2021-01-20 21:04:00 +03:00
8d62eb5fbf
Update yarn.lock files
2021-01-20 12:55:23 +03:00
b07e76d993
web: common: bump version
2021-01-20 12:49:23 +03:00
ceb1da1c06
Web: Files: fix "getsharingkeys" condition
2021-01-20 12:49:14 +03:00
39d904a7c5
web: common: bump version
2021-01-20 12:36:58 +03:00
bf7a5d81df
Web: Files: fix "getsharingkeys" working
2021-01-20 12:36:35 +03:00
Artem Tarasov
ce98d325b7
Web: Common: Layout: removed the white bar in the selector if there is a hidden block in the fileter
2021-01-19 21:16:09 +03:00
TatianaLopaeva
cb2ccc35a4
Web: Common: Fixed hiding of header on scrolling down when page is short. (ios)
2021-01-19 17:48:03 +03:00
Viktor Fomin
67836795c4
Web: Common: rename download panel
2021-01-19 15:27:09 +03:00
Viktor Fomin
97e4e859d7
Web: Common: open download panel
2021-01-19 14:40:04 +03:00
Viktor Fomin
f2ee1b2747
Web: Common: fixed floating button
2021-01-19 14:14:15 +03:00
Viktor Fomin
62bafef07e
Web: Components: added new icons
2021-01-19 14:09:41 +03:00
Artem Tarasov
bad83853d9
Merge branch 'feature/fix-hide/show-header' of github.com:ONLYOFFICE/AppServer into feature/fix-hide/show-header
2021-01-18 22:55:21 +03:00
Artem Tarasov
ce04e3b3fe
Web: Common: Layout: fixed bugs when changing orientation (ios, chrome)
2021-01-18 22:54:52 +03:00
3b959f81ed
Bump version to v0.0.9
2021-01-18 19:06:31 +03:00
Artem Tarasov
2619753ade
Web: Client: TgirdPartySettings: removed unused code
2021-01-18 17:57:51 +03:00
TatianaLopaeva
9273fd82f4
Web: Common: Fixed auto scrolling down on ios.
2021-01-18 17:30:28 +03:00
TatianaLopaeva
97e6c6037a
Web: Common: PageLayout: Fixed width of section-header, when width of article more than 240px.
2021-01-18 17:10:22 +03:00
TatianaLopaeva
a4f416789a
Merge branch 'develop' into feature/fix-hide/show-header
2021-01-18 12:02:40 +03:00
83368921d3
web: common: bump version
2021-01-18 12:02:15 +03:00
35be26204c
Web: Common: fixed SettingsFilesLoader width
2021-01-18 12:01:36 +03:00
ef22eb04c5
Web: Client: Fix third-party response page displaying
2021-01-15 18:15:07 +03:00
TatianaLopaeva
26c680010a
Web: Common/People: Deleted useless imports.
2021-01-15 17:50:30 +03:00
TatianaLopaeva
f869209eee
Web: Common: Fixed automatic scrolling down after loading the page.
2021-01-15 17:48:05 +03:00
Ilya Oleshko
8f3b4a60dd
Web: Files: Added ThirdPartyResponse page error container, fixed router
2021-01-15 16:28:08 +03:00
TatianaLopaeva
f7fbbceeb6
Web: Common: Layout: Set height to 100% for mobile.
2021-01-15 16:05:54 +03:00
TatianaLopaeva
acbfd88658
Web: Common: Layout: Fixed issue with title not displaying when scrolling up. Fixed the disappearance of the header only if you can make the scroll larger than the width of the header and section header.
2021-01-15 16:04:34 +03:00
TatianaLopaeva
31d053bc13
Web: Common: Fixed the issue of not scrolling horizontally (touchpad).
2021-01-15 14:41:44 +03:00
90f81df4c7
Merge branch 'develop' into feature/thirdparty-integrations
2021-01-15 13:39:31 +03:00
7650acfec3
Bump version to v0.0.8
2021-01-15 13:03:47 +03:00
Ilya Oleshko
24127929aa
Web: Files: Added ThirdParty response page, fixed oAuth connect/reconnect
2021-01-15 11:52:29 +03:00
TatianaLopaeva
d300de9839
Web: Common: PageLayout: Refactoring styles.
2021-01-15 10:04:24 +03:00
TatianaLopaeva
e6ba5cf5ab
Web: Common: NavMenu: Deleted useless console.log.
2021-01-14 20:50:10 +03:00
TatianaLopaeva
3440ae9bb4
Web: Common: NavMenu/PageLayout: Fixed incorrect display of the modal dialog, as a result of which the appeared problems with z-index in the Navigation Menu were fixed & Refactoring.
2021-01-14 20:44:59 +03:00
4ea47886f6
Bump version to v0.0.7
2021-01-14 17:56:05 +03:00
TatianaLopaeva
e0980d3b02
Web: Common: PageLayout: Fixed animation of section header visibility.
2021-01-14 14:16:09 +03:00
4c6538f849
Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/AppServer into feature/thirdparty-integrations
2021-01-14 11:00:18 +03:00
Vladislav Makhov
2391bc001c
web: common: bump version
2021-01-14 10:59:03 +03:00
Vladislav Makhov
567c951dfd
web: common: fix language data in private browsing mode
2021-01-14 10:58:49 +03:00
2848c39c57
Merge branch 'develop' into feature/thirdparty-integrations
2021-01-14 10:14:46 +03:00
TatianaLopaeva
02df0294cf
Web: Common: Removed inactive scrollbars in tablet view, horizontal scroll added to the end of the visible page height.
2021-01-13 15:21:06 +03:00
TatianaLopaeva
9bcb922c1a
Merge branch 'develop' into feature/fix-hide/show-header
...
# Conflicts:
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# web/ASC.Web.Common/src/components/Layout/index.js
# web/ASC.Web.Common/src/components/NavMenu/index.js
# web/ASC.Web.Common/src/components/PageLayout/index.js
# web/ASC.Web.Common/src/components/PageLayout/sub-components/section-header.js
# web/ASC.Web.Common/src/store/auth/actions.js
# web/ASC.Web.Common/src/store/auth/reducer.js
# web/ASC.Web.Common/src/store/auth/selectors.js
2021-01-13 13:27:55 +03:00
ae69a9559e
Files: removed temp
2021-01-13 12:41:29 +03:00
Vladislav Makhov
7289f53628
web: common: bump version
2021-01-13 11:27:59 +03:00
Vladislav Makhov
754ae6713d
web: common: fix link
2021-01-13 11:27:41 +03:00
f6ca373137
MemoryCache -> IMemoryCache
2021-01-12 20:51:14 +03:00
Artem Tarasov
9e9cf3face
web: components: bump version
2021-01-12 17:27:26 +03:00
Artem Tarasov
9df05a53c9
Web: Components: ModalDialog: fixed cursor type in modal
2021-01-12 17:27:03 +03:00
Artem Tarasov
adc795feb4
Web: Client: thirdPartySettings: changed the cursor to default
2021-01-12 13:24:44 +03:00
Vladislav Makhov
7ad7d4556e
web: common: fix links in tpi settings
2021-01-12 09:27:04 +03:00
Vladislav Makhov
745bd8be2c
web: common: bump version
2021-01-12 09:25:42 +03:00
c7c9225923
Merge branch 'develop' into feature/thirdparty-integrations
...
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
# products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
2021-01-11 12:37:31 +03:00
889949eb95
Merge branch 'develop' into feature/workspaces
...
# Conflicts:
# packages/asc-web-common/src/components/Layout/index.js
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/HistoryRowsLoader.js
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/HistoryRowsLoader.stories.js
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/README.md
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/StyledHistoryRowsLoader.js
# packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/index.js
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section.js
# packages/asc-web-common/src/desktop/index.js
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/public/index.html
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/dialogs/DownloadDialog/DownloadContent.js
# products/ASC.Files/Client/src/components/pages/DocEditor/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
# products/ASC.Files/Client/src/components/panels/AddGroupsPanel/index.js
# products/ASC.Files/Client/src/components/panels/AddUsersPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/helpers/confirmRoute.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/pages/login/i18n.js
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
# web/ASC.Web.Login/src/LoginContent.jsx
# yarn.lock
2021-01-11 12:21:59 +03:00
60022bbc06
Update yarn.lock files
2020-12-30 21:33:07 +03:00
Vladislav Makhov
1f8769cd6b
Update yarn.lock
2020-12-30 19:51:17 +03:00
Vladislav Makhov
d87f9d0864
web: common: bump version
2020-12-30 19:45:24 +03:00
Vladislav Makhov
b2c6669e42
web: components: bump version
2020-12-30 19:45:01 +03:00
f40b347289
Merge branch 'develop' into feature/desktop-view
2020-12-30 19:42:59 +03:00
fc55550521
Merge pull request #166 from ONLYOFFICE/feature/asc-files-tests
...
Feature/asc files tests
2020-12-30 18:03:11 +03:00
Vladislav Makhov
44ba6f350f
Merge branch 'develop' into feature/desktop-view
2020-12-30 16:20:47 +03:00
TatianaLopaeva
f3cfcdde7e
Web: Common: Fixed displaying of article.
2020-12-30 14:08:48 +03:00
Artem Tarasov
3d7eada1a6
Web: Cluient/Files/People: fix for safari - disabled security zone (white stripes around the edges of the screen in landscape orientation
2020-12-30 12:15:50 +03:00
Artem Tarasov
f419dadb6f
Web: Common: Layout: fix resize event listener for safari versions less then 14
2020-12-30 11:35:24 +03:00
TatianaLopaeva
e6bc57c4b1
Web: Common: Removed jumps of header.
2020-12-30 10:08:31 +03:00
74aa0abca8
Bump version to v0.0.6
2020-12-29 19:43:37 +03:00
fa7c2bf9f1
Merge branch 'develop' into feature/asc-files-tests
2020-12-29 18:37:28 +03:00
7b4dc42620
Fix displaying header pre-loader on Desktop
2020-12-29 17:19:02 +03:00
TatianaLopaeva
f4b2922663
Web: Common: Fixed displaying of article header loading.
2020-12-29 16:36:08 +03:00
TatianaLopaeva
d988d44b11
Web: Common: Fixed displaying of aside header.
2020-12-29 16:15:24 +03:00
Vladislav Makhov
e6cf51575a
Merge branch 'develop' into feature/desktop-view
2020-12-29 16:08:08 +03:00
TatianaLopaeva
8e64d66239
WEb: Common: Fixed displaying of article header.
2020-12-29 14:38:10 +03:00
TatianaLopaeva
300fcfde5d
Web: Common: Fixed resize of article.
2020-12-29 14:34:56 +03:00
39a0cb99de
Update yarn.lock files
2020-12-29 14:03:05 +03:00
e70e845c5f
web: common: bump version
2020-12-29 13:52:50 +03:00
675599c57d
web: components: bump version
2020-12-29 13:52:38 +03:00
Vladislav Makhov
7dfdae8a72
Merge branch 'develop' into feature/desktop-view
2020-12-29 09:33:55 +03:00
TatianaLopaeva
da06f84d49
Web: Common: Fixed z-index when drop down is open.
2020-12-28 19:35:55 +03:00
f18d535cb1
Merge branch 'develop' into feature/upgrade-dependencies
2020-12-28 18:30:50 +03:00
Vladislav Makhov
d840506715
Fix desktop styles
2020-12-28 16:49:01 +03:00
e6943a4544
Merge branch 'develop' into feature/11.0.2
2020-12-28 16:28:26 +03:00
bfa73ec5c2
moved from 2e37dcd0
2020-12-28 16:22:08 +03:00
TatianaLopaeva
6f8df750ba
Web: Common: Refactoring.
2020-12-28 16:21:59 +03:00
TatianaLopaeva
a9d7228dcb
Web: Common: Fixed padding-right of section.
2020-12-28 15:42:51 +03:00
TatianaLopaeva
78b7315a6e
Web: Common/Components: Fixed the problem of updating data when switching from desktop to tablet view.
2020-12-28 15:34:05 +03:00
Vladislav Makhov
737605b01e
Merge branch 'develop' into feature/desktop-view
...
# Conflicts:
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/locales/en/translation.json
# products/ASC.Files/Client/src/components/panels/SharingPanel/locales/ru/translation.json
2020-12-28 11:34:26 +03:00
a21fff2ab1
Fix warning " > react-tooltip@3.11.6" has incorrect peer dependency "react@>=^16.0.0".
2020-12-28 11:04:34 +03:00
Vladislav Makhov
2ff0b2471d
Add isEditor param to regDesktop
2020-12-28 10:40:50 +03:00
Vladislav Makhov
17fd85b5c7
Update props validation
2020-12-28 10:39:30 +03:00
Vladislav Makhov
4c5131211c
Fix styles
2020-12-28 10:37:53 +03:00
472cb4bb0b
Fix warning Resolution field "js-yaml@3.13.1" is incompatible with requested version "js-yaml@~3.7.0"
2020-12-25 18:10:54 +03:00
2be04b3bc0
Update package.json and yarn.lock files
2020-12-25 17:48:11 +03:00
04e387f8d0
web: common: bump version
2020-12-25 17:03:03 +03:00
d31d0c7d03
Web: Common: fixed PeopleSelector employee status PropType
2020-12-25 17:01:42 +03:00
9f8ff83084
Update yarn.lock files
2020-12-25 16:24:26 +03:00
2b08c711dc
Update Create-react-app to v4.0.1
2020-12-25 16:01:04 +03:00
b88d418d41
Merge branch 'develop' into feature/thirdparty-integrations
...
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
# products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Settings/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/src/store/files/reducers.js
# products/ASC.Files/Client/src/store/files/selectors.js
2020-12-25 15:27:44 +03:00
Vladislav Makhov
497b725a59
Merge branch 'develop' into feature/desktop-view
...
# Conflicts:
# products/ASC.Files/Client/src/App.js
# web/ASC.Web.Common/src/store/auth/reducer.js
2020-12-25 12:58:30 +03:00
25817f24ae
Merge branch 'develop' into bugfix/sharing-panel-refactoring
2020-12-25 12:38:03 +03:00
20900eeb72
Merge branch 'master' into develop
...
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
2020-12-25 12:09:52 +03:00
TatianaLopaeva
e79eb283a3
Web: Common/People: Deleted useless scroll up.
2020-12-24 18:06:20 +03:00
TatianaLopaeva
9c7936327a
Web: Common: Layout: Refactoring.
2020-12-24 18:03:51 +03:00
TatianaLopaeva
4e7b414c03
Web: Common/People: Fixed display downloading of profile & edit profile.
2020-12-24 18:02:49 +03:00
Vladislav Makhov
c9a5dd2ba8
hide header nav in desktop
2020-12-24 13:27:57 +03:00
9350f1189e
Bump version to v0.0.5
2020-12-24 12:22:48 +03:00
TatianaLopaeva
6a1e80f1fb
Merge branch 'develop' into feature/fix-hide/show-header
...
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/index.js
2020-12-24 11:03:52 +03:00
9fbf5a5be5
Merge branch 'develop' into bugfix/sharing-panel-refactoring
...
# Conflicts:
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
# web/ASC.Web.Common/src/components/PeopleSelector/PeopleSelector.js
2020-12-24 10:52:01 +03:00
Vladislav Makhov
79989f7bf4
Merge branch 'develop' into feature/desktop-view
...
# Conflicts:
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
# products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
# products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
# web/ASC.Web.Common/src/store/auth/actions.js
2020-12-24 10:21:02 +03:00
Artem Tarasov
ae682e2746
web: common: bump version
2020-12-24 10:16:16 +03:00
Artem Tarasov
d756354ece
Merge branch 'develop' into feature/version-hostory-redesign
...
# Conflicts:
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Header/index.js
# web/ASC.Web.Common/package.json
2020-12-24 09:47:22 +03:00
Diana
e20b87447e
Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop
2020-12-24 03:18:47 +03:00
76d7ed6c73
Merge branch 'master' into develop
...
# Conflicts:
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/src/components/drop-down/index.js
2020-12-23 21:42:44 +03:00
Vladislav Makhov
87ffdf40ad
Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
...
# Conflicts:
# web/ASC.Web.Components/package.json
2020-12-23 17:56:44 +03:00
Vladislav Makhov
9a567d3e53
web: components: added possibility to hide combo box with count items info
2020-12-23 17:55:03 +03:00
Vladislav Makhov
3d46b8e516
web: components: bump version
2020-12-23 17:53:00 +03:00
TatianaLopaeva
5c12649789
Web: Common: Fixed displaying when changing window height at desktop.
2020-12-23 16:28:37 +03:00
a21531dd15
web: components: bump version
2020-12-23 13:55:41 +03:00
c15072b982
Web: Components : DropDown : Fixed calculating open direction
2020-12-23 13:55:02 +03:00
a21c16ff1d
web: components: bump version
2020-12-23 13:33:48 +03:00
7a22da766a
Web: Components: added convertSideInfo to row-content
2020-12-23 13:31:17 +03:00
Vladislav Makhov
3cbf601f8d
Merge branch 'develop' into feature/desktop-view
...
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
# products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
# products/ASC.Files/Client/src/store/files/selectors.js
# web/ASC.Web.Common/src/store/auth/actions.js
2020-12-23 12:58:11 +03:00
7803696e01
Update yarn.lock files
2020-12-23 12:43:27 +03:00
ce0e041b16
web: common: bump version
2020-12-23 12:30:08 +03:00
21d8c3db79
Web: Common: Changed Filter DEFAULT_EMPLOYEE_STATUS to Active
2020-12-23 12:29:42 +03:00
TatianaLopaeva
0bd9a4001a
Web: Common/People: Fixed automatic scrolling when loading, viewing a profile and updating a profile and refactoring.
2020-12-23 11:30:48 +03:00
TatianaLopaeva
91f09ed700
Merge branch 'develop' into feature/fix-hide/show-header
...
# Conflicts:
# web/ASC.Web.Common/src/store/auth/actions.js
2020-12-23 11:01:34 +03:00
73f92d0897
Web: Client: fixed user activation
2020-12-22 18:48:05 +03:00
Diana
9b338e0f78
Merge branch 'feature/asc-files-tests' of https://github.com/ONLYOFFICE/AppServer into develop
2020-12-22 15:37:10 +03:00
3d23422ff5
web: common: bump version
2020-12-22 15:35:50 +03:00
2d9906f6a1
Web: Common: added employeeStatus to PeopleSelector, fixed display of disabled users
2020-12-22 15:34:19 +03:00
TatianaLopaeva
fe697b401d
web: common: bump version
2020-12-22 12:17:05 +03:00
TatianaLopaeva
d1c415feca
Web: Common: MediaViewer: Fixed closing unsupported video in app.
2020-12-22 12:16:22 +03:00
06de1efbae
Update yarn.lock files
2020-12-22 11:59:57 +03:00
20c7ee108e
Merge branch 'develop' into bugfix/sharing-panel-refactoring
...
# Conflicts:
# products/ASC.Files/Client/src/store/files/selectors.js
2020-12-22 11:59:26 +03:00
48463f897c
web: common: bump version
2020-12-22 11:51:31 +03:00
Artem Tarasov
e6938def26
Web: Files VersionHistory: refactoring
2020-12-22 11:46:22 +03:00
19d72f2fe8
Web: Setup i18next fallbackLng to "en"
2020-12-22 11:03:15 +03:00
Artem Tarasov
10979b7fa2
web: common: bump version
2020-12-21 18:45:39 +03:00
Alexey Kostenko
344cca51f8
web: components: bump version
2020-12-21 17:56:40 +03:00
Alexey Kostenko
f9257786c9
Web: Components: Added "disableHover" prop to button and paging components
2020-12-21 17:54:34 +03:00
Artem Tarasov
6fdbdb0d83
Web: Common: added isTabletView flag to store
2020-12-21 15:19:34 +03:00
Artem Tarasov
9dcde2d268
Web: Common: Layout: added new component Layout (from featature/fix-hide/show-header
2020-12-21 15:14:55 +03:00
Artem Tarasov
bfd11ede79
Merge branch 'develop' into feature/version-hostory-redesign
...
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# web/ASC.Web.Common/src/components/PageLayout/index.js
2020-12-21 13:15:43 +03:00
TatianaLopaeva
c88f63ba19
web: common: bump version
2020-12-21 11:14:07 +03:00
TatianaLopaeva
d07c28f184
Web: Common: Return a check condition for IOS. (iPad)
2020-12-21 11:13:56 +03:00
TatianaLopaeva
37046fc6a9
web: common: bump version
2020-12-21 10:46:45 +03:00
TatianaLopaeva
d7170bd448
Web: Common: PageLayout: Added a check condition if the device type is tablet. (iPad)
2020-12-21 10:46:35 +03:00
TatianaLopaeva
baf27c6cd2
web: common: bump version
2020-12-21 10:45:00 +03:00
TatianaLopaeva
0ac797a726
Web: Common: Added a check condition for Chrome. (iPad)
2020-12-21 10:44:40 +03:00
TatianaLopaeva
a6a8df6733
web: common: bump version
2020-12-18 21:24:47 +03:00
TatianaLopaeva
f967897db0
Web: Common: PageLayout: Refactoring.
2020-12-18 21:24:37 +03:00
TatianaLopaeva
3ab27c8280
web: common: bump version
2020-12-18 20:19:41 +03:00
TatianaLopaeva
256e1eb0e0
Web: Common: PageLayout: Refactoring.
2020-12-18 20:19:32 +03:00
TatianaLopaeva
3a017b57de
web: common: bump version
2020-12-18 20:16:25 +03:00
TatianaLopaeva
d5d71d0a7e
Web: Common: PageLayout: Fixed displaying at "Slide Over" on iPad.
2020-12-18 20:16:13 +03:00
Artem Tarasov
ec09f9ed2e
web: common: bump version
2020-12-18 18:32:36 +03:00
Artem Tarasov
ec190a5b98
Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
2020-12-18 18:23:15 +03:00
Artem Tarasov
3f7a2d3231
web: common: bump version
2020-12-18 18:23:04 +03:00
Artem Tarasov
6551e88c1e
Web: Common/Client: fix redirect after logout in Confirm
2020-12-18 18:22:53 +03:00
TatianaLopaeva
52627caab9
web: common: bump version
2020-12-18 18:14:21 +03:00
TatianaLopaeva
b967fe9925
Web: Common: PageLayout: Fixed displaying at "Slide Over" and "Split View" on iPad.
2020-12-18 18:13:25 +03:00
344139a262
Web: Client: About: Fixed padding between "copyright" and lines
2020-12-18 17:31:29 +03:00
b8c2165b93
Web: Client: About: added link target
2020-12-18 17:27:26 +03:00
Artem Tarasov
4c6ff22e64
Web: Client: Confirm: fix activateUser
2020-12-18 17:03:34 +03:00
Artem Tarasov
eeaf50d312
Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
2020-12-18 16:22:55 +03:00
Artem Tarasov
a4aa7d7e9c
Web: Client: Confirm: fix createUser
2020-12-18 16:22:41 +03:00
52798af66e
Notification images
2020-12-18 16:12:48 +03:00
9c51a031de
web: components: bump version
2020-12-18 15:44:49 +03:00
60b172e8d8
Web: Components: fixed SelectedItem and SelectorAddButton click when components is disabled
2020-12-18 15:34:36 +03:00
Artem Tarasov
a965583c94
Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
2020-12-18 14:04:22 +03:00
Artem Tarasov
ba075ecc47
Web: Client: About: fixed copyright style
2020-12-18 14:04:11 +03:00
a2d97d2612
Web: About: Fixed SourceCode url
2020-12-18 11:42:29 +03:00
f42fc72cf9
Merge branch 'master' into develop
...
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/package.json
2020-12-17 21:03:48 +03:00
53f510ae18
Bump version to v0.0.4
2020-12-17 21:00:36 +03:00
Artem Tarasov
bbea13bb4b
Web: Client: Confirm: changePassword fix
2020-12-17 19:49:20 +03:00
Artem Tarasov
51d07b5652
Web: Client: Confirm: refactoring
2020-12-17 19:37:52 +03:00
Artem Tarasov
68d6c1872f
Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3
2020-12-17 19:28:24 +03:00
Artem Tarasov
5542a09575
Web: Clietn: Confirm: fixed redirect (changePassword)
2020-12-17 19:27:56 +03:00
326d234773
Update yarn.lock files
2020-12-17 18:35:04 +03:00
fb571c3ae6
web: common: bump version
2020-12-17 18:22:37 +03:00
76b04db830
Web: Common: Added VerstionBadge "Beta"
2020-12-17 18:21:48 +03:00
Artem Tarasov
9943d2c2ca
web: common: bump version
2020-12-17 16:26:35 +03:00
Artem Tarasov
fceb96c386
Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3
2020-12-17 16:21:18 +03:00
Artem Tarasov
e0478dd2b3
web: common: bump version
2020-12-17 16:21:06 +03:00
Artem Tarasov
7851635005
Web: Client: Confirm: fix change password
2020-12-17 16:20:53 +03:00
Alexey Kostenko
e6d5c38059
web: common: bump version
2020-12-17 15:22:19 +03:00
Alexey Kostenko
fb2b591603
Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3
2020-12-17 14:54:24 +03:00
Alexey Kostenko
86ef386d1b
web: common: bump version
2020-12-17 14:54:15 +03:00
Alexey Kostenko
b62695dc59
Web: Common: MediaViewer: Title style fix
2020-12-17 14:54:05 +03:00
Artem Tarasov
63c01a7ff6
Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3
2020-12-17 14:50:32 +03:00
Artem Tarasov
cacfabdd04
web: common: bump version
2020-12-17 14:49:52 +03:00
Artem Tarasov
16d738e5ca
Web: Common/Client: changePassword: added logout if user is logged in
2020-12-17 14:49:30 +03:00
Diana
fada5e278b
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer into feature/asc-files-tests
2020-12-17 13:20:52 +03:00
Artem Tarasov
3daee8efbb
Web: Client: Confirm: fixed api method call
2020-12-17 12:38:23 +03:00
c573e23b0b
Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3
2020-12-17 12:37:41 +03:00
3815a57394
Update yarn.lock files
2020-12-17 12:37:28 +03:00
Artem Tarasov
b565bfc77c
Web: Client: Confirm: fixed crash of the app when trying to change pass if the user is authorized on the portal
2020-12-17 12:32:58 +03:00
af930be4a7
web: components: bump version
2020-12-17 12:30:45 +03:00
5f63797266
Web: Components: Disabled fake context-menu inside AvatarEditor
2020-12-17 12:30:23 +03:00
6e5fc07016
web: common: bump version
2020-12-17 11:13:38 +03:00
a6a6a1361c
Web: Common: fixed getCurrentUserId selector
2020-12-17 11:09:12 +03:00
41bca489bb
Fixed versions (About version)
2020-12-16 19:09:56 +03:00
Artem Tarasov
0ee4acb133
Web: Common: Layout: refactoring
2020-12-16 14:38:20 +03:00
Artem Tarasov
d036b52fa1
Web: Common: Layout: fixed change orientation chrome (ios)
2020-12-16 13:58:05 +03:00
cbb0c75492
Web: Common: added employeeStatus to PeopleSelector
2020-12-16 11:37:50 +03:00
TatianaLopaeva
ef50248de5
Web: Common: GroupSelector: Refactoring.
2020-12-16 10:57:20 +03:00
4afadf2e0c
Web: Added support of public folders + moved back to original index.html
2020-12-15 19:27:30 +03:00
c9293ac86d
Merge branch 'develop' into feature/workspaces
...
# Conflicts:
# packages/asc-web-common/src/components/FilterInput/FilterInput.js
# packages/asc-web-common/src/components/FilterInput/sub-components/SortComboBox.js
# packages/asc-web-common/src/components/PageLayout/index.js
# packages/asc-web-common/src/components/PageLayout/sub-components/article-body.js
# packages/asc-web-common/src/components/PageLayout/sub-components/article-header.js
# packages/asc-web-common/src/components/PageLayout/sub-components/article-main-button.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section-body.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section-header.js
# packages/asc-web-common/src/components/PrivateRoute/PrivateRoute.js
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/pages/DocEditor/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/ContactField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/DateField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/EmailField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/RadioField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/TextChangeField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/TextField.js
# products/ASC.People/Client/src/index.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/components/pages/Confirm/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/helpers/confirmRoute.js
# web/ASC.Web.Client/src/index.js
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
# web/ASC.Web.Login/src/LoginContent.jsx
# web/ASC.Web.Login/src/sub-components/register-container.js
# yarn.lock
2020-12-15 18:40:27 +03:00
e542f2b54e
Merge branch 'develop' into bugfix/sharing-panel-refactoring
2020-12-15 17:59:18 +03:00
Artem Tarasov
91bce60705
Merge branch 'develop' into feature/fix-hide/show-header
...
# Conflicts:
# web/ASC.Web.Components/src/components/drop-down/index.js
2020-12-15 16:33:01 +03:00
Artem Tarasov
61ea05ca2d
web: components: bump version
2020-12-15 15:49:35 +03:00
TatianaLopaeva
fcc2d2f5a8
Web: Common: PageLayout: Refactoring.
2020-12-15 14:10:07 +03:00
TatianaLopaeva
90780cb631
Web: Common: PageLayout: Fixed displaying of article.
2020-12-15 14:09:22 +03:00
TatianaLopaeva
eb0743a3ad
Web: Common/People/Files: Added simplified functionality of scrolling up when switching to a new page.
2020-12-15 14:08:14 +03:00