Commit Graph

31042 Commits

Author SHA1 Message Date
Viktor Fomin
4710429524 Web: add images 2023-02-18 23:55:57 +03:00
10c637e822 Root folders renamed 2023-02-16 19:36:47 +03:00
c04e40618f
Merge pull request #1215 from ONLYOFFICE/bugifx/Bug61098
Fix Bug 61098: android scroll on settings page
2023-02-16 13:53:31 +03:00
e8fcafa4db Merge branch 'develop' into bugifx/Bug61098 2023-02-16 13:46:24 +03:00
e4af9ce373
Merge pull request #1197 from ONLYOFFICE/feature/entries-trash-origin
Feature/entries trash origin
2023-02-16 13:32:15 +03:00
Mushka Nikita
c366b5ef0b fixed getDaysRemaining method 2023-02-16 13:06:40 +03:00
Mushka Nikita
8e0751922e revert roomCell removed span tag 2023-02-16 12:06:09 +03:00
Mushka Nikita
03f3f71b7a Merge branch 'feature/entries-trash-origin' of github.com:ONLYOFFICE/AppServer into feature/entries-trash-origin 2023-02-16 12:02:46 +03:00
Mushka Nikita
627a6b7f2a reordered trash table columns and separated Author, Created, Size and Type trash table columns for default isEnable 2023-02-16 12:02:41 +03:00
f8f33c3574 Web: Added api error handling 2023-02-16 11:20:48 +03:00
Viktor Fomin
569bd443fc Fix Bug 61098: android scroll on settings page 2023-02-16 01:03:24 +03:00
f738a8b830 Merge branch 'develop' into feature/entries-trash-origin 2023-02-15 17:29:23 +03:00
Mushka Nikita
98c9f72dfe removed unused file 2023-02-15 15:18:48 +03:00
Mushka Nikita
d807ec5d7a reverted erasure sorting to DateAndTime 2023-02-15 15:18:37 +03:00
Mushka Nikita
c1ca7305c7 Merge branch 'feature/entries-trash-origin' of github.com:ONLYOFFICE/AppServer into feature/entries-trash-origin 2023-02-15 14:38:36 +03:00
Mushka Nikita
d0354b931a fixed tooltip missing onUpdate rebuild 2023-02-15 14:32:19 +03:00
02fc9582e9
Merge pull request #1213 from ONLYOFFICE/bugfix/Bug-61190
Fixed Bug 61190 - Files. The editor does not open + errors in the con…
2023-02-15 14:01:18 +03:00
2a12f4ca0a Files: added 30 days gap 2023-02-15 13:27:01 +03:00
8767b227e4 Files: fixed crash, refactor 2023-02-15 13:11:11 +03:00
Timofey Boyko
db7e9ec322 Merge branch 'develop' into bugfix/Bug-61190 2023-02-15 12:23:25 +03:00
f48b2b040e
Merge pull request #1204 from ONLYOFFICE/bugfix/login-confirm-style
Bugfix/login confirm style
2023-02-15 12:16:36 +03:00
Timofey Boyko
93d1675bfb Fixed Bug 61190 - Files. The editor does not open + errors in the console if the username contains XSS injection 2023-02-15 12:16:11 +03:00
Viktor Fomin
d0db109aa7 Client: Confirm: fix toast 2023-02-15 12:04:33 +03:00
Viktor Fomin
938414c56b Client: Confirm: fix 2023-02-15 11:52:34 +03:00
Viktor Fomin
0755ebc597 Common: add query for get settings with password 2023-02-15 11:52:19 +03:00
a09de96338
Merge pull request #1212 from ONLYOFFICE/bugfix/spam-media-removal
Web: Common: fixed the ability to spam deleting a media file with hotkey
2023-02-15 11:14:46 +03:00
4f294dcc29
Merge pull request #1210 from ONLYOFFICE/bugfix/fix-desktop-navigation
Bugfix/Fixed Bug 61072
2023-02-15 11:13:24 +03:00
DmitrySychugov
9a154409be Merge branch 'develop' into bugfix/spam-media-removal 2023-02-15 13:10:32 +05:00
DmitrySychugov
6276b768f4 Merge branch 'bugfix/spam-media-removal' of github.com:ONLYOFFICE/DocSpace into bugfix/spam-media-removal 2023-02-15 13:10:24 +05:00
DmitrySychugov
43e9f8ea17 Web: Common: rename isRemoved to lastRemovedFileId 2023-02-15 13:09:36 +05:00
de3bcd698e Merge branch 'develop' into bugfix/fix-desktop-navigation 2023-02-15 11:06:08 +03:00
Mushka Nikita
c6b835166f disabled erasure warning in empty trash case 2023-02-14 23:39:38 +03:00
Mushka Nikita
d0fb62615d added tooltip 2023-02-14 23:38:57 +03:00
Viktor Fomin
96e63bf056 Merge branch 'develop' into bugfix/login-confirm-style 2023-02-14 23:31:57 +03:00
83f825522c
Merge pull request #1209 from ONLYOFFICE/bugfix/Bug61073
Fix Bug 61073: Implement the ability to copy text in the About window
2023-02-14 23:22:15 +03:00
Viktor Fomin
c0cfb921f9 Client: Confirm: ChangePassword: add error toast 2023-02-14 22:26:34 +03:00
Viktor Fomin
696194c157 Client: About: allow select all text 2023-02-14 22:05:20 +03:00
Timofey Boyko
9e612f4fa4 Merge branch 'bugfix/fix-desktop-navigation' of https://github.com/ONLYOFFICE/DocSpace into bugfix/fix-desktop-navigation 2023-02-14 19:17:34 +03:00
Timofey Boyko
4668615fac Web:Client:Pages: fix accounts header height for tablet 2023-02-14 19:17:18 +03:00
44126aaf54 Merge branch 'develop' into bugfix/spam-media-removal 2023-02-14 18:55:50 +03:00
3693d7ee7e Merge branch 'develop' into bugfix/fix-desktop-navigation 2023-02-14 18:38:22 +03:00
fb4a9f9046 Merge branch 'develop' into bugfix/Bug61073 2023-02-14 18:27:39 +03:00
10e285c499 Merge branch 'develop' into bugfix/login-confirm-style 2023-02-14 17:04:34 +03:00
d6cc4de555
Merge pull request #1207 from ONLYOFFICE/bugfix/viewer-timeout
Web: Components: timeout has been shortened for viewer
2023-02-14 17:00:40 +03:00
c24f027ab7
Merge pull request #1206 from ONLYOFFICE/feature/refactoring-image-viewer
Feature/refactoring image viewer
2023-02-14 16:58:37 +03:00
Akmal Isomadinov
8b1e94a2b2 Merge branch 'feature/refactoring-image-viewer' of github.com:ONLYOFFICE/DocSpace into feature/refactoring-image-viewer 2023-02-14 18:55:49 +05:00
Akmal Isomadinov
753be7eb9e Web:Components:Viewer:Styled-Viewer Fixed title overflow in mobile viewer 2023-02-14 18:55:31 +05:00
7fc3d15536 Merge branch 'develop' into feature/refactoring-image-viewer 2023-02-14 16:13:20 +03:00
1841fb7fa4
Merge pull request #1203 from ONLYOFFICE/bugfix/redirect-after-payment
Bugfix/redirect after payment
2023-02-14 16:07:05 +03:00
0621043d42 Merge branch 'develop' into bugfix/redirect-after-payment 2023-02-14 16:05:32 +03:00