|
9236a83ab8
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-08-30 16:04:45 +03:00 |
|
|
880d73ae22
|
Fix Bug 52269 - Client. Files. Removed sorting by "Author" for personal
|
2021-08-30 16:04:35 +03:00 |
|
|
51c2341248
|
Fix Bug 52089 - Client.Files. Elements of the page are not selected using left mouse button.
|
2021-08-30 15:59:17 +03:00 |
|
|
e1f320c2f1
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-08-27 17:45:59 +03:00 |
|
|
ccd7532161
|
Merge branch 'develop' into release/1.0.0
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
|
2021-08-27 17:45:52 +03:00 |
|
|
2a872fe337
|
Fix Bug 52089 - Client.Files. Elements of the page are not selected using left mouse button.
|
2021-08-27 17:10:26 +03:00 |
|
|
45865753a2
|
Web: Components: Table: fixed onResize error
|
2021-08-27 14:18:13 +03:00 |
|
|
a4d12a2c75
|
Web: Files: removed console.log
|
2021-08-27 14:06:24 +03:00 |
|
|
f740b63fa5
|
Web: Components: fixed hasAccess
|
2021-08-26 17:50:27 +03:00 |
|
|
6bb9cb2235
|
Web: People: fixed user access for module People
|
2021-08-26 17:47:21 +03:00 |
|
|
833cd9553c
|
Web: Files: fixed FilesTableRow after merge
|
2021-08-26 16:20:02 +03:00 |
|
|
ff7f3926ce
|
Merge branch 'develop' into feature/table-view
# Conflicts:
# packages/asc-web-common/components/PageLayout/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# public/locales/de/Common.json
# public/locales/it/Common.json
# public/locales/lo/Common.json
# public/locales/pt-BR/Common.json
# public/locales/ro/Common.json
|
2021-08-26 16:05:15 +03:00 |
|
|
c66268a9c2
|
Merge branch 'develop' into release/1.0.0
# Conflicts:
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/helpers/utils.js
|
2021-08-26 13:49:25 +03:00 |
|
|
e5c15cb7a7
|
Web: Files: Table: fixed drag styles
|
2021-08-25 16:53:26 +03:00 |
|
|
8727b504b7
|
Merge branch 'develop' into feature/table-view
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
|
2021-08-25 16:48:07 +03:00 |
|
|
248d70cbf9
|
Web: Components: group-button: Added alt text for component
|
2021-08-24 16:31:16 +03:00 |
|
|
0cfb70d9e2
|
Error 52089 - Client.Files. Elements of the page are not selected using left mouse button.
|
2021-08-23 13:50:21 +03:00 |
|
|
36987fb1f3
|
Web: Remove useless condition, defined display type of panels.
|
2021-08-19 18:35:04 +03:00 |
|
|
3b8cf0a275
|
Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/helpers/utils.js
# web/ASC.Web.Editor/src/Editor.jsx
|
2021-08-19 10:08:14 +03:00 |
|
|
46a97efb52
|
Merge branch 'develop' into release/1.0.0
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
|
2021-08-18 16:59:00 +03:00 |
|
|
34408c6e41
|
Web: Components: added style props for snackbar
|
2021-08-17 21:20:31 +03:00 |
|
|
88d18dd648
|
Web: Files: fixed row styles
|
2021-08-17 17:55:11 +03:00 |
|
|
93c2b06f06
|
Web: Files: removed unused code
|
2021-08-17 15:38:59 +03:00 |
|
|
6ebffc1784
|
Web: Components: fixed Link re-render
|
2021-08-17 15:19:33 +03:00 |
|
|
fce37422f4
|
Web: Components: fixed styled, fixed isViewedSelected error
|
2021-08-16 12:15:36 +03:00 |
|
|
f5e9e17e11
|
Merge branch 'develop' into feature/table-view
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
|
2021-08-16 10:53:48 +03:00 |
|
|
36b464a29b
|
Web: Components: delete console.log
|
2021-08-04 11:57:12 +03:00 |
|
|
3c97f8e736
|
Web: Table: fixed TableGroupMenu resize
|
2021-08-02 18:16:15 +03:00 |
|
|
8fca0ae6d1
|
Web: Components: Table: fixed styles, refactoring
|
2021-08-02 13:17:34 +03:00 |
|
|
371bba612d
|
Web: Components: fixed IconButton onClick
|
2021-08-02 12:30:55 +03:00 |
|
|
da6816f04c
|
Web: Components: Table: fixed header crash
|
2021-08-02 11:50:44 +03:00 |
|
|
86a0f18258
|
Web: Components: Fixed memory leak after transition from model view to aside view.
|
2021-08-02 11:21:38 +03:00 |
|
|
432095072b
|
Web: Table: fixed resize
|
2021-07-30 19:13:45 +03:00 |
|
|
eff32de5f3
|
Web: Components: Table: fixed TableGroupMenu
|
2021-07-30 18:04:05 +03:00 |
|
|
57b1382a87
|
Web: fixed article panel resize
|
2021-07-30 16:08:54 +03:00 |
|
|
562e1f203b
|
Web: Components: Table: added min column width
|
2021-07-30 14:51:40 +03:00 |
|
|
ead5d1f6a1
|
Web: Files: SelectorFolder: The component has been simplified and extended (aside view).
|
2021-07-30 14:18:11 +03:00 |
|
|
e469f6b555
|
Web: Components: fixed the logic of adding new columns
|
2021-07-30 13:54:13 +03:00 |
|
|
1648777ffa
|
Web: Components: Table: fixed columns resize
|
2021-07-30 10:02:30 +03:00 |
|
|
6829a2c854
|
Web: People: added table view, refactoring
|
2021-07-29 20:21:26 +03:00 |
|
|
bd2a5070a2
|
Web: Components: fixed checkbox onChange event
|
2021-07-29 18:13:57 +03:00 |
|
|
24a550cf57
|
Web: People: created new HOCs for people, refactoring
|
2021-07-28 21:06:14 +03:00 |
|
|
eb1049790b
|
Web: Files: fixed table filter
|
2021-07-28 17:22:50 +03:00 |
|
|
2abbd580c2
|
Merge branch 'develop' into feature/table-view
# Conflicts:
# public/locales/en/Common.json
# public/locales/ru/Common.json
|
2021-07-28 16:53:23 +03:00 |
|
|
3edc22c2fb
|
Web: Files: added change of view from table to rows
|
2021-07-28 16:42:07 +03:00 |
|
|
b1ddf85906
|
Web: Components: fixed view-selector selection bug
|
2021-07-28 16:37:34 +03:00 |
|
|
6b08fa8a84
|
Web: Files: fixed table styles
|
2021-07-27 16:02:25 +03:00 |
|
|
475d6d638f
|
Web: Files: added column filtering
|
2021-07-27 15:22:51 +03:00 |
|
|
445c7ae43f
|
Web: Files: added cell type
|
2021-07-27 13:51:56 +03:00 |
|
|
c834c7615a
|
Web: Components: fixed banner button color
|
2021-07-27 12:47:55 +03:00 |
|
|
3c7d700a49
|
Web: Components: added new logic for resizing columns
|
2021-07-26 17:42:45 +03:00 |
|
|
e17c996111
|
Web: Components: fixed snackbar button
|
2021-07-26 12:31:56 +03:00 |
|
|
d86605e2da
|
Web: Files: added drag and drop for table
|
2021-07-23 18:13:06 +03:00 |
|
|
7f389e200e
|
Web: Files: added dragOptions to TableRow
|
2021-07-23 16:19:53 +03:00 |
|
|
b02bf63a8e
|
Web: Files: fixed display of share column
|
2021-07-23 14:17:23 +03:00 |
|
|
89f63d3326
|
Web: Components: added button decoration
|
2021-07-23 12:23:00 +03:00 |
|
|
09c9cfe645
|
Web: Table: added the opportunity to hide columns, fixed styles, refactoring
|
2021-07-22 16:55:26 +03:00 |
|
|
e7f9bba04c
|
Web: Components: fixed snackbar close
|
2021-07-21 12:40:52 +03:00 |
|
|
c92d8318f1
|
Web: Files: fixed header sorting, removed unused code
|
2021-07-21 12:16:46 +03:00 |
|
|
8c76638669
|
Web: Components: added insert html in snackbar
|
2021-07-21 10:52:15 +03:00 |
|
|
b903e58002
|
Web: Components: rewriting snackbar on class component
|
2021-07-21 07:15:25 +03:00 |
|
|
044168c6db
|
Web: Components: fixed header styles
|
2021-07-20 16:01:54 +03:00 |
|
|
d84229886f
|
Web: Components: Table: added header filtering, refactoring
|
2021-07-20 13:29:39 +03:00 |
|
|
dc8fd150a3
|
Web: Components: added header align props
|
2021-07-20 13:28:36 +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 |
|
|
02c39878d4
|
Web: Components: added text style props
|
2021-07-20 13:19:56 +03:00 |
|
|
0127a555c8
|
Web: Components: added show icon props
|
2021-07-20 13:07:50 +03:00 |
|
|
514aadfc13
|
Web: Components: fixed color props
|
2021-07-20 11:27:07 +03:00 |
|
|
a3b20c12dc
|
Web: Components: added color props
|
2021-07-20 11:07:41 +03:00 |
|
|
f645d6acc0
|
Web: Components: added background image props
|
2021-07-20 06:51:29 +03:00 |
|
|
5ed5adbb9b
|
Web: Components: Table: added settings, fixed table group menu header
|
2021-07-19 14:09:09 +03:00 |
|
|
b957b48c4e
|
Web: Components: Table: fixed header styles
|
2021-07-16 15:32:46 +03:00 |
|
|
bfa7f75eb2
|
Web: Files: added translations to TableHeader.js
|
2021-07-16 13:24:25 +03:00 |
|
|
4cb025b5b2
|
Web: Files: added selectbox support
|
2021-07-16 12:36:47 +03:00 |
|
|
a5835615b9
|
Web: Components: Table: added default header styles
|
2021-07-16 11:55:59 +03:00 |
|
|
cd8242ee69
|
Web: Files: added context-menu to files module
|
2021-07-15 18:10:37 +03:00 |
|
|
2751e0710b
|
Web: Components: added table container styles
|
2021-07-15 16:56:12 +03:00 |
|
|
d1ec4a262b
|
Web: Components: added TableGroupMenu
|
2021-07-15 16:55:24 +03:00 |
|
|
568aa61071
|
Web: Table: refactoring
|
2021-07-15 10:57:06 +03:00 |
|
|
624b0703c9
|
Web: Components: fixed color
|
2021-07-15 09:56:09 +03:00 |
|
|
d7b5f504ed
|
Web: Components: added btnText props
|
2021-07-15 09:55:21 +03:00 |
|
|
29866d73ac
|
Web: Components: deleted unused
|
2021-07-14 17:13:16 +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 |
|
|
245928b14e
|
Web: Components: removed unused table files
|
2021-07-13 11:52:34 +03:00 |
|
|
08a380d5aa
|
Web: Table: changed the logic of work
|
2021-07-13 11:07:50 +03:00 |
|
|
cc2377aa33
|
Merge branch 'develop' into feature/table-view
|
2021-07-12 11:19:59 +03:00 |
|
|
4295ec2ecc
|
Web: Components: Snackbar: Fixed mobile and small tablet margin
|
2021-07-09 19:21:34 +03:00 |
|
|
3cfc3bd924
|
Web: Components: Snackbar: Fixed mobile margin
|
2021-07-09 19:10:34 +03:00 |
|
|
39b7163267
|
Web: Files: added new table cells, fixed table styles
|
2021-07-09 13:39:09 +03:00 |
|
|
64f455eb59
|
Web: init table view
|
2021-07-09 11:59:20 +03:00 |
|
|
67902f2072
|
Merge branch 'develop' into feature/backup
|
2021-07-07 15:15:59 +03:00 |
|
|
57b485906c
|
Web: Components: fixed banner margin
|
2021-07-02 18:08:04 +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 |
|
|
749728d085
|
Web: Components: fixed banner width
|
2021-07-02 13:21:54 +03:00 |
|
|
c940aae128
|
Web: refactoring translation loaders
|
2021-07-02 12:25:36 +03:00 |
|
|
6fa5368336
|
Web: Components: fixed banner sub-header line height
|
2021-07-01 15:18:02 +03:00 |
|
|
bca3f0f3d8
|
Web: Components: fixed banner width for tablet
|
2021-07-01 14:36:48 +03:00 |
|
|
79c7a461d7
|
Web: Components: fixed banner width
|
2021-07-01 13:46:18 +03:00 |
|
|
a7d56b56f2
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/CampaignsBanner
|
2021-07-01 13:12:18 +03:00 |
|
|
a489e73245
|
Web: Components: fixed banner styles
|
2021-07-01 12:23:20 +03:00 |
|
|
e2adbff10f
|
Web: Components: fixed banner styles
|
2021-07-01 11:52:56 +03:00 |
|
|
a4929bbdd4
|
Web: Components: fixed banner style
|
2021-07-01 11:23:39 +03:00 |
|
|
fe1a787d1b
|
Web: Components: disabled hover button in banner
|
2021-07-01 10:51:47 +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 |
|
|
348a0577e7
|
Web: Components: fixed banner
|
2021-07-01 00:50:15 +03:00 |
|
|
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 |
|
|
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 |
|
|
db7954ee31
|
Merge branch 'develop' into feature/backup
|
2021-06-30 15:54:45 +03:00 |
|
Artem Tarasov
|
51e17e5510
|
Web: Files: fixed reset selection when open aside
|
2021-06-30 12:55: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 |
|
Artem Tarasov
|
8d1be25dbc
|
Web: Component: ViewSelector: fixed styled
|
2021-06-29 22:02:12 +03:00 |
|
Artem Tarasov
|
3385d367d4
|
Web: Files: refactoring
|
2021-06-29 15:48:17 +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
|
d98954d921
|
Merge branch 'develop' into feature/thumbnails
|
2021-06-25 15:41:12 +03:00 |
|
|
9462cd7bdd
|
Web: Storybook: Update package.json
|
2021-06-25 14:19: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 |
|
|
ae17671043
|
Merge branch 'develop' into feature/backup
# Conflicts:
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/store/SettingsSetupStore.js
|
2021-06-18 18:08:38 +03:00 |
|
|
a55544454a
|
Web: Common: added support scroll to selectbox, fixed styles
|
2021-06-18 17:17:59 +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 |
|
|
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 |
|
|
3fe118fc3d
|
Web: Components: SaveCancelButtons: Added propType.
|
2021-06-17 09:31:35 +03:00 |
|
|
f9ee63f723
|
Web: Components: FileInput: Deleted debugger.
|
2021-06-15 16:38:33 +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 |
|
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 |
|
|
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 |
|
|
3ef16948fc
|
Merge branch 'develop' into feature/backup
# Conflicts:
# common/services/ASC.Data.Backup/Core/NotifyHelper.cs
# products/ASC.Files/Client/public/locales/en/OperationsPanel.json
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# 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/common/customization.js
|
2021-06-08 15:03:49 +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 |
|
|
60a7e84f60
|
Web: ProfileAction : Added locale usage for DateInput
|
2021-06-02 12:04:26 +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 |
|