|
ea4f050ede
|
Web: Common: removed unused props from the pageLayout
|
2020-04-28 11:58:09 +03:00 |
|
NikolayRechkin
|
59a3f9c665
|
web: common: MediaViewer. Refactoring
|
2020-04-25 21:03:13 +03:00 |
|
NikolayRechkin
|
c1121ba621
|
web: common: MediaViewer. adaptive viewer size
|
2020-04-25 19:49:00 +03:00 |
|
NikolayRechkin
|
e826dac989
|
web: components: MediaViewer. Refactoring
|
2020-04-24 21:53:30 +03:00 |
|
NikolayRechkin
|
714f37294b
|
web: common: MediaViewer. added audio support
|
2020-04-24 15:28:17 +03:00 |
|
Ilya Oleshko
|
72980c6bdd
|
web: common: bump version
|
2020-04-24 11:30:26 +03:00 |
|
Ilya Oleshko
|
7569b50083
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-04-24 10:17:14 +03:00 |
|
Ilya Oleshko
|
a06fc5a656
|
Web: Common: Api: Added openEdit for files api
|
2020-04-24 10:15:07 +03:00 |
|
NikolayRechkin
|
7c8e567879
|
web: common: first version of MediaViewer
|
2020-04-24 00:44:47 +03:00 |
|
NikolayRechkin
|
c9e4d23394
|
Merge remote-tracking branch 'remotes/origin/feature/files' into feature/media-viewer
|
2020-04-23 13:58:02 +03:00 |
|
|
2330693b7d
|
web: common: bump version
|
2020-04-23 13:08:41 +03:00 |
|
NikolayRechkin
|
f8749e437a
|
web: common: bump version
|
2020-04-23 12:37:56 +03:00 |
|
|
7b76d26e29
|
web: common: bump version
|
2020-04-23 12:04:55 +03:00 |
|
|
fa68bedd98
|
Web: Files: added upload files
|
2020-04-23 11:55:45 +03:00 |
|
NikolayRechkin
|
324b1c4ceb
|
web: common: MediaViewer. added common styles
|
2020-04-22 20:44:09 +03:00 |
|
NikolayRechkin
|
bb94d506c0
|
web: common: fix video viewer
|
2020-04-21 13:49:23 +03:00 |
|
NikolayRechkin
|
921bde3d9e
|
web: common: first version of the video viewer
|
2020-04-20 09:32:27 +03:00 |
|
NikolayRechkin
|
1b918fca81
|
web: common: init video viewer
|
2020-04-19 23:09:12 +03:00 |
|
NikolayRechkin
|
1820a6a828
|
web: common: init MediaViewer
|
2020-04-19 23:06:17 +03:00 |
|
|
e5d4709463
|
web: common: bump version
|
2020-04-07 11:13:17 +03:00 |
|
|
000505b656
|
Web: Common: added share access rights enum
|
2020-04-07 11:10:32 +03:00 |
|
|
da42fb0f42
|
web: common: bump version
|
2020-04-07 10:31:33 +03:00 |
|
|
df7718c6a3
|
Web: Common: added sharing api
|
2020-04-07 10:17:57 +03:00 |
|
|
df549c6e6a
|
web: common: bump version
|
2020-04-02 12:16:05 +03:00 |
|
|
8b95f6af27
|
Web: Files: moved shareData to redux, added new api requests, refactoring
|
2020-04-02 12:15:35 +03:00 |
|
|
e199ff703a
|
Web: Common: removed unused styles from AdvancedSelector
|
2020-03-31 13:50:28 +03:00 |
|
|
e9e6032914
|
web: common: bump version
|
2020-03-30 14:35:43 +03:00 |
|
|
b71743cabe
|
Web: Common: removed ComboBox from advansedSelector, added embeddedComponent
|
2020-03-30 14:31:50 +03:00 |
|
|
841c2b9c28
|
web: common: bump version
|
2020-03-28 13:20:50 +03:00 |
|
|
f701a1b000
|
Web: Common: added new propTypes to AdvancedSelector
|
2020-03-28 13:20:27 +03:00 |
|
|
7cdbe7c079
|
Web: Common: added ability to display combobox in footer of advanced selector, added new props to PeopleSelector and GroupSelector
|
2020-03-28 13:10:32 +03:00 |
|
Ilya Oleshko
|
f825b3b108
|
web: common: bump version
|
2020-03-26 17:13:25 +03:00 |
|
Ilya Oleshko
|
80acbc1061
|
Web: Common: Added application of columnCount parameter inside FilterInput component
|
2020-03-26 17:11:58 +03:00 |
|
|
63bf49d256
|
Web: Files: added DeleteDialog dialog, added removeFiles api request
|
2020-03-24 14:36:47 +03:00 |
|
Daniil Senkiv
|
a0b3345fc6
|
web: common: bump version
|
2020-03-23 13:47:59 +03:00 |
|
Daniil Senkiv
|
cf5946dece
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files
|
2020-03-23 13:47:40 +03:00 |
|
Daniil Senkiv
|
c38f4022de
|
web.files: MainButton: fix selector
|
2020-03-23 13:47:28 +03:00 |
|
|
51c83460cd
|
Web: Files: added TreeFolders update after rename or delete action
|
2020-03-23 13:42:37 +03:00 |
|
Daniil Senkiv
|
8ff996e72d
|
web: common: bump version
|
2020-03-20 16:01:14 +03:00 |
|
Daniil Senkiv
|
46bc8fdeb7
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files
|
2020-03-20 15:59:34 +03:00 |
|
Daniil Senkiv
|
7a2ae47eb0
|
Web.Files/Common: Filter: add folder param instead of hash param
|
2020-03-20 15:59:06 +03:00 |
|
|
805713f2a0
|
web: common: bump version
|
2020-03-20 15:15:21 +03:00 |
|
|
04f28c2a71
|
Web: Files: replaced rootFolders to treeFolders
|
2020-03-20 14:59:07 +03:00 |
|
|
b25eb5b914
|
web: common: bump version
|
2020-03-19 15:26:31 +03:00 |
|
|
eadec341c6
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-03-19 15:25:40 +03:00 |
|
|
c1782f774a
|
Web: Files: added Empty TrashDialog with translations
|
2020-03-19 15:25:11 +03:00 |
|
Ilya Oleshko
|
5d8a94324e
|
web: common: bump version
|
2020-03-19 15:07:24 +03:00 |
|
Ilya Oleshko
|
8269dc8560
|
Web: Common: Api: Files: Added getFoldersTree request
|
2020-03-19 15:07:05 +03:00 |
|
Daniil Senkiv
|
bdac987529
|
web: common: bump version
|
2020-03-19 14:52:16 +03:00 |
|
Daniil Senkiv
|
e9243547e2
|
Web.Common: Filter: fix work with selectors
|
2020-03-19 14:52:02 +03:00 |
|
Daniil Senkiv
|
df76148505
|
web: common: bump version
|
2020-03-19 13:49:25 +03:00 |
|
Daniil Senkiv
|
9d0cef81dd
|
Web.Common: fix folderTree
|
2020-03-19 13:49:16 +03:00 |
|
Daniil Senkiv
|
9b8f2f69a6
|
web: common: bump version
|
2020-03-19 11:40:58 +03:00 |
|
Daniil Senkiv
|
4b20b8578c
|
Web.Files: Filter: apply withSubfolders param correctly
|
2020-03-19 11:40:42 +03:00 |
|
Daniil Senkiv
|
c1bbf62609
|
Web.Files: get info about author of file before showing interface with fix
|
2020-03-19 09:15:58 +03:00 |
|
Daniil Senkiv
|
339f8cfcfb
|
web: common: bump version
|
2020-03-18 15:11:07 +03:00 |
|
Daniil Senkiv
|
0faa3a74ed
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files
|
2020-03-18 15:10:14 +03:00 |
|
Daniil Senkiv
|
dacbf30366
|
Web.Files: get info about author of file before showing interface
|
2020-03-18 15:09:56 +03:00 |
|
|
7314c218eb
|
web: common: bump version
|
2020-03-18 13:09:26 +03:00 |
|
|
15c5114a10
|
Update yarn.lock files
|
2020-03-18 13:08:58 +03:00 |
|
Ilya Oleshko
|
2d70a7fbcc
|
web: common: bump version
|
2020-03-18 11:42:38 +03:00 |
|
Ilya Oleshko
|
cb9a587f7a
|
Web: Common: Constants: Added FileAction constant
|
2020-03-18 11:39:43 +03:00 |
|
|
d694819eda
|
web: common: bump version
|
2020-03-16 10:49:47 +03:00 |
|
|
eb21f8a957
|
Update yarn.lock files
|
2020-03-16 10:37:55 +03:00 |
|
Daniil Senkiv
|
d920cc30f7
|
web: common: bump version
|
2020-03-13 18:11:48 +03:00 |
|
Daniil Senkiv
|
17aebb0ba0
|
Web.Files/Common: filter on real data
|
2020-03-13 18:11:15 +03:00 |
|
Ilya Oleshko
|
3ec713c32d
|
web: common: bump version
|
2020-03-13 12:08:41 +03:00 |
|
Ilya Oleshko
|
cb5836af98
|
Web: Common: FilterInput: Removed useless prop from sorting ComboBox
|
2020-03-13 12:08:28 +03:00 |
|
Daniil Senkiv
|
0fcee867a3
|
web: common: bump version
|
2020-03-13 10:55:47 +03:00 |
|
Daniil Senkiv
|
2d9840e78b
|
Web.Files/Common: Filter: add withSubFolders param
|
2020-03-13 10:55:25 +03:00 |
|
Daniil Senkiv
|
d7f55ea7a6
|
web: common: bump version
|
2020-03-13 09:31:07 +03:00 |
|
Daniil Senkiv
|
114e31fb37
|
Web.Common: FilterInput: fix styles
|
2020-03-13 09:30:54 +03:00 |
|
Daniil Senkiv
|
d65b09f003
|
web: common: bump version
|
2020-03-12 16:22:59 +03:00 |
|
Daniil Senkiv
|
ae6f0a6ef9
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files
|
2020-03-12 15:57:43 +03:00 |
|
Daniil Senkiv
|
2597cbfdb4
|
Web.Common: FilterInput: added selectors
|
2020-03-12 15:57:23 +03:00 |
|
|
025f177d9a
|
web: common: bump version
|
2020-03-11 17:20:56 +03:00 |
|
|
1ff9356ea7
|
Web: Common: added progress-bar to PageLayout
|
2020-03-11 17:18:47 +03:00 |
|
Ilya Oleshko
|
ba0f5e6fca
|
web: common: bump version
|
2020-03-11 14:16:06 +03:00 |
|
Ilya Oleshko
|
594c1a776b
|
Web: Common: Api: Files: Added file creating API requests
|
2020-03-11 14:15:44 +03:00 |
|
Ilya Oleshko
|
0b8c870e19
|
web: common: bump version
|
2020-03-11 13:53:59 +03:00 |
|
Ilya Oleshko
|
4e45f96b7a
|
Web: Common: Api: Files: Fixed request payload
|
2020-03-11 13:53:49 +03:00 |
|
Ilya Oleshko
|
e984a620ea
|
web: common: bump version
|
2020-03-10 15:42:08 +03:00 |
|
Ilya Oleshko
|
53e77b7981
|
Web: Common: Api: Files: Fixed property name for creating folder
|
2020-03-10 15:41:47 +03:00 |
|
|
12b7d47a25
|
web: common: bump version
|
2020-03-10 09:22:19 +03:00 |
|
|
1d072fec22
|
Web: Common: added share api
|
2020-03-10 09:22:02 +03:00 |
|
Ilya Oleshko
|
578b10170b
|
web: common: bump version
|
2020-03-06 14:30:13 +03:00 |
|
Ilya Oleshko
|
67efe1074c
|
Web: Common: Api: Files: Added deleteFolder and deleteFile
|
2020-03-06 14:27:51 +03:00 |
|
Daniil Senkiv
|
6353a8318b
|
Web.Common: copy FilterInput component from web.components
|
2020-03-05 17:02:47 +03:00 |
|
Ilya Oleshko
|
7a06630e34
|
web: common: bump version
|
2020-03-05 09:18:08 +03:00 |
|
Ilya Oleshko
|
da17495699
|
Web: Common: Api: Files: Fixed api data
|
2020-03-05 09:15:27 +03:00 |
|
|
a7069aa19d
|
web: common: bump version
|
2020-03-04 16:23:14 +03:00 |
|
|
22e2729cc5
|
Web: Files: fixed merge
|
2020-03-04 16:22:56 +03:00 |
|
|
ed9c15864a
|
web: common: bump version
|
2020-03-04 15:47:54 +03:00 |
|
|
fcd9da1dc5
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
# Conflicts:
# web/ASC.Web.Common/src/api/files/filter.js
|
2020-03-04 15:47:31 +03:00 |
|
|
bcbe88caab
|
Web: Common: added treeFolders field to filter
|
2020-03-04 15:40:02 +03:00 |
|
Daniil Senkiv
|
253752fbfc
|
web: common: bump version
|
2020-03-04 14:49:13 +03:00 |
|
Daniil Senkiv
|
ffff9d38b8
|
Web.Common/Files: FilesFilter: add authorType
|
2020-03-04 14:49:01 +03:00 |
|
|
7ef15cb51d
|
web: components: bump version
|
2020-03-04 09:17:35 +03:00 |
|
|
ba13637a97
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2020-03-03 09:37:46 +03:00 |
|
Daniil Senkiv
|
b23b820d60
|
web: common: bump version
|
2020-03-03 09:30:42 +03:00 |
|
Daniil Senkiv
|
5442438698
|
Web.Files: Filter: add first version of FilesFilter
|
2020-03-03 09:30:27 +03:00 |
|
Ilya Oleshko
|
b89bc4723c
|
web: common: bump version
|
2020-03-02 17:09:08 +03:00 |
|
Ilya Oleshko
|
b044b545d0
|
Web: Common: Api: Files: Added getFileInfo, getFolderPath, createTextFileInCommon, getFileInfo, updateFile, createFolder and renameFolder api requests
|
2020-03-02 17:08:53 +03:00 |
|
Ilya Oleshko
|
034f426a4d
|
web: common: bump version
|
2020-03-02 13:48:24 +03:00 |
|
Ilya Oleshko
|
52bf9ac9e0
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-03-02 13:48:09 +03:00 |
|
Ilya Oleshko
|
97fa98857e
|
Web: Common: Api: Files: Added getFolder by folder id
|
2020-03-02 13:47:51 +03:00 |
|
|
7fc33a282b
|
Web: Common: added getSharedFolderList fake api
|
2020-03-02 12:30:47 +03:00 |
|
Ilya Oleshko
|
948d43a05d
|
web: common: bump version
|
2020-03-02 11:25:30 +03:00 |
|
Ilya Oleshko
|
f80ab0b473
|
Web: Common: Api: Files: Disabled fakeApi for trash folder
|
2020-03-02 11:25:26 +03:00 |
|
Ilya Oleshko
|
336561c86f
|
web: common: bump version
|
2020-03-02 11:17:58 +03:00 |
|
Ilya Oleshko
|
2a9c57d06e
|
Web: Common: Api: Files: Added createTextFile and createTextFileInMy
|
2020-03-02 11:17:32 +03:00 |
|
Ilya Oleshko
|
6a14d0978f
|
web: common: bump version
|
2020-02-28 17:26:24 +03:00 |
|
Ilya Oleshko
|
e543f00b17
|
web: common: bump version
|
2020-02-28 17:21:26 +03:00 |
|
Ilya Oleshko
|
49845fbb6c
|
Web: Common: Api: Files: Added getCommonFolderList and getProjectsFolderList
|
2020-02-28 17:21:15 +03:00 |
|
Ilya Oleshko
|
3f2baee4cb
|
web: common: bump version
|
2020-02-28 16:08:14 +03:00 |
|
Ilya Oleshko
|
e35df76d90
|
Files.Client: Home: Fixed fake folderApi. Added @my and @trash api.
|
2020-02-28 16:08:03 +03:00 |
|
Ilya Oleshko
|
c691ef3e7d
|
web: common: bump version
|
2020-02-28 13:33:33 +03:00 |
|
Ilya Oleshko
|
22650be927
|
Files.Client: Home: Added Row and fakeApi
|
2020-02-28 13:33:13 +03:00 |
|
|
9a1a118f79
|
Merge branch 'master' into feature/elastic
|
2020-02-27 11:24:14 +03:00 |
|
|
97ae3914c5
|
web: common: bump version
|
2020-02-26 16:32:24 +03:00 |
|
|
b526b61bdd
|
Update yarn.lock files
|
2020-02-26 13:01:04 +03:00 |
|
|
e57e8ff935
|
web: files: Replaced fake product
|
2020-02-26 11:06:44 +03:00 |
|
|
e4af4d168f
|
Update yarn.lock files
|
2020-02-26 10:23:38 +03:00 |
|
Daniil Senkiv
|
1ae795a86b
|
web: common: bump version
|
2020-02-21 14:14:13 +03:00 |
|
Daniil Senkiv
|
b724548e98
|
web.common: fix working web.client, if api people not available
|
2020-02-21 14:13:45 +03:00 |
|
Daniil Senkiv
|
a1d249be68
|
web.common: fix problem with handling idle modules
|
2020-02-21 14:11:33 +03:00 |
|
|
7436fd8548
|
web: common: bump version
|
2020-02-18 14:16:22 +03:00 |
|
|
c248db6cf8
|
Web: Common: fixed profile avatar size
|
2020-02-18 14:16:03 +03:00 |
|
|
c7b5d75692
|
web: common: bump version
|
2020-02-18 13:16:16 +03:00 |
|
|
76b9f99623
|
Web: Common: change title of login page, added new translations
|
2020-02-18 13:11:16 +03:00 |
|
Ilya Oleshko
|
a2049f2b1d
|
web: common: bump version
|
2020-02-17 16:38:10 +03:00 |
|
Daniil Senkiv
|
dfe715ab32
|
web: common: bump version
|
2020-02-17 15:07:33 +03:00 |
|
Daniil Senkiv
|
312f342fac
|
web.common: PageLayout: fix pin/unpin article for first render, in addition to (efef0090be )
|
2020-02-17 15:07:25 +03:00 |
|
|
0448b9b678
|
web: common: bump version
|
2020-02-17 08:57:39 +03:00 |
|
|
c69a24f524
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2020-02-17 08:57:28 +03:00 |
|
|
d3344d08c4
|
Web: Common: fixed clicked logo color
|
2020-02-17 08:57:11 +03:00 |
|
Ilya Oleshko
|
4d0d156551
|
web: common: bump version
|
2020-02-14 16:30:15 +03:00 |
|
Ilya Oleshko
|
4321480ba7
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2020-02-14 16:29:33 +03:00 |
|
Ilya Oleshko
|
f061c1bfc6
|
web: common: bump version
|
2020-02-14 16:29:23 +03:00 |
|
Ilya Oleshko
|
c711bd1254
|
Web: Common: Layout: Fixed reload on ProfileMenu items click
|
2020-02-14 16:28:53 +03:00 |
|
|
96cc38d3ca
|
web: common: bump version
|
2020-02-14 16:05:48 +03:00 |
|
|
973beff6eb
|
Web: Common: added link to logo icons
|
2020-02-14 16:04:45 +03:00 |
|
Ilya Oleshko
|
9c97976bbc
|
web: common: bump version
|
2020-02-14 12:23:03 +03:00 |
|
Ilya Oleshko
|
a594a67bab
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2020-02-14 12:22:33 +03:00 |
|
Ilya Oleshko
|
ae73b2696d
|
Web: Common: Layout: Fixed log display
|
2020-02-14 12:22:15 +03:00 |
|
|
cfa90eec06
|
web: common: bump version
|
2020-02-14 11:11:51 +03:00 |
|
|
3c0af2f86c
|
Web: Common: added logo click, added display of the full logo in the absence of a title
|
2020-02-14 11:11:34 +03:00 |
|
Ilya Oleshko
|
60f57f1bad
|
web: common: bump version
|
2020-02-14 09:36:35 +03:00 |
|
Ilya Oleshko
|
9b04501b43
|
Web: Common: Layout: Fixed styling icons of modules
|
2020-02-14 09:36:14 +03:00 |
|
|
fdb258f6b6
|
web: common: bump version
|
2020-02-13 13:59:56 +03:00 |
|
|
2f0339ed7d
|
Web: Common: use utils media size
|
2020-02-13 13:59:26 +03:00 |
|
|
c4733887e0
|
web: common: bump version
|
2020-02-13 12:41:02 +03:00 |
|
|
e1f0e02f94
|
web: Common: Added hiding ArticleHeader on tablet
|
2020-02-13 12:39:32 +03:00 |
|
|
741dc0edcc
|
web: Common: Fixed Group selection margin
|
2020-02-13 12:38:42 +03:00 |
|
|
9ee1729b78
|
web: Common: Fixed header height
|
2020-02-13 12:37:49 +03:00 |
|
|
6f22e4016c
|
web: common: bump version
|
2020-02-13 11:39:45 +03:00 |
|
|
cca1c70522
|
Merge branch 'feature/redesign' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/redesign
|
2020-02-13 11:39:18 +03:00 |
|
|
db0c592f82
|
Web: Common: fixed module title line-height
|
2020-02-13 11:39:10 +03:00 |
|
|
133ba4f715
|
Merge branch 'feature/redesign' of github.com:ONLYOFFICE/AppServer into feature/redesign
|
2020-02-13 11:12:58 +03:00 |
|
|
507cd94e98
|
Merge branch 'master' into feature/redesign
# Conflicts:
# web/ASC.Web.Common/package.json
|
2020-02-13 11:09:37 +03:00 |
|
|
0538252147
|
web: common: bump version
|
2020-02-13 10:39:09 +03:00 |
|
|
b5510540aa
|
Web: Common: added logo to header
|
2020-02-13 10:38:49 +03:00 |
|
Ilya Oleshko
|
cc4eb46c01
|
web: common: bump version
|
2020-02-12 16:18:41 +03:00 |
|
Ilya Oleshko
|
e99d1acc3c
|
Web: Common: Layout: Added use of icons from module
|
2020-02-12 16:18:23 +03:00 |
|
|
2655813d8c
|
web: common: bump version
|
2020-02-12 15:26:41 +03:00 |
|
|
70598c21c7
|
Web: Common: fixed PageLayout filter position on mobile version
|
2020-02-12 15:26:16 +03:00 |
|
|
f8eec21893
|
Web: Common: fixed PageLayout section-body padding
|
2020-02-12 14:18:57 +03:00 |
|
|
bc647d9c3d
|
web: common: bump version
|
2020-02-12 13:08:58 +03:00 |
|
|
43f662acd1
|
Merge branch 'feature/redesign' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/redesign
|
2020-02-12 13:07:45 +03:00 |
|
|
dfb53cbfea
|
Web: Common: fixed filter position
|
2020-02-12 13:04:37 +03:00 |
|
|
159bdc1a72
|
Merge branch 'master' into feature/redesign
# Conflicts:
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/package.json
|
2020-02-12 09:40:56 +03:00 |
|
|
e6e38befa8
|
web: common: bump version
|
2020-02-11 16:49:07 +03:00 |
|
|
36d5f594ae
|
web: Common: Fixed invalid iconName mapping
|
2020-02-11 16:48:48 +03:00 |
|
Ilya Oleshko
|
9ee88c327d
|
web: common: bump version
|
2020-02-11 11:23:59 +03:00 |
|
Ilya Oleshko
|
0e8adf3066
|
Web: Common: PageLayout: Fixed Article pin on mobile
|
2020-02-11 11:11:34 +03:00 |
|
|
a491e752cc
|
web: common: bump version
|
2020-02-10 17:35:18 +03:00 |
|
|
4218090820
|
Web: Common: set a fixed filter menu
|
2020-02-10 17:34:56 +03:00 |
|
|
7dbbf77505
|
web: common: bump version
|
2020-02-10 16:40:26 +03:00 |
|
|
b4b386dd3b
|
Web: Common: added automatic hiding of the scrollbar when hovering over the group tree
|
2020-02-10 16:40:04 +03:00 |
|
|
d221d8d066
|
web: common: bump version
|
2020-02-10 14:38:01 +03:00 |
|
|
baa241678b
|
web: Common: Changed stype for ScrollBar in ArticleBody
|
2020-02-10 14:37:27 +03:00 |
|
|
e5d198d8c3
|
ASC.Web.Common: changed header and navigation on desktop view
|
2020-02-10 11:56:27 +03:00 |
|
Daniil Senkiv
|
61fceef6db
|
web: common: bump version
|
2020-02-07 19:49:47 +03:00 |
|
Daniil Senkiv
|
efef0090be
|
Web.Common: PageLayout: unpin article panel on mobile devices in vertical orientation, if it is very wide
|
2020-02-07 19:49:31 +03:00 |
|
Daniil Senkiv
|
0643b4734f
|
Web.Common: PageLayout: removed blue border on tap from touch devices
|
2020-02-07 18:24:30 +03:00 |
|
|
b551486748
|
web: common: bump version
|
2020-02-07 15:59:48 +03:00 |
|
|
f540ad69f2
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
# Conflicts:
# web/ASC.Web.Common/src/components/PeopleSelector/sub-components/UserTooltip.js
# web/ASC.Web.Components/src/components/help-button/index.js
|
2020-02-07 15:57:31 +03:00 |
|
|
d06af4da03
|
web: Common: Fixed displaying HelpButton and Tooltip in AdvancedSelector
|
2020-02-07 15:41:26 +03:00 |
|
|
9b2cb19102
|
web: common: bump version
|
2020-02-07 13:08:20 +03:00 |
|
|
686512b548
|
Web: Common: added truncate to text component in advanced selector
|
2020-02-07 13:07:56 +03:00 |
|
|
ea8b73f46d
|
web: Common: Fixed option_checkbox overflow on long name in AdvancedSelector
|
2020-02-07 10:00:35 +03:00 |
|
Daniil Senkiv
|
27c5defd0e
|
web: common: bump version
|
2020-02-06 10:30:04 +03:00 |
|
Daniil Senkiv
|
02d8a89ac4
|
Web.Common: errors: comingsoon: i18n: removed debug mode
|
2020-02-06 10:29:50 +03:00 |
|
Ilya Oleshko
|
76a79deefe
|
web: common: bump version
|
2020-02-05 15:54:12 +03:00 |
|
Ilya Oleshko
|
fa855f2beb
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2020-02-05 15:53:29 +03:00 |
|
Daniil Senkiv
|
91466baa11
|
web: common: bump version
|
2020-02-05 15:45:36 +03:00 |
|
Daniil Senkiv
|
3ee6cf6fdd
|
Web.Common: i18n config: debug only in development mode
|
2020-02-05 15:45:24 +03:00 |
|
Ilya Oleshko
|
82b2e7ece7
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2020-02-05 15:43:45 +03:00 |
|
Ilya Oleshko
|
6ac5a59d8f
|
Web: Common: Layout: Fixed ProfileMenu usage
|
2020-02-05 15:41:52 +03:00 |
|
Ilya Oleshko
|
176e828468
|
Web: Common: ProfileMenu: Fixed component usage
|
2020-02-05 15:40:30 +03:00 |
|
Daniil Senkiv
|
7c031b50cf
|
web: common: bump version
|
2020-02-05 15:05:16 +03:00 |
|
Daniil Senkiv
|
cd747dc3d4
|
Web.Common: StudioLayout: reduced re-render
|
2020-02-05 15:04:50 +03:00 |
|
Daniil Senkiv
|
d999e905f2
|
Web.Common: Login: fixed i18n config
|
2020-02-05 12:33:52 +03:00 |
|
Daniil Senkiv
|
37bd3fddef
|
Web.Common: i18n: fixed config for error components
|
2020-02-05 12:24:44 +03:00 |
|
|
1f5f87ada3
|
web: common: bump version
|
2020-02-06 00:01:21 +03:00 |
|
|
93dd95ab66
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2020-02-05 23:56:03 +03:00 |
|
|
e3fc954041
|
wen: Common: Added Splitter to AdvancedSelector
|
2020-02-05 23:55:56 +03:00 |
|
Daniil Senkiv
|
62763a0a3d
|
web: common: bump version
|
2020-02-05 10:59:43 +03:00 |
|
Daniil Senkiv
|
d344914507
|
Web.Common: reduced using changeLanguage function
|
2020-02-05 10:59:23 +03:00 |
|
Daniil Senkiv
|
42d9258d99
|
Web.Common: replaced changeLanguage function, removed connect HOC
|
2020-02-05 10:58:57 +03:00 |
|
|
1a9b46ef1b
|
web: common: bump version
|
2020-02-05 10:42:49 +03:00 |
|
|
98114d8ec7
|
web: Common: Added trim for Filter search
|
2020-02-05 10:41:07 +03:00 |
|
Daniil Senkiv
|
afa18c237c
|
web: common: bump version
|
2020-02-03 17:26:37 +03:00 |
|
Daniil Senkiv
|
c3676ecdf9
|
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
|
2020-02-03 17:26:12 +03:00 |
|
Daniil Senkiv
|
c5b57fc009
|
Web.Common: utils: refactoring changeLanguage function
|
2020-02-03 16:36:46 +03:00 |
|
Daniil Senkiv
|
dcc7460a25
|
Web.Common: removed blue border on tap from touch devices
|
2020-02-03 16:07:20 +03:00 |
|
|
99e1121cc7
|
web: common: Fixed link hover in AdvancedSelector
|
2020-02-03 15:39:28 +03:00 |
|
|
a8347b991b
|
web: common: Fixed change language in PeopleSelector
|
2020-02-03 15:38:17 +03:00 |
|
|
0b88b9bdc6
|
web: common: Fixed resolve value by API
|
2020-02-03 15:07:35 +03:00 |
|
|
c53a242c71
|
web: common: Added correct resolve value by API
|
2020-02-03 14:28:36 +03:00 |
|
|
095db75421
|
web: Common: Fixed stories sorting
|
2020-02-03 14:01:31 +03:00 |
|
|
d3a73b05ec
|
web: common: bump version
|
2020-02-03 11:36:41 +03:00 |
|
|
f0cec97c3e
|
web: common: Added ErrorBoundary component with componentDidCatch and new Error520Container show
|
2020-02-03 11:36:25 +03:00 |
|
|
ee828383e8
|
web: common: bump version
|
2020-02-02 17:34:24 +03:00 |
|
|
f3e670e393
|
web: Common: Extended PeopleSelector component with Me option
|
2020-02-02 17:33:44 +03:00 |
|
|
123a6362dc
|
web: common: Styled SearchInput font in AdvancedSelector
|
2020-02-02 15:13:05 +03:00 |
|
|
127e5838a9
|
web: common: Styled SearchInput font in AdvancedSelector
|
2020-02-02 15:01:24 +03:00 |
|
|
4c684e1375
|
web: common: Commented annoying logs
|
2020-02-02 15:00:30 +03:00 |
|
|
cc925fcc65
|
web: Common: Fixed GroupSelector story:
+ Added onCancel handler
+ Moved story to separated class GroupSelectorExample
+ Changed actions to console.log
|
2020-02-02 14:33:41 +03:00 |
|
|
3627bbb34c
|
web: Common: Fixed PeopleSelector story:
+ Added onCancel handler
+ Moved story to separated class PeopleSelectorExample
+ Changed actions to console.log
|
2020-02-02 14:20:29 +03:00 |
|
|
a94adb0a96
|
web: Components: Added ref support to the Button component;
|
2020-02-02 14:01:43 +03:00 |
|
|
0352b8ab46
|
Merge branch 'master' into feature/translations
|
2020-01-31 16:26:40 +03:00 |
|
Daniil Senkiv
|
e73aecf9ca
|
Web.Common: fixed: used changeLanguage function as promise
|
2020-01-31 15:24:13 +03:00 |
|
|
7c7c0fdd64
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2020-01-31 10:14:45 +03:00 |
|
Daniil Senkiv
|
83e965841f
|
Merge branch 'master' into feature/translations
|
2020-01-30 17:46:06 +03:00 |
|
Daniil Senkiv
|
f42a53f07d
|
web: common: bump version
|
2020-01-30 17:26:17 +03:00 |
|
Daniil Senkiv
|
15d0719d39
|
Web.Common: PeopleSelector: UserTooltip: fixed position of avatar and full name
|
2020-01-30 17:25:59 +03:00 |
|
|
d2824beccc
|
web: common: Fixed jest eslint warning
|
2020-01-28 15:24:10 +03:00 |
|
Daniil Senkiv
|
93f641d3f7
|
Merge branch 'master' into feature/translations
|
2020-01-28 11:57:24 +03:00 |
|
Daniil Senkiv
|
09e5805cdb
|
Web.Common: fixed i18n configs, removed redux HOC
|
2020-01-28 09:23:58 +03:00 |
|
Daniil Senkiv
|
21f748f3a8
|
Web.Common: PeopleSelector: reduced re-render because of changing language
|
2020-01-27 18:50:00 +03:00 |
|
|
7c18011e19
|
web: common: bump version
|
2020-01-27 15:20:17 +03:00 |
|
|
94aea423d6
|
web: common: Re-written ErrorContainer to common components
|
2020-01-27 15:17:44 +03:00 |
|
Daniil Senkiv
|
96c7143192
|
Merge branch 'master' into feature/translations
|
2020-01-27 14:49:26 +03:00 |
|
|
6728d9c3fb
|
web: common: Moved ErrorContainer from index.js
|
2020-01-27 14:48:50 +03:00 |
|
|
b80f84254e
|
web: common: Added content of StyledErrorContainer
|
2020-01-27 14:45:08 +03:00 |
|
|
f674140209
|
web: common: Moved StyledErrorContainer from index.js
|
2020-01-27 14:39:06 +03:00 |
|
|
a2c97d5892
|
web: common: Renamed files
|
2020-01-27 14:38:29 +03:00 |
|
|
cf1d2d2a95
|
web: Moved ErrorContainer from ASC.Web.Components to ASC.Web.Common
|
2020-01-27 14:31:13 +03:00 |
|
Daniil Senkiv
|
bbd73525ee
|
Web.Common: PeopleSelector: added new real translations, fixed i18n config
|
2020-01-27 14:30:50 +03:00 |
|
|
f992881cbf
|
web: common: bump version
|
2020-01-27 14:29:34 +03:00 |
|
|
aa862d2b87
|
web: common: bump version
|
2020-01-27 14:08:24 +03:00 |
|
|
0c0dc7d9fb
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2020-01-27 14:07:13 +03:00 |
|
|
effad5439c
|
web: Added dummy Documents product
|
2020-01-27 14:07:02 +03:00 |
|
|
53b59456f2
|
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
|
2020-01-27 13:59:16 +03:00 |
|
|
fe44c17c27
|
ASC.Web.Common: PageLayout: fixed initial body scroll on top
|
2020-01-27 13:58:37 +03:00 |
|
Daniil Senkiv
|
d1bbdc1072
|
Web.Common: removed useless i18n config
|
2020-01-26 15:26:39 +03:00 |
|
Daniil Senkiv
|
9d82e657ed
|
Merge branch 'master' into feature/translations
# Conflicts:
# web/ASC.Web.Common/src/components/PageLayout/index.js
# web/ASC.Web.Common/src/constants/index.js
|
2020-01-26 14:12:37 +03:00 |
|
Daniil Senkiv
|
2e7b7ff9e8
|
Web.Client/Common: fixed problem with working if user without user language changed portal language
|
2020-01-24 21:46:25 +03:00 |
|
|
251976e31d
|
web: common: bump version
|
2020-01-24 17:48:56 +03:00 |
|
|
ec7299aabf
|
web: Common: Added ComingSoon page
|
2020-01-24 17:48:36 +03:00 |
|
|
68ee94dfd5
|
web: common: bump version
|
2020-01-24 16:55:08 +03:00 |
|
|
cfc4de538f
|
web: Components: Re-written old ErrorContainer
|
2020-01-24 16:54:41 +03:00 |
|
|
08cb3a2ede
|
ASC.Web.Common: PageLayout: saving the pinned state in local storage
|
2020-01-24 14:59:55 +03:00 |
|
|
4f0a4cdee7
|
ASC.Web.Common: PageLayout: added withBodyAutoFocus prop
|
2020-01-24 11:23:12 +03:00 |
|
Daniil Senkiv
|
58a50c1b48
|
web.common: fixed infinity reloading if user unauthorized
|
2020-01-23 11:16:53 +03:00 |
|
Daniil Senkiv
|
0cb31bfa24
|
Web.Common, People.Client: triggered updating modules language after changing user language
|
2020-01-23 10:58:08 +03:00 |
|
Daniil Senkiv
|
d4e083cfaa
|
Web.Common: Layout: fixed render ProfileActions component after changing language
|
2020-01-22 18:04:48 +03:00 |
|
Daniil Senkiv
|
7a43461e7a
|
Merge branch 'master' into feature/translations
|
2020-01-22 16:26:21 +03:00 |
|
Daniil Senkiv
|
120944cb25
|
Web.Client: Settings: Article: Body: fixed re-render after changing language, if user language not defined
|
2020-01-22 16:00:42 +03:00 |
|
Daniil Senkiv
|
b660f92c36
|
Web.Common: added getting current custom schema
|
2020-01-21 15:48:05 +03:00 |
|
Ilya Oleshko
|
d62a5df3a9
|
web: common: bump version
|
2020-01-21 14:08:06 +03:00 |
|
Ilya Oleshko
|
def33ef8fb
|
Web: Common: PageLayout: Fixed scroll overflow
|
2020-01-21 14:07:56 +03:00 |
|
Daniil Senkiv
|
57d9678b92
|
web.common: fixed (769abe0875 )
|
2020-01-21 09:28:42 +03:00 |
|
Daniil Senkiv
|
769abe0875
|
web.common: added function for conditional translating
|
2020-01-21 08:56:04 +03:00 |
|
Daniil Senkiv
|
a6f6cf4fea
|
web.common: added value 'language' to localStorage
|
2020-01-20 16:20:19 +03:00 |
|
Daniil Senkiv
|
c1837a3c44
|
web.common: renamed actions
|
2020-01-20 13:31:35 +03:00 |
|
Ilya Oleshko
|
6087a9006f
|
web: common: bump version
|
2020-01-20 10:40:47 +03:00 |
|
Ilya Oleshko
|
84973627c2
|
Web: Common: Layout: Fixed ProfileMenu usage
|
2020-01-20 10:40:20 +03:00 |
|
Ilya Oleshko
|
3ad0b797ff
|
Web: Common: ProfileMenu: Added component, README, story and test
|
2020-01-20 10:39:31 +03:00 |
|
Ilya Oleshko
|
d581dbe58a
|
web: common: bump version
|
2020-01-17 13:54:22 +03:00 |
|
Ilya Oleshko
|
041ee1ee09
|
Web: Common: PageLayout: Fixed scroll overflow for body subcomponent
|
2020-01-17 13:54:07 +03:00 |
|
Daniil Senkiv
|
7668065fe8
|
web: common: bump version
|
2020-01-16 16:44:51 +03:00 |
|
Daniil Senkiv
|
4d8a8dfb4f
|
Web.Common: Headline: fixed showing props as attributes
|
2020-01-16 16:42:12 +03:00 |
|
Daniil Senkiv
|
d54e6a126a
|
Web.Common: PageLayout: fixed header style
|
2020-01-16 15:47:15 +03:00 |
|
Daniil Senkiv
|
017629bb32
|
web: common: bump version
|
2020-01-16 12:27:12 +03:00 |
|
Daniil Senkiv
|
de54bcf86b
|
Web.Common: PageLayout: fixed section-header style for content
|
2020-01-16 12:25:28 +03:00 |
|
Daniil Senkiv
|
020b64dbbe
|
web: common: bump version
|
2020-01-15 17:50:06 +03:00 |
|
Daniil Senkiv
|
3212a46035
|
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
|
2020-01-15 17:48:04 +03:00 |
|
Daniil Senkiv
|
c96fce9b5a
|
web: common: bump version
|
2020-01-15 17:47:27 +03:00 |
|
Daniil Senkiv
|
31dd1e903f
|
Web.Common: PageLayout: fixed section header style
|
2020-01-15 17:38:40 +03:00 |
|
|
4a5963458a
|
Common: jest. Added cobertura
|
2020-01-15 16:47:20 +03:00 |
|
|
cffe7ceddd
|
web: common: bump version
|
2020-01-15 12:11:59 +03:00 |
|
|
206d2d593b
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2020-01-15 12:03:51 +03:00 |
|
|
e96c1de666
|
web: Common: Update all dependencies
|
2020-01-15 11:52:45 +03:00 |
|
Daniil Senkiv
|
cd7e7f4be6
|
web: common: bump version
|
2020-01-14 18:42:25 +03:00 |
|
Daniil Senkiv
|
5ba281a822
|
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
|
2020-01-14 18:42:02 +03:00 |
|
Daniil Senkiv
|
8efbdf59ed
|
Web.Common: AdvancedSelector: fixed style
|
2020-01-14 18:40:51 +03:00 |
|
|
26c2cc816f
|
web: common: bump version
|
2020-01-14 16:46:58 +03:00 |
|
|
c281e25ef3
|
ASC.Web.Common: Layout: fixed NavItem hover styles and onBadgeClick
|
2020-01-14 16:45:46 +03:00 |
|
Ilya Oleshko
|
1b61998562
|
web: common: bump version
|
2020-01-14 14:56:24 +03:00 |
|
Ilya Oleshko
|
8ae0bf7a2c
|
Web: Common: Layout: Fixed Badge component styling
|
2020-01-14 14:56:16 +03:00 |
|
Daniil Senkiv
|
f1d56c3a80
|
web: common: bump version
|
2020-01-13 17:32:59 +03:00 |
|
Daniil Senkiv
|
58baadf5ae
|
Web.Components: SearchInput: fixed style
|
2020-01-13 17:32:45 +03:00 |
|
Daniil Senkiv
|
4a8ca13f03
|
web: common: bump version
|
2020-01-13 16:27:23 +03:00 |
|
Daniil Senkiv
|
0a09aaaa07
|
Web.Common: AdvancedSelector: fixed styles, reverted (c6fbf51389 )
|
2020-01-13 16:27:18 +03:00 |
|
Ilya Oleshko
|
805b337101
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2020-01-13 15:36:51 +03:00 |
|
Ilya Oleshko
|
b65940d2ad
|
web: common: bump version
|
2020-01-13 15:36:39 +03:00 |
|
Ilya Oleshko
|
8a6af22aa0
|
Web: Common: Layout: Fixed Badge component usage
|
2020-01-13 15:36:10 +03:00 |
|
Daniil Senkiv
|
48542fd43d
|
web: common: bump version
|
2020-01-13 15:33:09 +03:00 |
|
Daniil Senkiv
|
1147eb4684
|
Web.Common: Layout: fixed style for NavItem component
|
2020-01-13 15:32:54 +03:00 |
|
Daniil Senkiv
|
4a0deedd7d
|
People.Client: fixed placeholder, fixed GroupSelector component
|
2020-01-13 12:48:07 +03:00 |
|
Daniil Senkiv
|
cee7b8b169
|
web: common: bump version
|
2020-01-13 12:44:24 +03:00 |
|
Daniil Senkiv
|
4fe1106bdf
|
web: common: bump version
|
2020-01-10 18:28:46 +03:00 |
|
Daniil Senkiv
|
6a47d61038
|
web.common: AdvancedSelector: fixed text style
|
2020-01-10 18:28:12 +03:00 |
|
|
4afd9c0470
|
web: common: bump version
|
2020-01-10 16:59:18 +03:00 |
|
|
a424b5cf67
|
web: Common: Added withProvider decorator for storybook
|
2020-01-10 16:58:46 +03:00 |
|
|
e44b2258df
|
web: common: bump version
|
2020-01-09 16:37:16 +03:00 |
|
|
a73e149c0a
|
web: common: Split CSS areas
|
2020-01-09 16:36:57 +03:00 |
|
|
b77c4d9429
|
web: common: bump version
|
2020-01-09 16:28:12 +03:00 |
|
|
25fc0669f7
|
web: Fixed handleAnyClick for DropDown
|
2020-01-09 16:27:49 +03:00 |
|
|
502c598913
|
web: components: Added border-radius for selection in AdvancedSelector
|
2019-12-27 17:08:51 +03:00 |
|
|
036a5d4274
|
web: common: bump version
|
2019-12-27 15:50:31 +03:00 |
|
|
24644ad363
|
web: common: Fixed overflow in text for AdvancedSelector
|
2019-12-27 15:47:31 +03:00 |
|
|
dcf6aa4e40
|
web: Common: Fixed padding in AdvancedSelector
|
2019-12-27 15:46:38 +03:00 |
|
|
d97bc8062d
|
web: common: Fixed name on story
|
2019-12-27 15:44:43 +03:00 |
|
|
1161f9a345
|
web: common: bump version
|
2019-12-27 14:41:16 +03:00 |
|
|
7f90d60533
|
web: Common: Fixed padding in AdvancedSelector
|
2019-12-27 14:40:48 +03:00 |
|
|
2d5e5b0e38
|
web: common: bump version
|
2019-12-27 14:00:21 +03:00 |
|
|
622ccc9f8a
|
web: Common: Removed spacing between Search and rows in AdvancedSelector
|
2019-12-27 13:56:12 +03:00 |
|
|
7eb65a323f
|
web: Common: Fixed spacing in AdvancedSelector
|
2019-12-27 13:51:17 +03:00 |
|
|
5eee300de1
|
web: common: bump version
|
2019-12-27 13:50:04 +03:00 |
|
Ilya Oleshko
|
b3f7ed34e1
|
web: common: bump version
|
2019-12-27 11:50:08 +03:00 |
|
Ilya Oleshko
|
e1a2d295d1
|
Web: Common: Layout: Added backdrop for ProfileActions on touch devices
|
2019-12-27 11:46:50 +03:00 |
|
|
dae5c13172
|
web: common: bump version
|
2019-12-26 17:08:46 +03:00 |
|
|
a8d4d0b6a9
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2019-12-26 17:08:36 +03:00 |
|
|
e0a9fabb0b
|
Web: Common: fixed help-button styles
|
2019-12-26 17:08:24 +03:00 |
|
|
a0d2242929
|
web: common: bump version
|
2019-12-26 16:27:02 +03:00 |
|
|
81f5c2e9ee
|
web: Common: Fixed PublicRoute renderComponent on change component prop
|
2019-12-26 16:26:50 +03:00 |
|
|
bdc055fa6d
|
web: common: bump version
|
2019-12-26 16:23:59 +03:00 |
|
|
2a3ec530a4
|
web: Common: Fixed PrivateRoute renderComponent on change component prop
|
2019-12-26 16:22:53 +03:00 |
|
|
d4afb34e2b
|
web: common: bump version
|
2019-12-26 16:02:15 +03:00 |
|
|
847a409198
|
web: Client: Fixed Invalid list ref; please refer to InfiniteLoader documentation => not there
|
2019-12-26 15:59:23 +03:00 |
|
|
2f4832eef9
|
web: common: bump version
|
2019-12-26 13:50:15 +03:00 |
|
|
0d2260164a
|
Web: Common: fixed help-button clickability
|
2019-12-26 13:49:25 +03:00 |
|
Daniil Senkiv
|
19f391bf0d
|
Merge branch 'master' into feature/separated-modal-dialogs
|
2019-12-26 10:15:09 +03:00 |
|
|
f10253642c
|
ASC.Web.Common: PageLayout: article-body, section-body: padding inside scrollable content
|
2019-12-25 17:51:38 +03:00 |
|
Daniil Senkiv
|
9b480c349b
|
Merge branch 'master' into feature/separated-modal-dialogs
# Conflicts:
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
# web/ASC.Web.Components/package.json
|
2019-12-25 17:44:37 +03:00 |
|
|
c8e7bc7cb6
|
web: Update yarn.lock files
|
2019-12-25 16:59:00 +03:00 |
|
|
d41c2d312c
|
ASC.Web.Common: PageLayout: article-body: padding inside scrollable content
|
2019-12-25 16:30:28 +03:00 |
|
Daniil Senkiv
|
177b50909e
|
Merge branch 'master' into feature/separated-modal-dialogs
# Conflicts:
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
|
2019-12-25 11:37:34 +03:00 |
|
Daniil Senkiv
|
1a5fcfd86d
|
web: common: bump version
|
2019-12-25 11:31:04 +03:00 |
|
Daniil Senkiv
|
c152d60950
|
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
|
2019-12-25 11:30:44 +03:00 |
|
Daniil Senkiv
|
9c60f10deb
|
web.common: applied Link to Layout sub-components
|
2019-12-25 11:30:29 +03:00 |
|
|
92692c6e92
|
web: common: bump version
|
2019-12-24 12:22:45 +03:00 |
|
|
2d0f98225d
|
web: common: Fixed linux build
|
2019-12-24 12:22:38 +03:00 |
|
Daniil Senkiv
|
d103b5003d
|
web.common: Layout: NavItem: applied Link component for wrapper, revert (37732015b3 )
|
2019-12-24 12:03:01 +03:00 |
|
Daniil Senkiv
|
3ff3047dde
|
web: common: bump version
|
2019-12-24 11:53:40 +03:00 |
|
Daniil Senkiv
|
37732015b3
|
web.common: Layout: NavItem: applied Link component
|
2019-12-24 11:53:34 +03:00 |
|
|
be8f2b2136
|
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
|
2019-12-24 10:11:03 +03:00 |
|
|
f7e7cff729
|
ASC.Web.Common: PageLayout: hidden article-header on tablets
|
2019-12-24 10:10:53 +03:00 |
|
|
ddf5a606a1
|
web: Update yarn.lock files
|
2019-12-24 09:56:03 +03:00 |
|
|
15dfd0cbe3
|
web: common: bump version
|
2019-12-24 09:52:38 +03:00 |
|
Daniil Senkiv
|
7b4c1f6154
|
web.common: StudioLayout: added translations
|
2019-12-23 18:30:31 +03:00 |
|
|
0133c45840
|
ASC.Web.Common: Layout, PageLayout : indentation corrected
|
2019-12-23 16:41:52 +03:00 |
|
|
5e1a9445db
|
ASC.Web.Common: section-toggler: styles fixed
|
2019-12-23 16:25:29 +03:00 |
|
|
6e1c99883a
|
ASC.Web.Common: ArticlePinPanel: styles and texts fixed
|
2019-12-23 16:07:38 +03:00 |
|
|
79931ef547
|
ASC.Web.Common: Layout: fix nav-item style
|
2019-12-23 15:53:10 +03:00 |
|
|
8c1e7933de
|
ASC.Web.Common: Layout: fix header style
|
2019-12-23 15:52:30 +03:00 |
|
|
a808e803aa
|
ASC.Web.Common: Layout: fix opened logo style
|
2019-12-23 15:52:04 +03:00 |
|
|
445fd9c1c8
|
ASC.Web.Common: Layout: hover delay increased
|
2019-12-23 15:51:08 +03:00 |
|
|
fc3ead33db
|
ASC.Web.Common: ModuleTile: fix import
|
2019-12-23 15:46:41 +03:00 |
|
|
7a7436e3c5
|
ASC.Web.Common: Headline: Added new type 'header', style changes by new design
|
2019-12-23 15:45:40 +03:00 |
|
|
0dc244bab6
|
web: common: bump version
|
2019-12-20 14:40:24 +03:00 |
|
|
b686e99f16
|
web: Common: Moved Layout and PageLayout to asc-web-common
|
2019-12-20 14:35:53 +03:00 |
|
|
343b36bfb2
|
web: common: bump version
|
2019-12-20 12:04:27 +03:00 |
|
|
9de0819b92
|
web: Common: Removed I18nextProvider from StudioLayout
|
2019-12-20 12:00:37 +03:00 |
|
|
4224088f6c
|
web: Common: Refactoring: Changed component according to accepted requirements
|
2019-12-20 11:55:34 +03:00 |
|
|
d73001cb70
|
web: Common: Refactoring: Changed component according to accepted requirements
|
2019-12-20 11:44:39 +03:00 |
|
|
a771f0d7cc
|
web: Common: Refactoring: Changed component according to accepted requirements
|
2019-12-20 11:38:37 +03:00 |
|
|
7caff56dbb
|
web: Common: Fixed imports
|
2019-12-20 11:25:44 +03:00 |
|
|
4958c5ae07
|
web: Common: Refactoring: Renamed component folder
|
2019-12-20 11:18:35 +03:00 |
|
|
e146b020ac
|
web: Common: Refactoring: Renamed component folder
|
2019-12-20 11:11:33 +03:00 |
|
|
79de6fc1d4
|
web: Common: Refactoring: Renamed component folder
|
2019-12-20 11:10:37 +03:00 |
|
|
98aaa03aba
|
web: Common: Refactoring: Renamed component folder
|
2019-12-20 11:06:29 +03:00 |
|
|
b07b10c760
|
web: Common: Refactoring: Renamed component folder
|
2019-12-20 10:53:07 +03:00 |
|
|
3a08d9196f
|
web: Common: Refactoring: Renamed component folder
|
2019-12-20 10:45:59 +03:00 |
|
|
d718577a46
|
web: Common: Refactoring: Moved pages out of components folder
|
2019-12-20 10:37:04 +03:00 |
|
|
d8f6d616d8
|
web: common: bump version
|
2019-12-20 09:26:32 +03:00 |
|
|
0347e2df54
|
web: Common: Fixed login/logout setups (translation, layout)
|
2019-12-19 17:31:40 +03:00 |
|
|
638e79c38b
|
web: common: bump version
|
2019-12-19 11:42:27 +03:00 |
|
|
d3bb966998
|
web: Common: Fixed styled-components warning
|
2019-12-19 11:42:13 +03:00 |
|
|
c88d441492
|
web: Common: Added UserTooltip for PeopleSelector
|
2019-12-19 11:39:14 +03:00 |
|
|
e56ec3ad20
|
web: Common: Removed empty space in Aside without groups
|
2019-12-19 10:06:15 +03:00 |
|
|
9a8155c027
|
web: Common: Added allowGroupSelection property
|
2019-12-19 10:00:58 +03:00 |
|
|
4079f59b1e
|
Merge branch 'master' into feature/advanced-selector-v2
# Conflicts:
# web/ASC.Web.Components/src/components/advanced-selector/index.js
# Modified:
# web/ASC.Web.Components/src/components/AdvancedSelector/AdvancedSelector.js
|
2019-12-18 15:11:09 +03:00 |
|
|
115229353b
|
web: Common: Moved handlers out of render in GroupSelector
|
2019-12-18 14:39:16 +03:00 |
|
|
2ea86ecb8c
|
web: Common: Moved handlers out of render in PeopleSelector
|
2019-12-18 14:13:00 +03:00 |
|
|
9eed971545
|
web: Common: Added user role to PeopleSelector
|
2019-12-18 13:59:08 +03:00 |
|
|
73352a23c1
|
web: Common: Add translation for Group label
|
2019-12-18 13:48:04 +03:00 |
|
|
48415879f2
|
web: Common: Added translation for GroupSelector
|
2019-12-16 17:01:01 +03:00 |
|
|
4263f18b17
|
web: Common: Added translation for PeopleSelector
|
2019-12-16 16:47:08 +03:00 |
|
|
d63af4b637
|
web: client: Fixed double set of isOpen property for Selectors
|
2019-12-16 14:23:24 +03:00 |
|
|
0a229d5cf1
|
web: Common: Fixed refresh of options checked by group check in AdvancedSelector
|
2019-12-16 12:12:27 +03:00 |
|
|
a42e23cae0
|
web: Common: Moved throttledResize to constructor and added enableOnClickOutside on componentDidMount
|
2019-12-16 11:09:15 +03:00 |
|
|
57a1252b0d
|
web: Common: Fixed user groups converter
|
2019-12-16 11:06:54 +03:00 |
|
|
f451d8f1a3
|
web: Common: Fixed turn off onClickOutside on unmount AdvancedSelector
|
2019-12-15 21:37:42 +03:00 |
|
|
9ee008b009
|
web: common: Fixed resizing and close AdvancedSelector
|
2019-12-15 21:07:45 +03:00 |
|
|
3f13a6770c
|
web: Common: Removed isOpen from state in PeopleSelector + added base styling props
|
2019-12-15 21:06:18 +03:00 |
|
|
40878cfe3e
|
web: Common: Added onCancel to PeopleSelector
|
2019-12-14 18:27:21 +03:00 |
|
|
0be5b2fc32
|
web: Common: Renamed folder people-selector to PeopleSelector
|
2019-12-14 17:40:41 +03:00 |
|
|
6ff185a34c
|
web: Common: Renamed folder group-selector to GroupSelector
|
2019-12-14 17:31:01 +03:00 |
|
|
5187cc65e2
|
web: Common: Renamed folder advanced-selecto2 to AdvancedSelector
|
2019-12-14 17:26:43 +03:00 |
|
|
1cab94b7af
|
web: Common: Structured files of GroupSelector
|
2019-12-14 17:06:16 +03:00 |
|
|
41df12f36f
|
web: Common: Structured files of PeopleSelector
|
2019-12-14 17:04:13 +03:00 |
|
|
107693c128
|
web: Common: Renamed import
|
2019-12-14 17:00:48 +03:00 |
|
|
cfea1b9ba1
|
web: Common: Setup HelpButton displayType for options tooltip in AdvancedSelector v2 in Aside mode
|
2019-12-14 16:55:14 +03:00 |
|
|
219ad83eb2
|
web: Common: Split styles
|
2019-12-14 16:54:12 +03:00 |
|
|
dc4a6fd2a0
|
web: Common: Fixed advanced-selector styles in Aside mode after remove bootstrap
|
2019-12-14 16:39:00 +03:00 |
|
|
3d1f244381
|
web: Common: Refactoring of AdvancedSelector v2
|
2019-12-14 16:16:01 +03:00 |
|
|
03612c0496
|
web: Common: Fixed ADSelector tooltip body styles
|
2019-12-14 13:42:49 +03:00 |
|
|
e57e0faef3
|
web: Common: Added box-sizing to ADSelector Footer container
|
2019-12-14 13:33:06 +03:00 |
|
|
e698a19140
|
web: Common: Added base styles to storybook
|
2019-12-14 13:21:20 +03:00 |
|
|
c4611513b7
|
web: Common: Fixed advanced-selector styles after remove bootstrap
|
2019-12-14 13:20:43 +03:00 |
|
|
8b4efb0dd4
|
web: Common: Applied changes in Text component
|
2019-12-14 12:55:29 +03:00 |
|
|
3b88c07178
|
Merge branch 'master' into feature/advanced-selector-v2
# Conflicts:
# products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/src/components/index.js
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/src/components/advanced-selector/index.js
# web/ASC.Web.Components/src/components/help-button/index.js
# web/ASC.Web.Components/src/index.js
# web/ASC.Web.Components/src/components/examples/people.selectors.stories.js [removed]
#
|
2019-12-14 12:32:31 +03:00 |
|
|
5eeff88737
|
web: New packages fixes
|
2019-12-13 16:58:09 +03:00 |
|
NikolayRechkin
|
d6893cd7f7
|
web: common: bump version
|
2019-12-11 16:16:47 +03:00 |
|
|
9ddbbdc52e
|
Merge pull request #15 from ONLYOFFICE/feature/pwa
Feature/pwa
|
2019-12-11 15:23:38 +03:00 |
|
Daniil Senkiv
|
84d43d9def
|
web: common: bump version
|
2019-12-11 13:56:58 +03:00 |
|
Daniil Senkiv
|
f8be196b8b
|
Merge branch 'master' into refactoring/text-heading
|
2019-12-10 17:13:46 +03:00 |
|
Daniil Senkiv
|
d62de9827e
|
1. Web.Components: Text: change proptype fontSize from [number, string] to string. Applied to other components.
2. Web.Components: Link: fixed isTextOverflow prop working
3. Web.Components: RadioButtonGroup, RadioButton: fixed readme
|
2019-12-10 17:12:38 +03:00 |
|
Daniil Senkiv
|
440c4cb528
|
Merge branch 'master' into refactoring/text-heading
# Conflicts:
# web/ASC.Web.Components/src/components/modal-dialog/index.js
|
2019-12-10 12:20:26 +03:00 |
|
|
2901617d12
|
web: Common: Fixed setup size prop
|
2019-12-10 10:42:16 +03:00 |
|
|
414bcb21d8
|
web: common: bump version
|
2019-12-10 10:42:02 +03:00 |
|
NikolayRechkin
|
4bb2b08d2e
|
Merge branch 'master' into feature/pwa
|
2019-12-10 10:37:41 +03:00 |
|
|
0b52301591
|
web: Common: Changed default prop size
|
2019-12-10 10:36:09 +03:00 |
|
|
78a722f516
|
web: Common: Fixed call cancel of undefined
|
2019-12-10 10:34:20 +03:00 |
|
|
aeac729e52
|
web: Moved AdvancedSelector2 from asc-web-components to asc-web-common
|
2019-12-10 10:32:26 +03:00 |
|
|
26d3e3d29d
|
Merge pull request #13 from ONLYOFFICE/Refactoring/remove-react-bootstrap
Refactoring/remove react bootstrap
|
2019-12-10 10:26:08 +03:00 |
|
Daniil Senkiv
|
4f1dbc6352
|
web.common, web.components: sorted props in readme alphabetically
|
2019-12-10 09:44:18 +03:00 |
|
|
d6e8dc7026
|
web: Common: Fixed PropType definition
|
2019-12-10 09:38:15 +03:00 |
|
Daniil Senkiv
|
6b6c4569cf
|
Merge branch 'master' into refactoring/text-heading
|
2019-12-10 09:36:05 +03:00 |
|
|
8c0fc47251
|
web: Client: Changed AdvancedSelector to PeopleSelector
|
2019-12-09 17:20:42 +03:00 |
|
Daniil Senkiv
|
449589f971
|
web.common: Headline: fixed readme
|
2019-12-09 16:54:10 +03:00 |
|
NikolayRechkin
|
ca5e501e2b
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2019-12-09 16:08:48 +03:00 |
|
NikolayRechkin
|
29433b0232
|
web: people: changed the use of the avatar editor
|
2019-12-09 16:07:04 +03:00 |
|
|
a77aef1970
|
Merge branch 'master' into Refactoring/remove-react-bootstrap
# Conflicts:
# products/ASC.People/Client/package.json
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
|
2019-12-09 15:29:04 +03:00 |
|
Daniil Senkiv
|
d3f06c8d3e
|
Merge branch 'master' into refactoring/text-heading
|
2019-12-09 15:24:23 +03:00 |
|
Daniil Senkiv
|
f275c5b258
|
web.common: renamed Heading component to Headline
|
2019-12-09 15:12:25 +03:00 |
|
|
452a3ebc4a
|
Merge branch 'master' into feature/advanced-selector-v2
# Conflicts:
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
|
2019-12-09 15:10:01 +03:00 |
|
|
9f2e4a8b9b
|
web: common: bump version
|
2019-12-09 14:29:20 +03:00 |
|
|
d08ba81c85
|
web: Common: Update packages
|
2019-12-09 14:13:26 +03:00 |
|
|
7ded8ae4cd
|
web: Components: Update packages (storybook, babel, jest, css-loader, postcss)
|
2019-12-09 12:33:39 +03:00 |
|
|
cfccfd4093
|
Merge branch 'master' into feature/advanced-selector-v2
# Conflicts:
# web/ASC.Web.Common/package.json
|
2019-12-09 09:16:18 +03:00 |
|
|
45f94155ab
|
web: Common: Added and applied new displayType "auto" for AdvancedSelector v2
|
2019-12-08 21:47:45 +03:00 |
|
|
63f967a015
|
web: Common: Fixed eslint warnings
|
2019-12-06 16:58:12 +03:00 |
|
|
b4a79d2dd3
|
web: Common: Applied useFake to PeopleSelector
|
2019-12-06 16:48:10 +03:00 |
|
|
2f5ef26c1a
|
web: Components: Exported GroupSelector
|
2019-12-06 16:45:07 +03:00 |
|
|
c8a772837f
|
web: Update yarn.lock
|
2019-12-06 16:40:57 +03:00 |
|
|
a3240df07c
|
web: common: bump version
|
2019-12-06 16:38:30 +03:00 |
|
|
f87ea9cc13
|
web: Common: Added new package "faker"
|
2019-12-06 16:37:55 +03:00 |
|
|
e7bf5e4a29
|
web: Common: Added support of fakeApi to getUserList and getGroupList methods
|
2019-12-06 16:37:04 +03:00 |
|
Daniil Senkiv
|
24d06b6fbe
|
Web.common: added Heading component, applied to web.client and people modules
|
2019-12-06 16:13:48 +03:00 |
|
|
4b51e4ad4f
|
Merge branch 'master' into Refactoring/remove-react-bootstrap
# Conflicts:
# products/ASC.People/Client/src/custom.scss
# web/ASC.Web.Client/src/custom.scss
# web/ASC.Web.Common/.storybook/styles.scss
# web/ASC.Web.Components/.storybook/styles.scss
|
2019-12-06 15:58:10 +03:00 |
|
|
4b3a206cdd
|
web: common: bump version
|
2019-12-06 15:50:27 +03:00 |
|
|
1478d9f74c
|
Web: Common: removed ReactToastify styles
|
2019-12-06 15:49:26 +03:00 |
|
|
667cb89c11
|
Merge branch 'master' into Refactoring/remove-react-bootstrap
|
2019-12-06 13:49:32 +03:00 |
|
|
8294090ddd
|
web: common: bump version
|
2019-12-06 13:43:22 +03:00 |
|
|
9f8c093f02
|
Web: Common: fixed login page auto focus
|
2019-12-06 13:43:03 +03:00 |
|
|
683ac13dd7
|
Web: Common: removed bootstrap from Common
|
2019-12-06 12:02:56 +03:00 |
|
|
86a0a6b48c
|
Merge branch 'master' into Refactoring/remove-react-bootstrap
|
2019-12-06 10:51:04 +03:00 |
|
|
7005413f6c
|
Web: Common: added Common base styles
|
2019-12-06 10:43:48 +03:00 |
|
Daniil Senkiv
|
0ca8d54912
|
web: common: bump version
|
2019-12-05 20:01:08 +03:00 |
|
Daniil Senkiv
|
781833d38d
|
moved actions from web.common to web.client and people modules
|
2019-12-05 20:00:53 +03:00 |
|
Daniil Senkiv
|
4b9637c1ae
|
web.common: Login: fixed after (e63f0200de )
|
2019-12-05 19:01:16 +03:00 |
|
Daniil Senkiv
|
f42d6dc3d4
|
web: common: bump version
|
2019-12-05 16:50:22 +03:00 |
|
Daniil Senkiv
|
276eefe679
|
Moved actions for confirm pages from web.common to web.client, applying to pages
|
2019-12-05 16:50:07 +03:00 |
|
|
8bd3c86d2b
|
Merge branch 'master' into feature/advanced-selector-v2
# Conflicts:
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/src/components/advanced-selector/index.js
# web/ASC.Web.Components/src/components/help-button/index.js
# web/ASC.Web.Components/src/components/icon-button/index.js
# Changed (by Text component changes):
# web/ASC.Web.Components/src/components/advanced-selector2/sub-components/selector.js
# web/ASC.Web.Components/src/components/advanced-selector2/advanced-selector2.stories.js
# web/ASC.Web.Components/src/components/advanced-selector/sub-components/groups/header.js
# web/ASC.Web.Components/src/components/advanced-selector/sub-components/options/body.js
# web/ASC.Web.Components/src/components/advanced-selector/sub-components/selector.js
# web/ASC.Web.Common/src/components/people-selector/index.js
|
2019-12-05 14:17:45 +03:00 |
|
Ilya Oleshko
|
f100dbcced
|
Merge branch 'master' into feature/components-custom-styling
|
2019-12-05 10:26:02 +03:00 |
|
Daniil Senkiv
|
b21a74d7ec
|
web: common: bump version
|
2019-12-04 17:35:44 +03:00 |
|
Daniil Senkiv
|
402226eca6
|
moved information for confirm pages from web.common to web.client, added confirm reducer
|
2019-12-04 17:35:38 +03:00 |
|
|
9e092329eb
|
web: Common: Added PeopleSelector
|
2019-12-04 17:35:17 +03:00 |
|
Ilya Oleshko
|
811ac01af7
|
Merge branch 'master' into feature/components-custom-styling
|
2019-12-04 14:38:42 +03:00 |
|
Daniil Senkiv
|
59790452ce
|
web: common: bump version
|
2019-12-04 14:20:43 +03:00 |
|
Daniil Senkiv
|
4984be5bbb
|
web.common: applied (3ec6c287c0 ) to ModuleTile component
|
2019-12-04 14:20:36 +03:00 |
|
Daniil Senkiv
|
fac36adde8
|
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer
|
2019-12-04 12:38:54 +03:00 |
|
Daniil Senkiv
|
3ec6c287c0
|
web.components: Text: refactoring, separating component to 3 components, apply changes
|
2019-12-04 12:36:13 +03:00 |
|
Ilya Oleshko
|
171fe4bbc7
|
Merge branch 'master' into feature/components-custom-styling
|
2019-12-04 10:46:22 +03:00 |
|
|
546b5ac5b9
|
web: common: bump version
|
2019-12-04 10:13:56 +03:00 |
|
|
b5eb5e6cf7
|
Web: Common: removed reactstrap from web.common
|
2019-12-04 10:12:57 +03:00 |
|
Ilya Oleshko
|
0a47dcef88
|
Merge branch 'master' into feature/components-custom-styling
|
2019-12-04 09:24:17 +03:00 |
|
NikolayRechkin
|
c0c69badf3
|
first version of a progressive web application
|
2019-12-03 17:04:40 +03:00 |
|
|
7b66b23686
|
Merge branch 'master' into feature/advanced-selector-v2
# Conflicts:
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/yarn.lock
|
2019-12-03 16:41:03 +03:00 |
|
|
4128d43d89
|
web: Update yarn.lock files
|
2019-12-03 16:24:13 +03:00 |
|
|
6b357c1bc8
|
Merge branch 'master' into feature/advanced-selector-v2
|
2019-12-03 15:35:39 +03:00 |
|
|
b63a5262ee
|
web: common: bump version
|
2019-12-03 15:10:21 +03:00 |
|
|
3832e78b3d
|
web: Common: Moved ModuleTile from asc-web-components to asc-web-common
|
2019-12-03 15:10:07 +03:00 |
|
|
4dcb4e2145
|
web: Common: Fixed start storybook with components from asc-web-components
|
2019-12-03 15:08:43 +03:00 |
|
|
d44f0ea5f0
|
Merge branch 'master' into feature/advanced-selector-v2
# Conflicts:
# web/ASC.Web.Components/src/components/help-button/index.js
|
2019-11-29 12:22:14 +03:00 |
|