0d3f441fd5
Web: Components: added body link for banner
2021-07-01 00:28:58 +03:00
6fe51a936e
Web: Components: added campaigns banner test
2021-06-30 18:35:25 +03:00
1edb2662f1
Web: Components: added campaigns banner storybook
2021-06-30 18:31:44 +03:00
be88eae6bf
Web: Components: added campaigns banner
2021-06-30 18:10:16 +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
Artem Tarasov
51e17e5510
Web: Files: fixed reset selection when open aside
2021-06-30 12:55:10 +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
d163e09a1c
Web: Components: added isLoading prop to modal-dialog
2021-06-30 10:23:49 +03:00
1a3cfcbf27
Web: Common: added new loaders
2021-06-30 10:22:01 +03:00
Artem Tarasov
8d1be25dbc
Web: Component: ViewSelector: fixed styled
2021-06-29 22:02:12 +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
d73bb73dab
Web: Components: rewrited component SwitchButton to ViewSelector
2021-06-29 15:27:46 +03:00
b0f64ca924
Merge branch 'develop' into feature/personal
2021-06-29 14:50:51 +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
d98954d921
Merge branch 'develop' into feature/thumbnails
2021-06-25 15:41:12 +03:00
715907f114
Merge branch 'develop' into feature/privacy-rooms-page
2021-06-25 15:01:19 +03:00
Artem Tarasov
50556cb428
Web: Thumbnails: deleted unnecessary code, refactoring
2021-06-25 14:30:14 +03:00
9462cd7bdd
Web: Storybook: Update package.json
2021-06-25 14:19:42 +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
b7ce849e32
Web: Components: Theme: Fixed line height for ComboBox component
2021-06-18 09:57:02 +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
Artem Tarasov
1073da9d58
Web: deleted unnecessary code
2021-06-11 14:55:53 +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
Vladislav Makhov
87c8da2355
web:components: change config
2021-06-10 18:06:25 +03:00
Vladislav Makhov
98d9881ef1
web: components: add snackbar
2021-06-10 17:20:09 +03:00
59bab6a085
Web: Files: fixed conversion progress
2021-06-09 13:28:22 +03:00
93c2f7fb07
Web: Component: added tooltipColor for help button
2021-06-09 04:02:58 +03:00
6fcddbcefa
Web: Components: added color for tooltip
2021-06-09 04:02:28 +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
60a7e84f60
Web: ProfileAction : Added locale usage for DateInput
2021-06-02 12:04:26 +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
792430a0c6
Web: Components: fixed combobox clickability
2021-05-27 14:50:23 +03:00
3ad8b7e1dc
Web: Components: fixed row checkbox clickability
2021-05-27 13:27:08 +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
757e90ee7a
Web: Components: fixed help-button iconName path
2021-05-26 17:16:32 +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
7e19a25b0c
Web: fixed text styles
2021-05-24 14:30: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
Alexey Kostenko
fbbec464d7
Web: Components: Updated ToggleButton (Added animation - framer-motion, and isLoading prop)
2021-05-20 19:11:44 +03:00
cda77e1234
Merge branch 'develop' into bugfix/context-actions
2021-05-20 13:24:18 +03:00
af2f24e4ac
Merge branch 'develop' into feature/translations
2021-05-20 13:11:13 +03:00
16d6db9054
Web: Files: fixed context-menu drag
2021-05-20 12:54:16 +03:00
fc822e5ad5
Web: Fix setModuleInfo usage
2021-05-20 11:27:50 +03:00
408f432be6
Web: Common: added urls on authenticator app
2021-05-20 06:37:56 +03:00
b2611343b6
Web: Common: get old backup codes
2021-05-20 01:44:03 +03:00
Artem Tarasov
5996b3f74f
Merge branch 'develop' into bugfix/fixed-styles
2021-05-20 01:00:36 +03:00
Artem Tarasov
80a09fdb31
Web: Client: NavMenu: fixed position version-box when change orientation or window size
2021-05-20 00:57:11 +03:00
4e57f2a47f
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-05-20 00:47:45 +03:00
37267b624f
Web: Common: added method for login with code and cookie
2021-05-19 18:21:40 +03:00
Alexey Kostenko
f25eb00494
Merge branch 'develop' into feature/access-rights-admins
2021-05-19 18:05:19 +03:00
8785f6151a
Web: Common: fixed reloading login page
2021-05-19 17:17:07 +03:00
03a71ae131
Merge branch 'bugfix/context-actions' of https://github.com/ONLYOFFICE/AppServer into bugfix/context-actions
...
# Conflicts:
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
2021-05-19 17:11:46 +03:00
3c6f831618
Web: Common: Api: Added removeShareFiles api method
2021-05-19 16:51:43 +03:00
2cd59d9014
Merge branch 'bugfix/context-actions' of https://github.com/ONLYOFFICE/AppServer into bugfix/context-actions
2021-05-19 13:55:13 +03:00
d5ff576188
Web: Files: Store: Added mark read action, added remove from list and mark read icons
2021-05-19 13:54:45 +03:00
d55c953805
Web: Files: fixed MediaViewer propTypes
2021-05-19 13:45:37 +03:00
536c6c2f5e
Web: Moved custom.scss to @appserver/common
...
+ Added missing ErrorBoundary
+ Removed useless commented code
2021-05-19 11:14:44 +03:00
b1b6bdc516
Web: Common: refactoring tfa store
2021-05-19 03:48:13 +03:00
07934f6cd9
Web: Common: fixed firefox header
2021-05-18 17:59:34 +03:00
6c51f15d28
Web: Components: fixed toggle-button styles
2021-05-18 17:58:45 +03:00
20403e2c98
Web: Common: reset tfa app
2021-05-17 23:28:52 +03:00
e87e0272ae
Web: Common: get tfa backup codes
2021-05-17 17:32:12 +03:00
d34e1eeaa6
Web: Common: deleted console.log
2021-05-17 16:54:21 +03:00
cce7b94d5d
Web: Common: deleted console.log
2021-05-17 16:52:38 +03:00
fadd46112c
Web: Common: added login with tfa code method, fixed url
2021-05-17 16:33:01 +03:00
f5998b650a
Web: Common: added login with tfa code method
2021-05-17 16:32:40 +03:00
bb8124d1fa
Web: Common: added login with tfa code method
2021-05-17 16:32:22 +03:00
Artem Tarasov
9eb3b2a375
Web: Components/Client: fix tree loader, fix version badge
2021-05-17 12:40:46 +03:00
Artem Tarasov
d43493e787
Merge branch 'develop' into bugfix/fixed-styles
2021-05-16 00:50:21 +03:00
Artem Tarasov
31105f4eb8
Web: Components: TreeMenu: fixed badge hitting the name of an item in menu wit a large number of new notifications
2021-05-16 00:50:09 +03:00
Artem Tarasov
f7c880c56e
Web: Common: PageLayout: fixed position scrollbar in article
2021-05-16 00:49:10 +03:00
77f17d55b6
Web: Common: redirect on confirm page
2021-05-14 15:59:15 +03:00
9b54835996
Web: Common: get secret key and qr
2021-05-14 15:58:50 +03:00
Alexey Kostenko
1d036e33d6
Merge branch 'develop' into feature/access-rights-admins
2021-05-14 13:13:34 +03:00
85bd971735
Merge branch 'develop' into feature/translations
2021-05-14 12:07:48 +03:00
eb628d3703
Merge branch 'develop' into bugfix/enable-favorites-recent-settings
2021-05-14 11:34:10 +03:00
1a58007fcd
Web: Common: removed custom selection frame
2021-05-14 11:21:59 +03:00
ef085ef7df
Web: Files: enable favorites and recent settings
2021-05-14 11:08:57 +03:00
0d98b05210
Web: Files: fixed icons clickability
2021-05-13 16:57:10 +03:00
Artem Tarasov
940dc60684
Web: Components: fix style of IconButton in PasswordInput Components
2021-05-13 00:00:55 +03:00
f05147eb29
Web: Common: fixed clickability for mobile devices
2021-05-12 16:53:40 +03:00
72ed5e031c
Web: Common: hide delete icon from MediaViewer for shared folder
2021-05-12 14:05:54 +03:00
e84fc5b5e3
Web: Common: redirect on confirm link
2021-05-12 12:10:08 +03:00
9ea5a131e8
Web: Files: fixed MediaViewer crash
2021-05-12 11:55:34 +03:00
Alexey Kostenko
f9c2eaefa6
Web: Components: Added prop - onClick anywhere in the row, except the checkbox and context menu
2021-05-11 14:54:30 +03:00
c857751572
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
...
# Conflicts:
# yarn.lock
2021-05-11 12:22:17 +03:00
Artem Tarasov
58a41faa4a
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# yarn.lock
2021-05-11 10:30:19 +03:00
Alexey Kostenko
62c789d68b
Merge branch 'develop' into feature/access-rights-admins
2021-05-11 10:19:31 +03:00
57a4b8a9b8
Upgrade lodash to version 4.17.21 (lodash vulnerability issue)
2021-05-07 21:12:25 +03:00
3ae370deed
Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop
2021-05-07 18:54:42 +03:00
6c3244a3e9
Web: Added opportunity to deploy all static clients to build/deploy directory (yarn build && yarn deploy)
2021-05-07 18:54:25 +03:00
7a27280dc3
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-05-07 14:49:44 +03:00
7c2f36635b
Web: Common: refactoring
2021-05-07 14:32:00 +03:00
221edc5c33
Web: Common: get tfa settings
2021-05-07 14:22:21 +03:00
95c9c9d1a3
Merge branch 'develop' into feature/portal-modal-dialog
2021-05-06 16:30:31 +03:00
b7af18f636
v0.1.9
2021-05-06 14:57:01 +03:00
71e1468835
Web: Common: fixed MediaViewer styles
2021-05-06 12:52:19 +03:00
c50c65a1c5
Web: Components: moved ModalDialog to Portal
2021-05-06 12:49:53 +03:00
3365d1a1dc
Web: Client: added showCopyLink prop to password-input component, fixed displaying "copy email and password" link
2021-05-05 15:48:19 +03:00
daef594561
Web: Packages: added tfa store
2021-05-05 14:59:08 +03:00
605f7d749e
Web: Components: FloatingButton: Added rotation on percent === 0
2021-05-04 22:14:42 +03:00
35ef6c27bf
Web: Files: removed file format for unselected items
2021-05-04 17:42:06 +03:00
026306d7ca
Web: Login: Fix hard-coded list of trusted domains on registration
2021-05-04 15:35:09 +03:00
bdc681f94a
Web: Files: Fix favorite flag setup (thirdParty issue)
2021-05-04 11:18:24 +03:00
e61375c348
Merge branch 'hotfix/v0.1.9' of https://github.com/ONLYOFFICE/AppServer into hotfix/v0.1.9
2021-04-30 17:25:32 +03:00
7ba67cf63a
Web: Fix click on webView link on ComingSoonPage (CRM, Projects, Mail, Calendar)
2021-04-30 17:25:26 +03:00
bec2690510
Web: fixed files productName
2021-04-30 16:47:47 +03:00
d55b39a653
Web: Files: Added and fix AutoFocus, tabulation and close on errors in ConnectDialog
2021-04-30 14:02:58 +03:00
Alexey Kostenko
17d4b0a4db
Merge branch 'develop' into feature/access-rights-admins
2021-04-29 15:11:50 +03:00
61695dfb5f
Web: Files: Hide Facebook share link (new FB SDK required)
2021-04-29 13:44:37 +03:00
9e40feb771
Added and applied Common.json for common translations (languages issue)
2021-04-29 10:14:47 +03:00
Alexey Kostenko
5f81e5a0ce
Web: Client: Added group button menu, fixed api getListAdmins, the ability to add new administrators
2021-04-29 09:40:55 +03:00
14719ed698
Web: Components: fixed checkbox icons style
2021-04-27 14:31:05 +03:00
2b6d536590
Merge branch 'release/v0.1.8' of https://github.com/ONLYOFFICE/AppServer into release/v0.1.8
2021-04-27 13:48:38 +03:00
Artem Tarasov
5d2264d483
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# products/ASC.Files/Client/src/components/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/FileItem.js
# products/ASC.Files/Client/src/components/FilesContainer.js
# products/ASC.Files/Client/src/components/FilesContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/components/sub-components/Badges.js
# products/ASC.Files/Client/src/components/sub-components/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/sub-components/Icons.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleRowContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/BadgesFileTile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/SimpleTileContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/TileContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/TileContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
2021-04-27 13:40:38 +03:00
c324693034
Merge branch 'develop' into release/v0.1.8
2021-04-27 12:11:36 +03:00
Alexey Kostenko
a550197bc5
Web: Common: Fixed getAuthProviders api url
2021-04-27 12:02:51 +03:00
c6a08a50f9
Web: Fixed language for users then not changed language at profile yet.
2021-04-27 11:39:16 +03:00
a46f8ed04a
Web: Common: Fix openEdit query param
2021-04-26 19:02:40 +03:00
f3610ce7f6
Web: Common: Fix openEdit query param
2021-04-26 19:02:16 +03:00
cad6ee216c
Web: Components: Badge: Fixed event propagation for Badge component
2021-04-26 10:25:45 +03:00
7c9e35d004
Web: Components: ContextMenuButton: Fixed out of event call for new menu item
2021-04-26 09:45:57 +03:00
d2588270cf
Merge branch 'master' into develop
2021-04-23 20:16:42 +03:00
838435bab5
Merge branch 'hotfix/v0.1.7' of https://github.com/ONLYOFFICE/AppServer into hotfix/v0.1.7
2021-04-23 18:00:17 +03:00
cd699e37e2
Files: Fix opening of version
2021-04-23 18:00:05 +03:00
8159ae7b69
Web: Components: Row: Added new context-menu usage inside row
2021-04-23 17:58:06 +03:00
02bcb50e67
Web: Files: Fix ConnectedClouds context-options work
2021-04-23 15:02:57 +03:00
Alexey Kostenko
707f9bab50
Web: Common: Added proxy to OAuth login URL
2021-04-23 13:17:40 +03:00
Alexey Kostenko
b1ef3639c6
Fix
2021-04-22 16:13:02 +03:00
Alexey Kostenko
2d6083c972
Web: Components: Fixed warnings
2021-04-22 16:10:26 +03:00
Alexey Kostenko
8519fe4d60
Web: Components: SocialButton style fix
2021-04-22 14:54:06 +03:00
Alexey Kostenko
667a76b95f
Oauth: Refactoring
2021-04-22 13:34:42 +03:00
Alexey Kostenko
138fe92f9f
OAuth: Refactoring
2021-04-21 16:31:18 +03:00
Alexey Kostenko
691e7d5498
Merge branch 'develop' into feature/oauth2.0
2021-04-21 15:04:26 +03:00
1658e0d60a
Web: Common: removed custom SelectedFrame, fixed frame styles
2021-04-21 11:48:50 +03:00
Artem Tarasov
7f4888d2a2
Web: Files: fix drag
2021-04-21 02:23:31 +03:00
TatianaLopaeva
0f3eb1350b
Merge branch 'develop' into feature/team-template
...
# Conflicts:
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
2021-04-20 12:05:19 +03:00
0b0dbb971f
Web: Settings: Fix enabledJoin setup
2021-04-19 18:39:00 +03:00
3734027f4f
Web: Files: fixed newItem styles
2021-04-19 14:16:42 +03:00
9b6e4ace8b
Web: Files: fixed badge for tree menu
2021-04-19 14:08:40 +03:00
Alexey Kostenko
d9860256ec
Web: Common/Components: FacebookButton style fix
2021-04-19 09:49:47 +03:00
e586d42d3b
Web: Added clickBackdrop() for close unpinned Article on Tablet and Mobile
2021-04-16 20:23:08 +03:00
TatianaLopaeva
ab10641b45
Web: Rename teamTemplate.
2021-04-16 17:10:37 +03:00
Alexey Kostenko
8cb74d14b4
Web: Client/Common: Added thirdParty signup api
2021-04-16 16:34:24 +03:00
7062c713ad
Merge branch 'bugfix/v0.1.6' of https://github.com/ONLYOFFICE/AppServer into bugfix/v0.1.6
2021-04-16 16:05:01 +03:00
a289256846
Web: Files: added ConflictResolveDialog, refactoring files operations
2021-04-16 16:04:50 +03:00
TatianaLopaeva
052157d1fe
Web: Rename functions.
2021-04-16 15:35:02 +03:00
TatianaLopaeva
d4da2a8cbb
Web: Fixed width of input for horizontal orientation.
2021-04-16 14:38:17 +03:00
Alexey Kostenko
96ec652313
Merge branch 'develop' into feature/oauth2.0
2021-04-16 14:25:37 +03:00
Vladislav Makhov
c60d653bc1
web: fix hiding unpinned article when menu item clicked
2021-04-16 13:41:36 +03:00
TatianaLopaeva
297e4f42e9
Merge branch 'develop' into feature/team-template
2021-04-16 09:25:43 +03:00
TatianaLopaeva
e738cab4a2
Web: Added Error message & Added loader.
2021-04-15 19:51:59 +03:00
Artem Tarasov
54b96e8aa0
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/SelectedFrame.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/FilesRowContainer.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
2021-04-15 15:05:15 +03:00
Artem Tarasov
f8c69fd939
Web: Common: Loaders: added loaders for tiles
2021-04-15 11:47:02 +03:00
13d083f01c
Web: GroupMenu: Fix wrong items title displaying
2021-04-15 10:54:12 +03:00
33f5a07c70
Web: Files: fixed search by subfolders
2021-04-15 10:27:23 +03:00
TatianaLopaeva
fc40487de0
Web: Added setCurrentShema and setCustomShema methods, added form validation.
2021-04-14 14:26:26 +03:00
Artem Tarasov
74a5bf33dc
Web: Files: fix drag, deleted console.log
2021-04-14 12:41:08 +03:00
Artem Tarasov
4be1db4c9a
Web: Files: added calling the context menu when right-clicking on a tile
2021-04-14 00:09:51 +03:00
TatianaLopaeva
39064cf4e2
Web: Settings: Added cancel and save button.
2021-04-13 22:51:43 +03:00
4b5c73b3e7
Web: fixed input user-select
2021-04-13 17:05:23 +03:00
a321619c98
Web: fixed input select
2021-04-13 15:18:33 +03:00
TatianaLopaeva
ff370259e9
Web: Added "learn more and help url for common setting.
2021-04-13 14:47:46 +03:00
TatianaLopaeva
3487e40c51
Web: Settings: Added logic for team template, added getCustomSchema.
2021-04-13 14:34:04 +03:00
c324404767
Web: fixed firefox frame
2021-04-13 14:07:44 +03:00
Alexey Kostenko
e99f66267f
Style fix
2021-04-13 13:15:30 +03:00
c7017920e8
Web: fixed selection for mobile devices
2021-04-13 12:56:03 +03:00
5daf690ffb
Web: fixed selection
2021-04-13 12:49:37 +03:00
5936640ce2
Web: fixed selection
2021-04-13 12:43:17 +03:00
Alexey Kostenko
571b412d27
Web: Client/Components: Fixed facebook button styles/icon, fixed translations
2021-04-13 11:17:39 +03:00
Alexey Kostenko
544a24d0f1
Web: Client/Components: Style fix and added translations
2021-04-13 09:45:52 +03:00
8cfd5eb644
Web: Added SelectedFrame
2021-04-13 09:35:07 +03:00
Alexey Kostenko
cf7072a714
Refactoring
2021-04-12 10:57:21 +03:00
