475d6d638f
Web: Files: added column filtering
2021-07-27 15:22:51 +03:00
050ce4ce8d
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
2021-07-27 14:00:39 +03:00
107476c544
Web: Common: fixed minimumFetchIntervalMillis
2021-07-27 12:32:18 +03:00
e2d3f3195d
Merge branch 'develop' into release/1.0.0
2021-07-26 15:40:05 +03:00
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
d86605e2da
Web: Files: added drag and drop for table
2021-07-23 18:13:06 +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
9b47aa8d4a
Merge branch 'develop' into feature/table-view
2021-07-22 16:56:48 +03:00
01cbae520d
Web: Common: fixed translations
2021-07-22 15:09:42 +03:00
34247e4a25
Web: Common: added translation in new version snackbar
2021-07-22 14:24:09 +03:00
ed5d2f5ba0
Web: Common: disabled workbox logs
2021-07-22 14:23: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
ee453f8111
Web: Common: fixed main-bar style
2021-07-21 12:51:03 +03:00
c92d8318f1
Web: Files: fixed header sorting, removed unused code
2021-07-21 12:16:46 +03:00
6924b34e84
Web: Common: show new version snackbar
2021-07-21 07:23:56 +03:00
f7ce0e210b
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
...
# Conflicts:
# packages/asc-web-common/utils/sw-helper.js
2021-07-21 07:20:51 +03:00
4e920bfe3c
Web: Common: disabled snackbar
2021-07-21 07:19:08 +03:00
95c99a0ac9
Web: Common: added snackbar container style
2021-07-21 07:17:58 +03:00
653066af0c
Merge branch 'develop' into release/1.0.0
...
# Conflicts:
# config/nginx/onlyoffice.conf
2021-07-20 18:21:00 +03:00
829edbbda5
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
2021-07-20 13:22:44 +03:00
eab97bbfed
Web: init new single sw.js creation
2021-07-20 12:32:27 +03:00
5ed5adbb9b
Web: Components: Table: added settings, fixed table group menu header
2021-07-19 14:09:09 +03:00
dc323f255f
Enabled registerSW
2021-07-15 15:16:07 +03:00
57a1e23eba
Disable registerSW for fix issues with CDN
2021-07-15 11:57:07 +03:00
e81c3df0be
Added displaying version from appsettings.json (api/2.0/settings.json)
2021-07-14 17:31:06 +03:00
728b6d359d
Web: Components: replaced snackbar
2021-07-14 17:12:13 +03:00
1ebc588a93
Web: Bumped version to 1.0.0
2021-07-14 13:26:36 +03:00
a3592ca94d
Web: Common: added snackbar
2021-07-13 14:36:27 +03:00
cb8d225707
Merge branch 'develop' into feature/file-folder-selectors
...
# Conflicts:
# products/ASC.Files/Client/src/store/index.js
2021-07-12 13:08:40 +03:00
b4c4625f3f
Moved getting firebase config to API method /api/2.0/settings.json
2021-07-09 18:28:08 +03:00
0297620036
Fix SnackBar usage
2021-07-09 17:25:20 +03:00
3556497de6
Merge branch 'develop' into feature/personal
2021-07-08 14:38:26 +03:00
84fa1f8eb3
Web: Common: fixed height
2021-07-08 13:59:48 +03:00
08d3e9df5e
Web: Files: Optimization: deleted getFiles function.
2021-07-08 13:25:24 +03:00
523fb66248
Web: Common: fixed buttons height
2021-07-07 13:20:16 +03:00
2e2f121d26
Web: Common: disabled hover
2021-07-07 12:47:01 +03:00
c5b409a571
Merge branch 'develop' into feature/file-folder-selectors
2021-07-07 11:41:45 +03:00
04173a1426
Web: Common: fixed
2021-07-07 11:05:18 +03:00
a9ed86fee7
Web: Common: open selector on button
2021-07-06 17:37:07 +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
77b5a5a440
Web: Common: fixed load translate rules for campaigns
2021-07-05 20:47:49 +03:00
a325507b0e
WEb: SelectFileFolder: Added custom types of files.
2021-07-02 18:35:38 +03:00
b3fd47a216
Merge branch 'feature/CampaignsBanner' of github.com:ONLYOFFICE/AppServer into feature/personal
...
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/index.js
2021-07-02 16:42:05 +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
da924cc3b3
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/CampaignsBanner
...
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/index.js
2021-07-02 16:12:06 +03:00
81f93c3640
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/CampaignsBanner
2021-07-02 13:22:40 +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
5ef780d40d
Web: Common: Added api methods.
2021-07-01 15:46:36 +03:00
426fce6140
Web: Common: Added api method.
2021-07-01 13:18:43 +03:00
a7d56b56f2
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/CampaignsBanner
2021-07-01 13:12:18 +03:00
19c9f88d6a
Web: Common: added locales path
2021-07-01 10:40:37 +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
c93a4eda8e
Merge branch 'develop' into feature/privacy-rooms-page
...
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
2021-06-30 17:20:54 +03:00
Artem Tarasov
ef25c07ddc
Web: Common: FilterInput: fixed transfer viewSettings
2021-06-30 17:05:11 +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
dae7215376
Web: Common: fixed article max width
2021-06-30 13:57:48 +03:00
567d3b46ed
Web: Common: fixed button height on mobile
2021-06-30 13:49:33 +03:00
0a82baea4c
WebL Common: fixed article max width
2021-06-30 13:38:53 +03:00
2576784207
Web: Common: added borderRadius prop
2021-06-30 12:57:05 +03:00
2a013c9c5c
Web: Common: refactoring tree menu loader
2021-06-30 12:54:10 +03:00
Artem Tarasov
4da80d3f0c
Web: Files: deleted unnecessary code
2021-06-30 10:50:06 +03:00
1a3cfcbf27
Web: Common: added new loaders
2021-06-30 10:22:01 +03:00
f327f42bf8
Web: Common: added filed encrypted to startUploadSession function
2021-06-29 17:54:24 +03:00
Artem Tarasov
4613940d15
Wb: Common: FileteInput: fixed display ViewSelector on mobile
2021-06-29 16:54:30 +03:00
Artem Tarasov
3385d367d4
Web: Files: refactoring
2021-06-29 15:48:17 +03:00
Artem Tarasov
0cae3990cc
Web: Files: added usage ViewSelector
2021-06-29 15:32:48 +03:00
Artem Tarasov
879aaf1ffd
Web: Common: Loaders: fixed description for Loaders.Tile, Loaders.Tiles
2021-06-28 11:42:38 +03:00
Artem Tarasov
ff5a165638
Web: Files: Thumbnails: fixed position of TileCOntainer, fixed readme ThileLoader
2021-06-28 11:25:23 +03:00
a1dec7cd2d
Web: Common: disabled sort by button
2021-06-28 08:14:40 +03:00
Artem Tarasov
547e4a1a26
Web: Common: Filter: fixed select view
2021-06-25 16:38:57 +03:00
Artem Tarasov
52cd157d8d
Web: Common: FilterInpt: deleted unnecessary code
2021-06-25 15:56:44 +03:00
Artem Tarasov
50556cb428
Web: Thumbnails: deleted unnecessary code, refactoring
2021-06-25 14:30:14 +03:00
Artem Tarasov
b65c717fd5
Web: Common: Loaders: fixed TilesLoader for Chrome
2021-06-24 19:34:47 +03:00
c8184e9dc0
Web: Files: fixed privacy bugs
2021-06-23 15:39:43 +03:00
Artem Tarasov
01fb0a6621
Web: Files: Thumbnails: deleted unnecessary code
2021-06-23 15:34:30 +03:00
Artem Tarasov
f894d4593f
Web: Common: Loaders: fixed TilesLoader
2021-06-23 15:00:49 +03:00
Artem Tarasov
1430dace28
Web: fix after merdge
2021-06-23 00:00:42 +03:00
Artem Tarasov
2d9c33a8c6
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# packages/asc-web-common/components/PageLayout/index.js
2021-06-22 23:46:35 +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
e27cee4535
Web: Common: fixed selection
2021-06-22 09:56:48 +03:00
Artem Tarasov
a81ba032fa
Web: Files: Thumbnails: removed ThumbnailsStore, createThumbnails func moved to FilesStore, applied createThumbnails func
2021-06-19 09:48:30 +03:00
a55544454a
Web: Common: added support scroll to selectbox, fixed styles
2021-06-18 17:17:59 +03:00
0005169b2b
Web: Common: fixed dragCondition
2021-06-18 14:10:20 +03:00
7905b07c0c
Web: Files: added dragCondition to Selecto
2021-06-18 13:53:32 +03:00
Artem Tarasov
83549b62cd
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# packages/asc-web-common/api/files/index.js
# products/ASC.Files/Client/src/pages/Home/index.js
2021-06-18 12:02:10 +03:00
Artem Tarasov
5034495b28
Web: Files: Thumbnails: added ThumbnailsStore, api for create thumbs
2021-06-18 01:13:49 +03:00
249af955d1
Web: Files: added onSelect function for selectbox
2021-06-17 18:46:22 +03:00
df70473ce5
Merge branch 'develop' into feature/changing-selectbox-library
2021-06-17 17:19:17 +03:00
b088c925d6
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.Files/Client/src/components/dialogs/ConnectDialog/index.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
2021-06-17 15:47:33 +03:00
Artem Tarasov
a8fe50142c
Web: Tree: fixed position of scrollbar on tablet
2021-06-17 15:01:35 +03:00
741de9f2f7
Web: Files: added react-selecto library
2021-06-17 14:36:45 +03:00
0aa2eb3e85
Web: Files: removed react-selectable-fast library
2021-06-17 14:27:41 +03:00
d07273cee8
Web: Files: fixed display of tree menu, added new api for tree menu
2021-06-15 14:15:48 +03:00
Artem Tarasov
f8e28e5952
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
2021-06-15 14:06:29 +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
ee4760e899
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
2021-06-11 18:30:44 +03:00
5db2e8a868
Merge branch 'develop' into feature/restore-files-convertation
2021-06-11 17:50:28 +03:00
52214ade4b
Web: Common: Slowed down TopLoaderService show
2021-06-11 17:29:29 +03:00
Artem Tarasov
d44f1bee0f
Web: fixed loading people/my, fixed Loaders.ProfileView, deleted unnecessary code
2021-06-11 16:57:17 +03:00
e074c0cf93
Web: Files: changed color of conversion
2021-06-11 16:56:43 +03:00
ef59a2ac47
Web: Files: added hideConfirmConvert setting
2021-06-11 15:49:32 +03:00
e0d076a7bc
Merge branch 'develop' into feature/restore-files-convertation
2021-06-11 15:17:35 +03:00
Artem Tarasov
f181a491fb
Merge branch 'develop' into bugfix/fixed-styles
2021-06-11 14:56:52 +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
59bab6a085
Web: Files: fixed conversion progress
2021-06-09 13:28:22 +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
Artem Tarasov
c25fa589a9
Web: People: deleted fonts with ext .woff, added hash to font name
2021-06-08 15:26:56 +03:00
41ef020616
Web: Common: added backupCodes in tfa store
2021-06-08 14:19:36 +03:00
4d9c26545e
Web: Files: added conversion progress
2021-06-07 16:20:18 +03:00
Artem Tarasov
7db667108b
Web: added font-family Opne-Sans to /public, added import fonts to custom.scss
2021-06-06 23:35:56 +03:00
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
Vladislav Makhov
0af3acb46b
web: common: add redirect from root in personal
2021-06-03 16:30:56 +03:00
Vladislav Makhov
61abe6a2fc
web: common: fix default page
2021-06-03 15:52:07 +03:00
Vladislav Makhov
4a3b61dda8
web: common: fix default page
2021-06-03 15:48:19 +03:00
Vladislav Makhov
889bba78b1
web: common: fix default value
2021-06-03 10:32:33 +03:00
Vladislav Makhov
2ae98f6cf4
web: common: rename isPersonal to personal according to settings api key
2021-06-03 10:30:09 +03:00
c6f85ef4ce
Merge branch 'develop' into feature/two-factor-auth
2021-06-02 23:57:00 +03:00
Vladislav Makhov
1e8563ed2a
web: common: add isPersonal key
2021-06-02 16:42:59 +03:00
Artem Tarasov
d960ae6220
Merge branch 'develop' into bugfix/fixed-styles
...
# Conflicts:
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
2021-06-02 15:09:03 +03:00
Artem Tarasov
fbab4041c9
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Server/DocStore
2021-06-02 15:07:40 +03:00
62ac315c8d
Web: i18n: Replaced i18т config load: from "languageOnly" to "all" and added new utils function loadLanguagePath() + Refactoring
2021-06-02 13:55:11 +03:00
908310041f
Web: Added new translation for toasts ("EncryptingFile", "EncryptionKeysReload", "EncryptionFilePreparing")
2021-06-02 10:59:07 +03:00
Artem Tarasov
a38195d506
Merge branch 'develop' into bugfix/fixed-styles
...
# Conflicts:
# products/ASC.CRM/Client/src/custom.scss
# products/ASC.Calendar/Client/src/custom.scss
# products/ASC.Files/Server/DocStore
# products/ASC.Mail/Client/src/custom.scss
# products/ASC.People/Client/src/custom.scss
# products/ASC.Projects/Client/src/custom.scss
# web/ASC.Web.Client/src/custom.scss
# web/ASC.Web.Login/src/custom.scss
2021-06-02 10:23:08 +03:00
7026b19db0
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-05-31 09:23:53 +03:00
49c77907bd
Web: Common: fixed error message
2021-05-30 22:48:04 +03:00
f993108d69
Web: Common: commentary changes
2021-05-30 17:26:30 +03:00
74064fc76d
Merge branch 'develop' into feature/translations
2021-05-29 21:59:02 +03:00
72527ccded
Merge branch 'master' into develop
...
# Conflicts:
# lerna.json
# package.json
# packages/asc-web-common/package.json
# packages/asc-web-components/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Login/package.json
2021-05-29 21:57:42 +03:00
d585c0a785
Web: Bumped version to 0.1.10
2021-05-29 21:26:13 +03:00
Artem Tarasov
e7a7aed6ec
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# packages/asc-web-common/components/PageLayout/index.js
# products/ASC.Files/Client/src/Files.jsx
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Files/Client/src/store/index.js
2021-05-28 15:30:39 +03:00
25ac98e272
Merge branch 'develop' into feature/translations
...
# Conflicts:
# products/ASC.Files/Client/public/locales/en/DeleteDialog.json
# products/ASC.Files/Client/public/locales/en/Home.json
# products/ASC.Files/Client/public/locales/ru/DeleteDialog.json
# products/ASC.Files/Client/public/locales/ru/Home.json
2021-05-27 11:13:41 +03:00
Alexey Kostenko
727804180b
Revert "Web: Common: Added InfiniteLoader"
...
This reverts commit 09ff37ac0f
2021-05-27 10:38:06 +03:00
1e954b15d7
Web: Moved translationKeys "PasswordLimitLength", "PasswordLimitMessage", "PasswordLimitDigits", "PasswordLimitSpecialSymbols" and "PasswordLimitUpperCase" to "/static/locales/{lng}/Common.json"
2021-05-24 19:05:29 +03:00
1b940de5e2
Web: Common: removed I18nextProvider from PageLayout
2021-05-24 16:24:23 +03:00
Alexey Kostenko
09ff37ac0f
Web: Common: Added InfiniteLoader
2021-05-24 16:24:11 +03:00
66b30360de
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
...
# Conflicts:
# public/locales/de/Common.json
# public/locales/en/Common.json
# public/locales/ru/Common.json
2021-05-21 17:21:16 +03:00
389ee969a2
Web: Moved translationKeys "Pin" and "Unpin" to "/static/locales/{lng}/Common.json"
2021-05-21 17:19:00 +03:00
facf0a01cf
Web: Moved translationKeys "SignInWithFacebook", "SignInWithGoogle", "SignInWithLinkedIn", "SignInWithTwitter" to "/static/locales/{lng}/Common.json"
2021-05-21 16:37:46 +03:00
14214f2ad8
Web: Fixed translation usage for keys: "SignInWithFacebook", "SignInWithGoogle", "SignInWithLinkedIn", "SignInWithTwitter"
2021-05-21 15:00:30 +03:00
cda77e1234
Merge branch 'develop' into bugfix/context-actions
2021-05-20 13:24:18 +03:00
