Commit Graph

11001 Commits

Author SHA1 Message Date
43126ee7c5 fix 2023-04-24 01:16:06 -07:00
f5d3372af2 Merge branch 'release/v1.0.0' into develop 2023-04-24 11:33:58 +04:00
edae98c73d fix Bug 62216 2023-04-21 12:27:41 +03:00
NikitaVashchuk
f64450b6d9 fix bug 62197 2023-04-20 19:02:35 +05:00
48f9073302 Merge branch 'release/v1.0.0' into develop 2023-04-20 12:31:46 +04:00
34a86cb02f fix 62142 2023-04-19 18:55:49 +03:00
NikitaVashchuk
d2e2138b8b Notifications: fixed UserFileUpdated event 2023-04-19 14:50:25 +05:00
c3725e3099 DocsStore: remake update 2023-04-18 18:04:45 +05:00
78e6688211 added translations 2023-04-18 14:30:55 +03:00
e6c2f39e39 fix translations 2023-04-18 09:58:41 +03:00
d7e4dd729e Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0 2023-04-18 09:10:43 +03:00
5455d0112f fix first visit 2023-04-18 09:10:31 +03:00
3b4c396391 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-04-17 18:26:09 +03:00
03acba483c added translations 2023-04-17 18:25:51 +03:00
NikitaVashchuk
20a9cfb925 AbstractDao: fix TenantID 2023-04-17 19:18:26 +05:00
95ca8e7811 added bg 2023-04-17 15:19:46 +03:00
7ba38a4a4e Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-04-17 14:18:44 +03:00
177c79fc79 added az 2023-04-17 14:18:22 +03:00
66f3d622e1 Files: Global: fix 2023-04-17 13:06:47 +03:00
100bddeb4a Merge branch 'release/v1.0.0' into develop 2023-04-17 11:38:48 +04:00
726e1ebab7 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0 2023-04-15 19:33:27 +03:00
052fc66c40 Files: Global: refactoring, added logging 2023-04-15 19:33:09 +03:00
b514234295 cleanup: setup max threads 2023-04-14 19:03:35 +03:00
2473cd5632 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0 2023-04-14 18:44:02 +03:00
17c9998cc2 Files: optimized first visit 2023-04-14 18:41:42 +03:00
5534200fbf thumbnail: added GC.Collect() and remove seek video 3 seconds 2023-04-14 18:32:08 +03:00
7df9ee8f8b
Merge pull request #1358 from ONLYOFFICE/bugfix/notifications
Bugfix/notifications
2023-04-14 15:27:09 +03:00
5fcd3e166b Merge branch 'release/v1.0.0' into develop 2023-04-13 16:44:51 +04:00
2b17d2eed0 people: fixed generate thumbnails 2023-04-13 14:44:22 +03:00
NikitaVashchuk
880ac92c75 fix Bug 61863 2023-04-13 14:56:41 +05:00
18bf4167f7 Merge branch 'release/v1.0.0' into develop 2023-04-13 13:27:58 +04:00
a7de97e4ce fixed: user photo manager 2023-04-12 23:15:39 +03:00
abad7a0e15 user photo upload: fixed 2023-04-12 23:07:22 +03:00
bf659c6d82 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0 2023-04-12 23:01:15 +03:00
89c1889901 optimized creating start documents 2023-04-12 23:01:05 +03:00
4f12380445 people: update last_modified in core_user table after set user photo 2023-04-12 22:27:16 +03:00
c85caa5651 people: fixed response for POST {userid}/photo/thumbnails method 2023-04-12 19:18:40 +03:00
990128748b DI: fix startup 2023-04-12 14:07:37 +03:00
42e8b739f3 fix Bug 61992 2023-04-11 17:52:39 +03:00
7abad777d7 fixed Bug 62014 2023-04-11 11:18:02 +03:00
2e0198fa98 AllowNotPayment for activation 2023-04-10 18:37:04 +03:00
df62b3862f Merge branch 'release/v1.0.0' into develop
# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/payments/PriceCalculation.js
#	packages/common/components/Article/sub-components/article-payment-alert.js
#	packages/components/scrollbar/custom-scrollbars-virtual-list.js
#	products/ASC.Files/Core/Core/CountRoomFeature.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
#	products/ASC.Files/Core/Helpers/Global.cs
2023-04-10 17:24:09 +03:00
3130276715 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0 2023-04-09 23:29:30 +03:00
8a2ad6b27f revert old sample documents creating 2023-04-09 23:29:19 +03:00
cd0a27109c SignupAccountRequestDto: EmplType -> EmployeeType 2023-04-09 21:20:57 +03:00
40e7935d68
Merge pull request #1326 from ONLYOFFICE/feature/quota-via-websocket
Feature/quota via websocket
2023-04-07 21:51:32 +04:00
351a2dbbd4 SignupAccountRequestDto: EmplType -> EmployeeType 2023-04-07 18:33:28 +03:00
a6869cce18 si-LK empty files 2023-04-07 19:23:00 +05:00
8d9b4404cf fix Bug 61978 2023-04-07 16:53:30 +03:00
64c44bed2a Merge branch 'release/v1.0.0' into feature/quota-via-websocket 2023-04-07 16:14:11 +04:00