|
|
ab48513c3d
|
Web: Editor: fixed
|
2021-07-08 15:12:13 +03:00 |
|
|
|
14b27ab7e6
|
WebL EditorL fixed dialog type
|
2021-07-08 14:13:00 +03:00 |
|
|
|
2da9e556bd
|
Web: Editor: added select image dialog
|
2021-07-08 13:57:53 +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 |
|
|
|
8ee188346b
|
Api: setphone can be authorized by confirm link
|
2021-06-30 11:20:55 +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 |
|
|
|
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 |
|
|
|
741de9f2f7
|
Web: Files: added react-selecto library
|
2021-06-17 14:36:45 +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 |
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
b925943cb6
|
merge from develop
|
2021-06-07 17:23:25 +03:00 |
|
