|
|
2d75554b0d
|
DbContext: optimization
|
2021-07-15 13:07:47 +03:00 |
|
|
|
e9af9374ca
|
Web: Files: hidden annoying loader on first load
|
2021-07-14 17:37:30 +03:00 |
|
|
|
1ebc588a93
|
Web: Bumped version to 1.0.0
|
2021-07-14 13:26:36 +03:00 |
|
|
|
ad57feecd8
|
Log: fix configuring
|
2021-07-13 21:17:18 +03:00 |
|
|
|
20234a0f31
|
Web: Files: lowercase banner image
|
2021-07-13 12:58:24 +03:00 |
|
|
|
8388a4e306
|
Merge branch 'develop' into feature/personal
|
2021-07-12 10:56:30 +03:00 |
|
|
|
354b7423ed
|
Files: fixed feed
|
2021-07-11 18:22:18 +03:00 |
|
|
|
28c0dced54
|
Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal
|
2021-07-09 18:50:04 +03:00 |
|
|
|
fccdd5f97a
|
Web: Files: fixed translations
|
2021-07-09 18:49:57 +03:00 |
|
|
|
d8612e2e01
|
Hide Privacy Rooms on personal
|
2021-07-09 18:41:07 +03:00 |
|
|
|
ee544dcde5
|
Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal
|
2021-07-09 17:02:01 +03:00 |
|
|
|
d14655900c
|
Web: Files: fixed
|
2021-07-09 17:01:48 +03:00 |
|
|
|
4cd1b3fa75
|
Web: People: Applied prettier style fix
|
2021-07-09 16:15:13 +03:00 |
|
|
|
dde99b792a
|
Web: Files: Applied prettier style fix
|
2021-07-09 16:13:50 +03:00 |
|
|
|
e0b37cfd1b
|
Fix Cancel click on edit profile on personal
|
2021-07-09 15:30:32 +03:00 |
|
|
|
3556497de6
|
Merge branch 'develop' into feature/personal
|
2021-07-08 14:38:26 +03:00 |
|
|
|
fed1ece277
|
Web: Files: fixed display of share menu
|
2021-07-06 17:07:56 +03:00 |
|
|
|
db7ea5c88f
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/v1.0.0
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/index.js
|
2021-07-06 11:38:02 +03:00 |
|
|
|
49db5f5348
|
Web: Files: fixed campaigns logic
|
2021-07-05 18:00:15 +03:00 |
|
|
|
2413daa175
|
Web: Files: get campaigns from firebase
|
2021-07-05 15:51:56 +03:00 |
|
|
|
8811bf1d1f
|
Web: Files: fixed ThirdPartyList width
|
2021-07-02 18:02:56 +03:00 |
|
|
|
71608b1a1b
|
Web: Files: show banner only for personal
|
2021-07-02 16:42:43 +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 |
|
|
|
dfaaf254e4
|
Web: Files: consecutive ads
|
2021-07-02 16:39:10 +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 |
|
|
|
658b7052c3
|
Web: Client: About: Removed useless component
|
2021-07-02 15:42:04 +03:00 |
|
Artem Tarasov
|
8abb14c9c5
|
Merge branch 'feature/translations-loaders' of github.com:ONLYOFFICE/AppServer into feature/translations-loaders
|
2021-07-02 14:55:01 +03:00 |
|
Artem Tarasov
|
88ca0fb0af
|
Web: Files: fixed selection
|
2021-07-02 14:54:12 +03:00 |
|
|
|
2a44887b22
|
Web: hid temp loaders
|
2021-07-02 14:28:11 +03:00 |
|
|
|
45920f7535
|
Web: fixed MainButton loader
|
2021-07-02 14:05:38 +03:00 |
|
|
|
4f9e03212f
|
Web: Files: added filter cleaning
|
2021-07-02 13:44:58 +03:00 |
|
|
|
81f93c3640
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/CampaignsBanner
|
2021-07-02 13:22:40 +03:00 |
|
|
|
c940aae128
|
Web: refactoring translation loaders
|
2021-07-02 12:25:36 +03:00 |
|
|
|
513ec04e33
|
Merge branch 'develop' into feature/translations-loaders
# Conflicts:
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/pages/Home/Section/Header/index.js
|
2021-07-01 16:47:34 +03:00 |
|
|
|
b195036cd0
|
Web: People: added withLoader HOC to Section Header
|
2021-07-01 16:43:42 +03:00 |
|
NikolayRechkin
|
56c0d8dccd
|
Calendar: core: fix
|
2021-07-01 16:20:32 +03:00 |
|
|
|
13acc5f511
|
Web: Files: added banner store
|
2021-07-01 15:53:28 +03:00 |
|
|
|
abfcba8993
|
Web: People: added withLoader HOC to MainButton
|
2021-07-01 15:48:26 +03:00 |
|
|
|
8776c45895
|
Web: Files: fixed ThirdPartyList width
|
2021-07-01 14:37:09 +03:00 |
|
|
|
57550164ed
|
Web: Files: fixed banner visibility
|
2021-07-01 13:46:44 +03:00 |
|
|
|
50d9d9113f
|
Web: Files: fixed files selection
|
2021-07-01 13:15:10 +03:00 |
|
|
|
a7d56b56f2
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/CampaignsBanner
|
2021-07-01 13:12:18 +03:00 |
|
|
|
5a07094755
|
Web: Files: added banner loader
|
2021-07-01 13:10:45 +03:00 |
|
|
|
7b3f411605
|
Web: Files: fixed scroll
|
2021-07-01 12:50:01 +03:00 |
|
|
|
cfeeb6c17b
|
Web: Files: fixed privacy icons styles
|
2021-07-01 12:35:06 +03:00 |
|
NikolayRechkin
|
0dba0bb76f
|
Calendar: core: fix
|
2021-07-01 12:15:59 +03:00 |
|
|
|
f0c971dd02
|
Web: Files: added campaigns banner
|
2021-07-01 11:26:52 +03:00 |
|
|
|
c05d05bab2
|
Merge branch 'develop' into feature/privacy-rooms-page
|
2021-07-01 09:13:58 +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 |
|
|
|
4be9f847fa
|
crm: fixed sql
|
2021-06-30 19:55:20 +03:00 |
|
|
|
b6b1c72769
|
core: added new ThenBy linq extension. crm: fixed sql
|
2021-06-30 19:08:41 +03:00 |
|
|
|
2c1bdf086a
|
Web: People: added loaders to people translations
|
2021-06-30 18:29:06 +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
|
e7e0f55403
|
Web: Files: deleted unnecessary code
|
2021-06-30 17:06:57 +03:00 |
|
Artem Tarasov
|
ef25c07ddc
|
Web: Common: FilterInput: fixed transfer viewSettings
|
2021-06-30 17:05:11 +03:00 |
|
NikolayRechkin
|
2e2bcfa35e
|
Calendar: core: fix
|
2021-06-30 16:36:45 +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 |
|
Artem Tarasov
|
0f19f240d1
|
Web: Files: fixed reset selection
|
2021-06-30 15:02:29 +03:00 |
|
|
|
d9eca86efa
|
Web: People: added tReady to file dialogs
|
2021-06-30 14:11:52 +03:00 |
|
|
|
f905d72caa
|
Web: Files: fixed article max width
|
2021-06-30 13:58:00 +03:00 |
|
Artem Tarasov
|
4f963784d3
|
Merge branch 'develop' into feature/thumbnails
|
2021-06-30 13:47:41 +03:00 |
|
|
|
f915deeaf0
|
Web: Files: added translation loaders to the file module
|
2021-06-30 12:55:52 +03:00 |
|
Artem Tarasov
|
51e17e5510
|
Web: Files: fixed reset selection when open aside
|
2021-06-30 12:55:10 +03:00 |
|
|
|
bf31efc939
|
Files: removed ItemDictionary
|
2021-06-30 12:39:08 +03:00 |
|
|
|
41f7a87ad1
|
Web: Files: added tReady to file panels
|
2021-06-30 10:29:48 +03:00 |
|
|
|
fff65d1ee9
|
Web: Files: added tReady to file dialogs
|
2021-06-30 10:28:13 +03:00 |
|
NikolayRechkin
|
5060e81b5f
|
Calendar: core: api
|
2021-06-30 09:37:17 +03:00 |
|
|
|
67f3782a41
|
Web: Files: fixed dragging
|
2021-06-29 18:57:55 +03:00 |
|
|
|
f327f42bf8
|
Web: Common: added filed encrypted to startUploadSession function
|
2021-06-29 17:54:24 +03:00 |
|
Artem Tarasov
|
9de3ebe20b
|
Web: Files: deleted unnecessary code
|
2021-06-29 17:00:52 +03:00 |
|
Artem Tarasov
|
6466432c9c
|
Merge branch 'develop' into feature/thumbnails
|
2021-06-29 15:49:11 +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 |
|
|
|
b0f64ca924
|
Merge branch 'develop' into feature/personal
|
2021-06-29 14:50:51 +03:00 |
|
|
|
9870859fe1
|
Web: Files: fixed dragging
|
2021-06-29 13:36:04 +03:00 |
|
|
|
73cdaad3fb
|
Web: Files: added hiding group file menu
|
2021-06-29 13:13:05 +03:00 |
|
|
|
c6ede6fff7
|
Merge branch 'develop' into feature/remove_itemList
|
2021-06-29 12:47:56 +03:00 |
|
|
|
c906c2c419
|
remove itemList in tests
|
2021-06-29 12:47:32 +03:00 |
|
|
|
6590529260
|
Web: Files: removed margin for privacy folder
|
2021-06-29 12:32:59 +03:00 |
|
|
|
78595cf513
|
Web: Files: fixed PrivateRoomSupport translation
|
2021-06-29 12:27:46 +03:00 |
|
Artem Tarasov
|
4d7fe086b5
|
Web: Files: fixed reset seletion
|
2021-06-28 14:38:17 +03:00 |
|
|
|
e47e43afcd
|
Merge branch 'develop' into feature/privacy-rooms-page
|
2021-06-28 14:37:23 +03:00 |
|
|
|
2cd83d0897
|
Web: Files: refactoring private rooms page
|
2021-06-28 14:36:38 +03:00 |
|
Artem Tarasov
|
42f30be69c
|
Web: Files: fixed display of the canWebEditIcon if the file is already open
|
2021-06-28 14:29:06 +03:00 |
|
Artem Tarasov
|
4e7480c481
|
Web: Files: Thumbnails: fixed the display of the thumbnail if the resource could not be loaded
|
2021-06-28 14:21:52 +03:00 |
|
|
|
1b685a7b5e
|
Web: Files: fixed PrivacyDescriptionConnect translations
|
2021-06-28 13:37:38 +03:00 |
|
|
|
3f26df9d49
|
Web: Files: fixed FileCreated translation
|
2021-06-28 13:09:24 +03:00 |
|
|
|
a3cccc4044
|
crm: migrate from FromForm to FromBody attribute
|
2021-06-28 12:42:42 +03:00 |
|
Artem Tarasov
|
01df3101e0
|
Web: Files: Thumbnails: added alt attr for thumbnail image
|
2021-06-28 12:39:06 +03:00 |
|
Artem Tarasov
|
ff5a165638
|
Web: Files: Thumbnails: fixed position of TileCOntainer, fixed readme ThileLoader
|
2021-06-28 11:25:23 +03:00 |
|
|
|
d2bb6daf3d
|
Web: Files: fixed empty screen for privacy folder
|
2021-06-28 10:45:36 +03:00 |
|
Artem Tarasov
|
3d1a7713e3
|
Merge branch 'develop' into feature/thumbnails
|
2021-06-28 10:40:33 +03:00 |
|
Artem Tarasov
|
5f984327dd
|
Web: Files" THumbnails: fixed double opening docEditor, when click on svg
|
2021-06-28 10:27:41 +03:00 |
|
Artem Tarasov
|
c5ec80c802
|
Web: Files: Thumbnails: fixed highlight tile when clickin on context button for chrome and android
|
2021-06-28 10:01:57 +03:00 |
|
|
|
0fec9b3587
|
Merge branch 'develop' into feature/privacy-rooms-page
|
2021-06-28 09:10:44 +03:00 |
|
Artem Tarasov
|
4c1b5bcad6
|
Web: Files: Thumbnails: fixed the reset of the page scroll position when clicking on the checkbox
|
2021-06-27 21:39:59 +03:00 |
|
|
|
9c79e2803c
|
Web: Files: added a page loader for the private rooms page
|
2021-06-27 10:34:57 +03:00 |
|
|
|
2d0807fa17
|
Web: Files: hidden privacy folder data for mobile devices
|
2021-06-27 09:35:15 +03:00 |
|
|
|
99f9d27fd0
|
Web: Files: added checkProtocol helper, fixed toast
|
2021-06-27 09:31:07 +03:00 |
|
|
|
3f2dfeb5a9
|
crm: started migrate from FromForm to FromBody attribute. bugfix
|
2021-06-25 16:58:42 +03:00 |
|
Artem Tarasov
|
52bf73df20
|
Web: Files: Thumbnails: fixed canConvert badge
|
2021-06-25 16:41:15 +03:00 |
|
Artem Tarasov
|
2691e9c724
|
Web: Files: hoc: fixed opening floder or file when double click on renaming/creation item
|
2021-06-25 16:40:29 +03:00 |
|
Artem Tarasov
|
930cd48583
|
Web: Files: Thumbnails: fixed double opening docEditor when click on thumbnail
|
2021-06-25 15:39:36 +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 |
|
|
|
fbcdba3b17
|
Merge branch 'develop' into feature/personal
|
2021-06-25 11:10:49 +03:00 |
|
|
|
3217c2acb1
|
Web: Files: fixed PrivateRoomsPage route
|
2021-06-25 09:45:43 +03:00 |
|
Artem Tarasov
|
af77facf99
|
Web: Files: Thumbnails: deleted unnecessary code
|
2021-06-24 19:53:48 +03:00 |
|
Artem Tarasov
|
ac288d3027
|
Web: Files: Thumbnails: refactoring styles
|
2021-06-24 19:48:26 +03:00 |
|
Artem Tarasov
|
2c1a39bcdb
|
Web: Files: Thumbnails: refactoring
|
2021-06-24 19:46:46 +03:00 |
|
|
|
bf67b5c296
|
Web: Files: added PrivateRoomsPage
|
2021-06-24 16:23:14 +03:00 |
|
Artem Tarasov
|
e996f17552
|
Merge branch 'develop' into feature/thumbnails
|
2021-06-24 16:22:14 +03:00 |
|
|
|
37a676cb5a
|
Tenant: removed Public, PublicVisibleProducts
|
2021-06-24 15:55:12 +03:00 |
|
Artem Tarasov
|
8310bff1b7
|
Web: Files: THumbnails: fixed unable to choose file selection
|
2021-06-24 15:35:50 +03:00 |
|
|
|
d32c68b617
|
Web: Files: fixed context menu options for private rooms, fixed access rights for sharing
|
2021-06-24 12:06:03 +03:00 |
|
Artem Tarasov
|
0403801270
|
Web: Files: Thumbnails: added validation for thumbnailStatus, fixed styles
|
2021-06-24 11:33:21 +03:00 |
|
|
|
6e9d64da7a
|
Merge branch 'develop' into feature/remove_itemList
|
2021-06-24 11:21:46 +03:00 |
|
Artem Tarasov
|
fdae8372ef
|
Web: Files: Thumbnails: fixed drag style, deleted console.log
|
2021-06-24 01:52:47 +03:00 |
|
Artem Tarasov
|
ffe1b89569
|
Merge branch 'develop' into feature/thumbnails
|
2021-06-24 01:04:45 +03:00 |
|
Artem Tarasov
|
81c6a04b0d
|
Web: Files: Thumbnails: fixed file action
|
2021-06-24 01:00:51 +03:00 |
|
Artem Tarasov
|
aac415adbb
|
Web: Files: Thumbnails: fixed size of badges
|
2021-06-24 00:42:50 +03:00 |
|
Artem Tarasov
|
d017052e9b
|
Web: Files: Thumbnails: added usage thumbnailStatus
|
2021-06-24 00:29:53 +03:00 |
|
|
|
a4aa4843e8
|
crm: started migrate from FromForm to FromBody attribute
|
2021-06-23 22:32:56 +03:00 |
|
|
|
8998a72d8c
|
Files: fixed build
|
2021-06-23 20:56:55 +03:00 |
|
|
|
d41f81e1cd
|
Merge branch 'develop' into feature/remove_binary_formatter
|
2021-06-23 20:27:10 +03:00 |
|
Artem Tarasov
|
a7c4f38a89
|
Merge branch 'develop' into feature/thumbnails
|
2021-06-23 17:47:14 +03:00 |
|
NikolayRechkin
|
e42cfc2945
|
Calendar: core: deleted unused code
|
2021-06-23 17:30:53 +03:00 |
|
|
|
ce15c26c50
|
Web: Files: added display of privacy room files
|
2021-06-23 17:02:06 +03:00 |
|
Artem Tarasov
|
1f753cfd6e
|
Web: Files: Thumbnails: added reset selection when clicking on an empty area of the page, fixed the area when clicking on which the file opens
|
2021-06-23 16:57:42 +03:00 |
|
|
|
c941468cdb
|
Files: api. Added thumbnailStatus
|
2021-06-23 16:19:25 +03:00 |
|
|
|
20d1f9a738
|
merge from develop
|
2021-06-23 16:10:46 +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
|
d5ebaa6247
|
Web: Files: Thumbnails: fixed files style
|
2021-06-23 14:29:12 +03:00 |
|
Artem Tarasov
|
771ff447b0
|
Web: Files: Thumbnails: fixed folder style
|
2021-06-23 14:20:29 +03:00 |
|
Artem Tarasov
|
ed92a79f29
|
Web: Files: Thumbnails: fixed styles, refactoring
|
2021-06-23 11:11:35 +03:00 |
|
Artem Tarasov
|
fe1a1e7e5c
|
Web: Files: THumbnails: fixed view of EditingWrapperComponent for new folder
|
2021-06-23 02:21:27 +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 |
|
|
|
89d9ea6297
|
Test: fix
|
2021-06-22 19:15:04 +03:00 |
|
|
|
282738cb13
|
Merge branch 'develop' into feature/personal
|
2021-06-22 18:44:12 +03:00 |
|
Artem Tarasov
|
28614d8f39
|
Web: Files: THumbnails: fixed opened folder when click on context menu
|
2021-06-22 15:14:02 +03:00 |
|
|
|
2cdcd36020
|
Web: Commented annoying logs
|
2021-06-22 13:43:18 +03:00 |
|
Artem Tarasov
|
2b2fddf857
|
Web: Files: Thumbnails: fixed double opening context menu
|
2021-06-22 12:51:44 +03:00 |
|
Artem Tarasov
|
f78aee3f15
|
Merge branch 'develop' into feature/thumbnails
|
2021-06-22 12:16:36 +03:00 |
|
|
|
6d21bb2209
|
File: status fix
|
2021-06-22 11:42:29 +03:00 |
|
|
|
43fe4995f4
|
Web: Files: fixed SharingPanel translations
|
2021-06-22 10:29:29 +03:00 |
|
