Commit Graph

3407 Commits

Author SHA1 Message Date
diana-vahomskaya
9c552cdf9c Fix Context in ASC.Files.Core, Update Migrations in ASC.Files.Core, ASC.Files.Test 2021-08-04 14:10:06 +03:00
diana-vahomskaya
34c4161f08 Update migrations, fix Context with repetitive Models 2021-07-27 19:26:56 +03:00
diana-vahomskaya
3131c27d26 Merge remote-tracking branch 'remotes/origin/feature/wizard/migration' into develop 2021-07-27 17:39:29 +03:00
e2d3f3195d Merge branch 'develop' into release/1.0.0 2021-07-26 15:40:05 +03:00
fcd46cfe3c Web: Files: Deleted preview and edit options for not supported formats. 2021-07-26 14:19:30 +03:00
538d65c724 Web: Remove query hash from remoteEntry.js 2021-07-26 14:02:10 +03:00
be2322a1ca Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-07-26 12:58:51 +03:00
30b41aac42 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-07-26 12:37:01 +03:00
a57f018def Web: Files: Added icon for fb2 format. 2021-07-26 11:59:08 +03:00
0f27a6c673 Merge branch 'develop' into release/1.0.0 2021-07-23 17:34:43 +03:00
675fb8de21 Web: Fix caching remoteEntry.js 2021-07-23 17:20:42 +03:00
573862f0b7 FactoryIndexer: fix async 2021-07-22 15:43:43 +03:00
fa500d094f Merge branch 'develop' into release/1.0.0 2021-07-22 11:12:37 +03:00
e703927239 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-07-21 18:30:33 +03:00
13f8f5ef7d Fix sw.js creation 2021-07-21 18:28:56 +03:00
f7ce0e210b Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
# Conflicts:
#	packages/asc-web-common/utils/sw-helper.js
2021-07-21 07:20:51 +03:00
653066af0c Merge branch 'develop' into release/1.0.0
# Conflicts:
#	config/nginx/onlyoffice.conf
2021-07-20 18:21:00 +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
eab97bbfed Web: init new single sw.js creation 2021-07-20 12:32:27 +03:00
diana-vahomskaya
81d8324afb ASC.Web.Api Tests added 2021-07-19 15:12:40 +03:00
diana-vahomskaya
eb3d18abc7 test for wizard 2021-07-16 15:10:53 +03:00
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
dde99b792a Web: Files: Applied prettier style fix 2021-07-09 16:13:50 +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
88ca0fb0af Web: Files: fixed selection 2021-07-02 14:54:12 +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