Commit Graph

13075 Commits

Author SHA1 Message Date
Sergey Kirichenko
9546e04e44
Add cache control in the backend proxy (#299)
* Modify cache control in the proxy

* Cosmetic modify

* Cosmetic modify

* Cosmetic modify

* Cosmetic modify

* Add expires conf

* Del swp file
2021-07-09 16:16:15 +03:00
1f76d64048
Merge pull request #296 from ONLYOFFICE/bugfix/v1.0.0
Bugfix/v1.0.0
2021-07-08 14:36:12 +03:00
84fa1f8eb3 Web: Common: fixed height 2021-07-08 13:59:48 +03:00
523fb66248 Web: Common: fixed buttons height 2021-07-07 13:20:16 +03:00
2e2f121d26 Web: Common: disabled hover 2021-07-07 12:47:01 +03:00
04173a1426 Web: Common: fixed 2021-07-07 11:05:18 +03:00
a9ed86fee7 Web: Common: open selector on button 2021-07-06 17:37:07 +03:00
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
5a16c5a6ff
Merge pull request #294 from ONLYOFFICE/feature/translations-loaders
Feature/translations loaders
2021-07-02 16:00:15 +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
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
a1f5596f9c
Merge pull request #292 from ONLYOFFICE/feature/privacy-rooms-page
Feature/privacy rooms page
2021-07-01 16:32:34 +03:00
abfcba8993 Web: People: added withLoader HOC to MainButton 2021-07-01 15:48:26 +03:00
50d9d9113f Web: Files: fixed files selection 2021-07-01 13:15:10 +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
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
c5da5a1950 Web: Client: added tReady for confirm pages 2021-06-30 18:24:29 +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
2e8ae2fb65
Merge pull request #293 from ONLYOFFICE/bugfix/fix-filter-input
Bugfix/fix filter input
2021-06-30 17:17:05 +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
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
b7d834d3c6
Merge pull request #289 from ONLYOFFICE/feature/thumbnails
Feature/thumbnails
2021-06-30 15:41:59 +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
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
Artem Tarasov
4f963784d3 Merge branch 'develop' into feature/thumbnails 2021-06-30 13:47:41 +03:00
2d718c33f8 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/v1.0.0 2021-06-30 13:39:02 +03:00
0a82baea4c WebL Common: fixed article max width 2021-06-30 13:38:53 +03:00
55e603f906
Merge pull request #287 from ONLYOFFICE/feature/remove_itemList
Feature/remove item list
2021-06-30 13:06:56 +03:00
2576784207 Web: Common: added borderRadius prop 2021-06-30 12:57:05 +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
2a013c9c5c Web: Common: refactoring tree menu loader 2021-06-30 12:54:10 +03:00
bf31efc939 Files: removed ItemDictionary 2021-06-30 12:39:08 +03:00