Commit Graph

7429 Commits

Author SHA1 Message Date
Alexey Kostenko
b45965a15c Web: Components/People: Added cancel button on avatar editor page 2020-10-05 17:15:25 +03:00
Alexey Kostenko
e6572e9574 Web: People/Components: Style fix, added translate keys 2020-10-05 15:39:55 +03:00
Alexey Kostenko
f481376a08 web: components: bump version 2020-10-04 14:41:51 +03:00
Alexey Kostenko
98d006d825 Web: Components: Fix mobile styles on AvatarEditor 2020-10-04 14:41:39 +03:00
Alexey Kostenko
18f504aaa4 web: components: bump version 2020-10-02 10:10:47 +03:00
Alexey Kostenko
19a7d88fe1 Web: People/Components: Fix save avatar, added AvatarEditor component on AvatarEditor page 2020-10-02 10:10:40 +03:00
Alexey Kostenko
721d4d6d83 Merge branch 'feature/files' into feature/avatar-editor-redesign 2020-10-01 10:21:56 +03:00
140d57d5d4 Merge branch 'master' into feature/files 2020-09-30 18:28:27 +03:00
58126fd98d Auth by passwordHash 2020-09-30 17:16:48 +03:00
c08abfc396 User: fix SetUserPasswordHash 2020-09-30 15:54:36 +03:00
Alexey Kostenko
31391676cb Web: People: Added conditions for going to the page with the avatar editor 2020-09-30 15:50:39 +03:00
bfd450e602 DbUserService: fix 2020-09-30 14:20:54 +03:00
Ilya Oleshko
a9163c06be Web: Files : Fixed open files after create 2020-09-30 11:57:22 +03:00
b56df84bce Settings: added password settings 2020-09-29 18:08:54 +03:00
Alexey Kostenko
c8374e3fa8 Web: People: Added a template for the avatar editor page 2020-09-29 16:46:27 +03:00
de03714d3d Nginx: X-Frame-Options 2020-09-29 10:31:27 +03:00
ee4348c705
Merge pull request #82 from ONLYOFFICE/feature/payments-enterprise
Feature/payments enterprise
2020-09-29 09:38:00 +03:00
TatianaLopaeva
09f8b3df6b Deleted unnecessary variable 2020-09-29 09:18:43 +03:00
TatianaLopaeva
ea2f5ec097 Merge branch 'feature/files' into feature/payments-enterprise 2020-09-29 09:06:16 +03:00
TatianaLopaeva
463bdc0ec8 Refactoring buttonContainer and index 2020-09-29 09:05:02 +03:00
Alexey Kostenko
d7ce84f7a2 web: components: bump version 2020-09-29 08:14:43 +03:00
Alexey Kostenko
d29e743a2b Web: Components: Changed animation of toast notifications, fixed styles for mobile devices 2020-09-29 08:14:29 +03:00
Ilya Oleshko
ac9262f4c9 Web: Files : Fixed editor url, always last 2020-09-28 17:46:27 +03:00
Ilya Oleshko
9933b768d0 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-28 17:23:32 +03:00
Ilya Oleshko
e4764828f3 Web: Files: Editor : Fixed frame height for tablet 2020-09-28 17:23:11 +03:00
TatianaLopaeva
fbc9e7a354 Merge branch 'feature/files' into feature/payments-enterprise 2020-09-28 16:22:49 +03:00
Artem Tarasov
bb905602de Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-28 16:19:47 +03:00
b05bbc236a Files: fix openedit 2020-09-28 16:04:57 +03:00
TatianaLopaeva
eaa24436db Merge branch 'feature/files' into feature/payments-enterprise 2020-09-28 16:04:54 +03:00
TatianaLopaeva
a09953ff73 Refactoring and added Trans from "react-i18next" 2020-09-28 16:03:43 +03:00
a4cbb9f386 Files: fix openedit 2020-09-28 15:45:26 +03:00
9f48311b4b Files: fix openedit 2020-09-28 15:13:30 +03:00
Ilya Oleshko
dea73cfbad web: common: bump version 2020-09-28 14:48:45 +03:00
Ilya Oleshko
61655a5790 Web: Files: App : Fixed initial requests, removed fetchMyFolder 2020-09-28 14:48:25 +03:00
Ilya Oleshko
be3a505035 Web: Common: Api : Files : Fixed request for folder tree, now request only folders 2020-09-28 14:47:20 +03:00
Artem Tarasov
01eae38cec Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-28 13:48:44 +03:00
c593620865 Files: fix count 2020-09-28 13:41:48 +03:00
Artem Tarasov
6e832d47c2 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-28 13:10:23 +03:00
Artem Tarasov
5426089bdb Web: Client: refactoring translate Wizard 2020-09-28 13:09:34 +03:00
Artem Tarasov
1328eec01b Web: Files: refactoring translate SettingsTree 2020-09-28 12:55:59 +03:00
Ilya Oleshko
ecd18e2a13 Web: Files: Editor : Fixed frame height for tablet 2020-09-28 12:47:12 +03:00
2c1d473314 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
2020-09-28 12:29:33 +03:00
TatianaLopaeva
8139997ada Refactoring headerContainer 2020-09-28 12:07:18 +03:00
3c70fba291 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-28 11:54:13 +03:00
Alexey Kostenko
c8b88c507f Web: People: Updated toast notifications 2020-09-28 11:48:35 +03:00
TatianaLopaeva
26efa35a32 Refactoring translation 2020-09-28 11:35:53 +03:00
Alexey Kostenko
99026e36be Web: Files: Updated toast notifications 2020-09-28 11:34:52 +03:00
0dbae1adfd Merge branch 'master' into feature/files 2020-09-28 11:32:13 +03:00
9e83a391e4
Merge pull request #83 from ONLYOFFICE/feature/release-11.0.0
Feature/release 11.0.0
2020-09-28 11:18:18 +03:00
TatianaLopaeva
e51c65d0b7 Refactoring to variables condition 2020-09-28 10:19:08 +03:00