Commit Graph

12127 Commits

Author SHA1 Message Date
SuhorukovAnton
02da2a15d1 websocket for only net standart 2021-05-21 13:31:28 +03:00
SuhorukovAnton
a1c4e0f568 Merge branch 'develop' into feature/thirdparty_for_two_frameworks 2021-05-21 12:27:54 +03:00
46bc181cd7
Merge pull request #262 from ONLYOFFICE/bugfix/context-actions
Bugfix/context actions
2021-05-20 18:32:06 +03:00
6163da17a6 Merge branch 'develop' into bugfix/context-actions 2021-05-20 18:16:48 +03:00
4e5bd47c26
Feature/rpm update (#229)
* Add a build and install new services

* Change the packaging for the new build script

* Correct the configuration

* Add a bug fix with a mysql password containing ';'

* Fix services crash error

* Fix incorrect value addition in mysql

* Fix a rabbitmq error on CentOS 8

* Fix creating an invalid mysql password

* Fix non-existent tables Tenants

* Add an update to 1click

* Code correction

* Add two new services

* Add the buildpath variable

* Code Optimization

* Renaming services and creating a variable for the app name

* Revert "Merge branch 'feature/rpm-update' of https://github.com/ONLYOFFICE/AppServer into feature/rpm-update"

This reverts commit 19c1eae6f6e3f22f4cbc0e3276fa892b0d9fa97a, reversing
changes made to fb36a996366291486e3b9f5a6f46398916ef8a6c.

* Code Optimization

* Code optimization

* Code optimization and creating a variables
2021-05-20 17:39:38 +03:00
354841442e Web: Editor: Fixed shell name 2021-05-20 14:21:26 +03:00
3ace83bd61 Web: Files: fixed onFilesClick 2021-05-20 14:00:41 +03:00
ac976de0a5 Web: Files: fixed onFilesClick 2021-05-20 13:55:58 +03:00
cda77e1234 Merge branch 'develop' into bugfix/context-actions 2021-05-20 13:24:18 +03:00
93ba0e8eb8
Merge pull request #253 from ONLYOFFICE/feature/my-profile
Feature/my profile
2021-05-20 13:09:30 +03:00
28a5a3d7f2
Merge branch 'develop' into feature/my-profile 2021-05-20 12:43:16 +03:00
f5372bbba8 Web: People: MyProfile: Fix translations loading 2021-05-20 11:45:13 +03:00
fc822e5ad5 Web: Fix setModuleInfo usage 2021-05-20 11:27:50 +03:00
3b7f1f60ec Web: Files: fixed loopTreeFolders 2021-05-20 11:17:50 +03:00
5de1182bfa Web: Files: fixed NewFilesPanel error 2021-05-19 18:55:12 +03:00
52750c607d Merge branch 'bugfix/context-actions' of https://github.com/ONLYOFFICE/AppServer into bugfix/context-actions 2021-05-19 18:14:40 +03:00
f04a4560b4 Web: Files: moved getNewFiles to actions 2021-05-19 18:14:35 +03:00
e268b077df Web: Files: Store: Fixed displaying edit action for files with low access 2021-05-19 17:54:29 +03:00
666cc00a52 Web: Files: Store: Fixed copy action for shared files inside root. Added view action for edited files 2021-05-19 17:48:23 +03:00
03a71ae131 Merge branch 'bugfix/context-actions' of https://github.com/ONLYOFFICE/AppServer into bugfix/context-actions
# Conflicts:
#	products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
2021-05-19 17:11:46 +03:00
23c075859b Web: Files: moved mark as read to actions 2021-05-19 17:11:10 +03:00
1003c6fe15 Web: Files: Dialog: Added unsubscribe action for DeleteDialog 2021-05-19 17:03:03 +03:00
e5f066e074 Web: Files: Store: Added unsubscribeAction for FilesActionsStore 2021-05-19 16:54:17 +03:00
cf49743054 Web: Files: Store: Added unsubscribe mark for Dialog 2021-05-19 16:53:32 +03:00
98d9fb4e33 Web: Files: HOC: Added unsubscribe action 2021-05-19 16:52:38 +03:00
3c6f831618 Web: Common: Api: Added removeShareFiles api method 2021-05-19 16:51:43 +03:00
e4f10d16cb Server: Files: Controller: FilesController: Fixed model parse for delete share 2021-05-19 16:50:08 +03:00
2cd59d9014 Merge branch 'bugfix/context-actions' of https://github.com/ONLYOFFICE/AppServer into bugfix/context-actions 2021-05-19 13:55:13 +03:00
d5ff576188 Web: Files: Store: Added mark read action, added remove from list and mark read icons 2021-05-19 13:54:45 +03:00
49e70d1ccc Web: Files: removed useless code 2021-05-19 13:46:53 +03:00
d55c953805 Web: Files: fixed MediaViewer propTypes 2021-05-19 13:45:37 +03:00
60557cdfce Merge branch 'develop' into bugfix/context-actions 2021-05-19 12:28:32 +03:00
5d94113e23 Backup: fix 2021-05-19 11:31:50 +03:00
536c6c2f5e Web: Moved custom.scss to @appserver/common
+ Added missing ErrorBoundary
+ Removed useless commented code
2021-05-19 11:14:44 +03:00
86952dd71e Merge branch 'develop' into bugfix/context-actions 2021-05-19 10:19:17 +03:00
3433c074d7 Merge branch 'develop' into feature/my-profile
# Conflicts:
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
2021-05-19 10:16:40 +03:00
b9c52c526e Fixed DistributedTask 2021-05-18 21:24:22 +03:00
1b4807c07a Files: fixed SetTagsNew for thirdparty 2021-05-18 20:10:48 +03:00
2f7b9102ee Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2021-05-18 20:06:42 +03:00
d9e17af9d5 OneDrive: fix DI 2021-05-18 20:06:06 +03:00
c4c4d940a0
Merge pull request #252 from ONLYOFFICE/feature/remove-wq
Feature/remove wq
2021-05-18 19:04:34 +03:00
619b33caf3 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2021-05-18 18:51:23 +03:00
06928a7896 People: fixed group cache 2021-05-18 18:50:48 +03:00
4f1371370c
Merge pull request #260 from ONLYOFFICE/bugfix/fixed-firefox-header
Bugfix/fixed firefox header
2021-05-18 18:27:07 +03:00
8ad59d282b Web: Files: Store: Added mark read button 2021-05-18 18:18:38 +03:00
84565d46c6 Merge branch 'develop' into bugfix/fixed-firefox-header 2021-05-18 18:08:53 +03:00
bc901b8a4a Web: People: disabled user type change 2021-05-18 18:00:29 +03:00
07934f6cd9 Web: Common: fixed firefox header 2021-05-18 17:59:34 +03:00
2c6d06f304 Web: Files: fixed drag 2021-05-18 17:59:02 +03:00
6c51f15d28 Web: Components: fixed toggle-button styles 2021-05-18 17:58:45 +03:00