538d65c724
Web: Remove query hash from remoteEntry.js
2021-07-26 14:02:10 +03:00
30b41aac42
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
2021-07-26 12:37:01 +03:00
0f27a6c673
Merge branch 'develop' into release/1.0.0
2021-07-23 17:34:43 +03:00
675fb8de21
Web: Fix caching remoteEntry.js
2021-07-23 17:20:42 +03:00
fa500d094f
Merge branch 'develop' into release/1.0.0
2021-07-22 11:12:37 +03:00
e703927239
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into release/1.0.0
2021-07-21 18:30:33 +03:00
13f8f5ef7d
Fix sw.js creation
2021-07-21 18:28:56 +03:00
e44040cf8a
Web: Client: fix
2021-07-21 12:57:20 +03:00
a8d4a2678a
Web: Client: added snackbar button action
2021-07-21 12:52:57 +03:00
5371b7682e
Web: Client: fixed show snackbar
2021-07-21 12:45:18 +03:00
653066af0c
Merge branch 'develop' into release/1.0.0
...
# Conflicts:
# config/nginx/onlyoffice.conf
2021-07-20 18:21:00 +03:00
eab97bbfed
Web: init new single sw.js creation
2021-07-20 12:32:27 +03:00
2d75554b0d
DbContext: optimization
2021-07-15 13:07:47 +03:00
e81c3df0be
Added displaying version from appsettings.json (api/2.0/settings.json)
2021-07-14 17:31:06 +03:00
1ebc588a93
Web: Bumped version to 1.0.0
2021-07-14 13:26:36 +03:00
ad57feecd8
Log: fix configuring
2021-07-13 21:17:18 +03:00
d125220aa0
Merge branch 'feature/personal' of https://github.com/ONLYOFFICE/AppServer into feature/personal
2021-07-09 18:28:24 +03:00
b4c4625f3f
Moved getting firebase config to API method /api/2.0/settings.json
2021-07-09 18:28:08 +03:00
1c24e809fc
Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal
2021-07-09 17:41:07 +03:00
537fe50394
Web: Client: About: fixed logo
2021-07-09 17:40:53 +03:00
1c0e201c2c
Merge branch 'feature/personal' of https://github.com/ONLYOFFICE/AppServer into feature/personal
2021-07-09 17:25:42 +03:00
0297620036
Fix SnackBar usage
2021-07-09 17:25:20 +03:00
d90413a436
Web: Client: Firebase: removed unused code
2021-07-09 16:32:37 +03:00
d26169adca
Web: Client: fixed header-module-title styles
2021-07-09 16:23:47 +03:00
5b76c9bfc6
Merge branch 'feature/personal' of https://github.com/ONLYOFFICE/AppServer into feature/personal
2021-07-08 14:38:45 +03:00
3556497de6
Merge branch 'develop' into feature/personal
2021-07-08 14:38:26 +03:00
1ebe1f1ded
Web: Client: fixed
2021-07-07 11:18:40 +03:00
db7ea5c88f
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/v1.0.0
...
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/index.js
2021-07-06 11:38:02 +03:00
f0f0c49bb8
Web: Client: fixed campaigns logic
2021-07-05 17:59:58 +03:00
181240854f
Web: Client: get campaigns from firebase
2021-07-05 15:51:09 +03:00
a31dc583c1
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/pages/Settings/index.js
2021-07-02 16:26:45 +03:00
658b7052c3
Web: Client: About: Removed useless component
2021-07-02 15:42:04 +03:00
c940aae128
Web: refactoring translation loaders
2021-07-02 12:25:36 +03:00
513ec04e33
Merge branch 'develop' into feature/translations-loaders
...
# Conflicts:
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/pages/Home/Section/Header/index.js
2021-07-01 16:47:34 +03:00
bcf7ceb568
Merge branch 'develop' into feature/translations-loaders
...
# Conflicts:
# packages/asc-web-common/components/Loaders/index.js
2021-07-01 09:13:17 +03:00
c5da5a1950
Web: Client: added tReady for confirm pages
2021-06-30 18:24:29 +03:00
69889cab4c
Merge branch 'develop' into feature/privacy-rooms-page
...
# Conflicts:
# packages/asc-web-common/components/PageLayout/index.js
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/helpers/constants.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
2021-06-30 16:28:37 +03:00
1083fd8416
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
2021-06-30 16:09:53 +03:00
2d718c33f8
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/v1.0.0
2021-06-30 13:39:02 +03:00
8ee188346b
Api: setphone can be authorized by confirm link
2021-06-30 11:20:55 +03:00
NikolayRechkin
5060e81b5f
Calendar: core: api
2021-06-30 09:37:17 +03:00
cc1fc30b0f
Web: Client: fixed logo header position
2021-06-28 10:40:42 +03:00
99f9d27fd0
Web: Files: added checkProtocol helper, fixed toast
2021-06-27 09:31:07 +03:00
715907f114
Merge branch 'develop' into feature/privacy-rooms-page
2021-06-25 15:01:19 +03:00
fbcdba3b17
Merge branch 'develop' into feature/personal
2021-06-25 11:10:49 +03:00
bf67b5c296
Web: Files: added PrivateRoomsPage
2021-06-24 16:23:14 +03:00
d59f9a2aa2
fixed urls
2021-06-23 20:12:50 +03:00
20d1f9a738
merge from develop
2021-06-23 16:10:46 +03:00
3788bab48e
HealthCheck: fix Studio
2021-06-22 19:55:47 +03:00
282738cb13
Merge branch 'develop' into feature/personal
2021-06-22 18:44:12 +03:00
8963df11c3
Merge branch 'feature/personal' of https://github.com/ONLYOFFICE/AppServer into feature/personal
2021-06-22 13:41:22 +03:00
b1662e7ac6
Web: Init maintenance displaying
2021-06-22 13:41:11 +03:00
741de9f2f7
Web: Files: added react-selecto library
2021-06-17 14:36:45 +03:00
6118e95028
Merge branch 'develop' into feature/personal
2021-06-17 14:25:09 +03:00
a8527e1a57
WebApi: sendsms, setphone
2021-06-16 20:46:24 +03:00
01639a56cc
RazorCompileOnBuild:false<
...
GenerateMvcApplicationPartsAssemblyAttributes:false
2021-06-16 20:08:26 +03:00
e314f6ff1c
Merge pull request #245 from ONLYOFFICE/feature/crm-migrate
...
Feature/crm migrate
2021-06-16 17:02:46 +03:00
5fcbdbd7dd
added health checks
2021-06-16 16:54:36 +03:00
469678ac85
Api: fix settings
2021-06-16 13:03:41 +03:00
429f5a1ea2
Smtp: fix warning
2021-06-15 21:40:36 +03:00
65378cc089
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.CRM/Client/public/index.html
# products/ASC.Calendar/Client/public/index.html
# products/ASC.Files/Client/public/index.html
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Mail/Client/public/index.html
# products/ASC.People/Client/public/index.html
# products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.Projects/Client/public/index.html
2021-06-15 11:49:39 +03:00
Artem Tarasov
f181a491fb
Merge branch 'develop' into bugfix/fixed-styles
2021-06-11 14:56:52 +03:00
637be57e84
People: resize fix
2021-06-11 14:48:49 +03:00
bac090e180
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
2021-06-11 13:11:08 +03:00
7c7d548825
Merge branch 'develop' into feature/access-rights-admins
2021-06-10 11:50:49 +03:00
e257012a9a
Notify: fix
2021-06-10 11:47:58 +03:00
1d9e49b88f
Web: Client: Settings: Fixed translation keys
2021-06-10 11:31:47 +03:00
fbb480671b
Web: Client: fixed translates
2021-06-09 17:30:10 +03:00
a3c5eea477
Web: Client: deleted unused translations key
2021-06-09 17:16:37 +03:00
ff5ea3019b
Web: Client: added select all
2021-06-09 16:42:43 +03:00
026ceec20c
Web: Client: fixed
2021-06-09 16:18:06 +03:00
82fddadd6d
Web: Client: fixed tooltip color
2021-06-09 04:03:18 +03:00
4fcd83ae6d
Web: Client: fixed translate
2021-06-09 03:31:52 +03:00
20a1869cfd
Web: Client: fixed label
2021-06-09 03:10:38 +03:00
bc46acebcc
Web: Client: bringing code to common style
2021-06-09 02:57:11 +03:00
5ea562e996
Web: Client: fixed translations
2021-06-09 02:43:07 +03:00
167ca1fbb5
Web: Client: fixed loading
2021-06-09 00:39:08 +03:00
9019b36951
Web: Client: moved pages in sub-components
2021-06-09 00:33:04 +03:00
db21597f17
Web: Client: fixed access portal urls
2021-06-09 00:30:19 +03:00
3db9fde5aa
Web: Client: fixed title
2021-06-09 00:25:45 +03:00
b7ce4a35e7
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/access-rights-admins
...
# Conflicts:
# products/ASC.Files/Server/DocStore
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
# web/ASC.Web.Client/src/components/pages/Settings/index.js
2021-06-09 00:23:12 +03:00
Artem Tarasov
3db9b30e5e
Merge branch 'develop' into bugfix/fixed-styles
...
# Conflicts:
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
2021-06-08 17:58:29 +03:00
783bedffbb
Web: Client: deleted unused image
2021-06-08 16:06:07 +03:00
Artem Tarasov
c25fa589a9
Web: People: deleted fonts with ext .woff, added hash to font name
2021-06-08 15:26:56 +03:00
d881c48b4b
Web: Client: fixed translations
2021-06-08 15:20:03 +03:00
5f16720aba
Web: NavMenu: Was Done for tablet and mobile:
...
- hide module name
- added logo
- added short logo fro mobile
- changed width of logo
2021-06-08 13:40:59 +03:00
9c5a960d40
Web: Client: submit by numpad enter
2021-06-08 13:09:46 +03:00
655f250cdb
Web: Client: fixed accessPortal page
2021-06-08 12:08:25 +03:00
58f7a0f285
Tfa: fix
2021-06-08 11:34:14 +03:00
9d5e2ab828
Web: NavMenu: Fixed style for Headline component.
2021-06-08 10:34:27 +03:00
cc67c93479
Web: NavMenu: Hid turn on desktop.
2021-06-08 09:33:17 +03:00
b925943cb6
merge from develop
2021-06-07 17:23:25 +03:00
54d5c658bd
Merge branch 'develop' into feature/two-factor-auth
2021-06-07 11:54:06 +03:00
Artem Tarasov
6d7361ecd0
Web: People: added HOC withLoader
2021-06-07 01:09:13 +03:00
Artem Tarasov
9f21862f51
Merge branch 'develop' into bugfix/fixed-styles
2021-06-07 00:24:19 +03:00
Artem Tarasov
9a798506e0
Web: deleted unnecessary code
2021-06-06 23:43:20 +03:00
Artem Tarasov
acd4a3893c
Web: added rule to webpack.config for woff, woff2
2021-06-06 23:39:52 +03:00
5754a9b753
Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal
2021-06-04 14:43:10 +03:00
d01ef10cc5
Web: NavMenu/PageLayout: Was done:
...
- fixed loaders: two rectangle loader combined into one
- fixed loaders at index.html: two rectangle loader combined into one
- hide NavItem component
- hide click on Headline component
- fixed article padding style for desktop
- added new logo.
2021-06-04 14:42:21 +03:00
d465b105e7
Web: Client: NavMenu: Fixed opening "My" profile at new tab
2021-06-04 12:03:40 +03:00
