Commit Graph

28984 Commits

Author SHA1 Message Date
Mushka Nikita
e5ebca27ee Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-02 17:39:48 +03:00
Mushka Nikita
b4dcc58d4f cleaned up code 2022-12-02 17:34:10 +03:00
Mushka Nikita
51e687d8d7 after-merge fixes 2022-12-02 17:27:39 +03:00
Mushka Nikita
131d8bcf50 Merge branch 'feature/new-docspace-translations' of github.com:ONLYOFFICE/AppServer into feature/new-docspace-translations 2022-12-02 17:27:19 +03:00
Viktor Fomin
f703d1b47e Common: Article: open profile by click username 2022-12-02 17:22:29 +03:00
Viktor Fomin
f6d5d22987 Common: Article: add background 2022-12-02 17:20:08 +03:00
Mushka Nikita
35aafe6058 fixed createRoomDialog translations 2022-12-02 17:18:30 +03:00
fa4674f2b0 Web: Files: FormGallery: fixed tiles display 2022-12-02 17:12:04 +03:00
dd4260acaa Update Settings.json
Fix NotFoundKeysTest issues
2022-12-02 17:02:55 +03:00
aa7c2f5b61 Update LocalesTest.cs
Fix translations tests for toast getTitle method
2022-12-02 16:52:49 +03:00
8b9f3a5c82 Update LocalesTest.cs
Fix detection of tKey translations
2022-12-02 16:30:24 +03:00
b73c4a8762 Web: Removed useless translations 2022-12-02 16:29:52 +03:00
d401c06876 Translations tests refactoring 2022-12-02 15:56:52 +03:00
c0d1645b45 Fix some UselessTranslationKeysTest issues 2022-12-02 15:56:05 +03:00
Akmal Isomadinov
72a7240cb8 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-02 17:03:01 +05:00
Akmal Isomadinov
a38a85ebbf Web:Client:Components:GlobalEvents:EditRoomEvent Added reloadSelection for update state info panel 2022-12-02 17:00:49 +05:00
Akmal Isomadinov
195a3ce167 Web:Client:Store:FilesStore Added updateSelection method and duplicate methods removed 2022-12-02 16:59:46 +05:00
0f96d279d3 Fix some UselessTranslationKeysTest issues 2022-12-02 14:28:02 +03:00
135ea764dc Web: Editor: Fixed action link. 2022-12-02 13:46:06 +03:00
c9c8833ddc
Merge pull request #1098 from ONLYOFFICE/feature/ASC.Migration.PersonalToDocspace-for-linux-
add ASC.Migration.PersonalToDocspace for linux
2022-12-02 11:54:13 +03:00
374e7f5915 add ASC.Migration.PersonalToDocspace for linux 2022-12-02 11:49:56 +03:00
2c92325af3
Merge pull request #794 from ONLYOFFICE/feature/migration_personal
Feature/migration personal
2022-12-02 11:19:47 +03:00
d0deecda18 Update ASC.Migration.PersonalToDocspace.exe 2022-12-02 11:16:29 +03:00
12e800a8be remove waste 2022-12-02 11:07:16 +03:00
997b2547b5 remove waste 2022-12-02 11:01:00 +03:00
6bf283ea94 Merge remote-tracking branch 'origin/release/rc-v1.2.0' into feature/migration_personal 2022-12-02 10:47:00 +03:00
Viktor Fomin
5293738b49 Client: Confirm: CreateUser: fix style 2022-12-01 19:07:19 +03:00
0b6000e200 Tests: Refactoring 2022-12-01 18:56:13 +03:00
80273d8392 Fix NotFoundKeysTest issues 2022-12-01 18:55:05 +03:00
b0a8c93054 Merge branch 'develop' into feature/new-docspace-translations 2022-12-01 18:43:19 +03:00
Viktor Fomin
ae9e16238b Client: Confirm: fix style 2022-12-01 18:32:59 +03:00
Viktor Fomin
05db34e801 Client: Confirm: delete useless 2022-12-01 18:31:25 +03:00
Viktor Fomin
c4d5f3b5ff Client: Confirm: get data from store 2022-12-01 18:27:46 +03:00
Viktor Fomin
9951111cd3 Common: AuthStore: add methods 2022-12-01 18:27:18 +03:00
Viktor Fomin
2c9c5a7dfc Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-01 18:09:28 +03:00
Viktor Fomin
70d45fd976 Client: Confirm: CreateUser: refactoring 2022-12-01 18:09:16 +03:00
c84faa2bc0 Merge branch 'develop' into release/rc-v1.2.0 2022-12-01 17:57:55 +03:00
1058e30a9b
Merge pull request #1096 from ONLYOFFICE/combobox-arrow
fixed bug with arrow
2022-12-01 17:56:30 +03:00
ed5f7992c2
Merge pull request #1095 from ONLYOFFICE/feature/accounts-room-list
Feature/accounts room list
2022-12-01 17:54:08 +03:00
Timofey Boyko
73b45d7820 Web:Client:Home: fix filter by subject 2022-12-01 16:53:47 +03:00
4f48b93572 Merge branch 'develop' into feature/accounts-room-list 2022-12-01 15:29:38 +03:00
05e3889d68
Merge pull request #1093 from ONLYOFFICE/bugfix/info-panel-room-tags
Bugfix/info panel room tags
2022-12-01 15:23:57 +03:00
Mushka Nikita
34c6946477 fixed hover and cleaned up code 2022-12-01 15:21:59 +03:00
6f0a751cf5 Web: Files: fixed file creation with empty name 2022-12-01 15:09:50 +03:00
Mushka Nikita
8dc13f3d72 changed tag hover logic, now it depends on provided onClick func 2022-12-01 15:08:34 +03:00
3e734bb2a1
Merge pull request #1092 from ONLYOFFICE/bugfix/create-room-tag-input
Bugfix/create room tag input
2022-12-01 14:47:08 +03:00
Mushka Nikita
018e9789c2 cleaned up code 2022-12-01 14:45:18 +03:00
1e28a01f08 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-01 14:42:46 +03:00
d29ca023cc Web: Client: InvitePanel: Fixed issue with input height on webkit platforms 2022-12-01 14:42:39 +03:00
d678891bde Web: Files: added an error when creating a room without a title 2022-12-01 14:15:57 +03:00