Commit Graph

9097 Commits

Author SHA1 Message Date
47fb514642 Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings
# Conflicts:
#	products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
2020-12-08 13:12:22 +03:00
f0d2e61f68 Web: Files: Refactoring 2020-12-08 13:11:19 +03:00
Alexey Kostenko
6a9b8ca662 Merge branch 'develop' into bugfix/sharing-settings 2020-12-08 12:23:36 +03:00
Alexey Kostenko
60cc94c06d Web: Files: SharingPanel: Refactoring 2020-12-08 11:08:38 +03:00
Viktor Fomin
e1947368bf Web: Files: fixed filter closing 2020-12-07 21:42:22 +03:00
Viktor Fomin
39e5119080 Web: Files: fixed filter closing 2020-12-07 21:16:53 +03:00
Viktor Fomin
b1088ad547 Merge branch 'feature/floating-button' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-12-07 21:03:36 +03:00
Viktor Fomin
d9e95dabab Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-12-07 21:03:07 +03:00
Viktor Fomin
c2e133553a Web: Files: fixed filter closing 2020-12-07 21:02:27 +03:00
6847c21ae6
Merge pull request #147 from ONLYOFFICE/bugfix/wrong-import
Bugfix/wrong import
2020-12-07 20:58:48 +03:00
a60bbc97f4
Merge branch 'develop' into bugfix/wrong-import 2020-12-07 20:40:08 +03:00
Viktor Fomin
adf8c30470
Merge branch 'develop' into feature/floating-button 2020-12-07 20:22:20 +03:00
Viktor Fomin
70086c5cb7 Merge branch 'feature/floating-button' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-12-07 20:21:06 +03:00
c48b5783f1 People: search ignore case 2020-12-07 19:56:59 +03:00
TatianaLopaeva
47653a2999 web: common: bump version 2020-12-07 19:02:21 +03:00
TatianaLopaeva
f2a3355ae8 Web: Common: Changed import for selector getLanguage 2020-12-07 19:01:10 +03:00
Viktor Fomin
342a02d9b4 Web: Files: fixed filter closing 2020-12-07 18:52:22 +03:00
Alexey Kostenko
ac5b23f23a Web: Files: Fixed determining the file format 2020-12-07 18:07:45 +03:00
Alexey Kostenko
10183ff90b Web: Files: Style fix, small refactoring 2020-12-07 16:58:02 +03:00
Alexey Kostenko
eb4f5c2085 Web: Files: Removed link highlighting on click 2020-12-07 15:36:50 +03:00
Viktor Fomin
982ce4e12c
Merge branch 'develop' into feature/floating-button 2020-12-07 14:50:49 +03:00
Viktor Fomin
2be2085655 Update yarn.lock files 2020-12-07 14:48:09 +03:00
Viktor Fomin
04a009543d Web: Common: fixed folder id 2020-12-07 14:43:00 +03:00
Alexey Kostenko
bc8efccf1b Web: Files: SharingPanel: Style fix 2020-12-07 14:34:41 +03:00
Alexey Kostenko
d873db91ca web: common: bump version 2020-12-07 14:13:31 +03:00
Alexey Kostenko
b1373ddef7 web: components: bump version 2020-12-07 14:13:21 +03:00
Alexey Kostenko
98e1d94ea7 Web: Files: Fixed header style 2020-12-07 13:52:57 +03:00
Alexey Kostenko
149adcc372 Merge branch 'develop' into bugfix/sharing-settings 2020-12-07 13:44:42 +03:00
dbc30ff4ce
Merge pull request #145 from ONLYOFFICE/bugfix/login-fix
Bugfix/login fix
2020-12-07 13:42:42 +03:00
a2f1bada5e
Merge branch 'develop' into bugfix/login-fix 2020-12-07 13:26:55 +03:00
Viktor Fomin
f8dcb6c59e Web: Files: fixed uploading files, added refresh files 2020-12-07 13:20:07 +03:00
Viktor Fomin
b693cbdd4f Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-12-07 13:19:32 +03:00
Ilya Oleshko
4147d2f31a Web: Fixed temp loaders 2020-12-07 11:11:04 +03:00
9b559a6df0 Files: fix get share info 2020-12-07 11:02:37 +03:00
Alexey Kostenko
4264345556 Web: Files: Fixed styles in EmbeddingPanel 2020-12-07 10:40:59 +03:00
Alexey Kostenko
3c2c0140c4 Web: Components: Added prop "color" to TextArea component 2020-12-07 10:40:18 +03:00
Ilya Oleshko
830fbfb6a3 web: common: bump version 2020-12-07 09:52:39 +03:00
Ilya Oleshko
049f7971f1 web: components: bump version 2020-12-07 09:52:29 +03:00
Ilya Oleshko
83466bd638 Merge branch 'develop' into bugfix/login-fix 2020-12-07 09:52:04 +03:00
Ilya Oleshko
cd100eba85 Web: Client: Fixed redirect after actions 2020-12-07 09:43:40 +03:00
Alexey Kostenko
b822342387 Web: Files: SharingPanel: Fixed clickable area in combo button in peopleSelector/groupSelector 2020-12-07 09:33:16 +03:00
2baf8cbc76 Fixed confirm link user creation 2020-12-04 17:15:00 +03:00
Alexey Kostenko
744898d94d Web: Files: Style fix 2020-12-04 16:54:13 +03:00
c764812d3a Common: refactoring 2020-12-04 16:48:54 +03:00
Alexey Kostenko
e6483213d5 Web: Files: Removed dropdown in internal link icon, style fix 2020-12-04 15:56:39 +03:00
0784453daf Fix errors on login and logout 2020-12-04 14:21:51 +03:00
Alexey Kostenko
ab71a6dd33 Web: Files/Common: Refactoring, changing access type to external share link 2020-12-04 14:09:31 +03:00
d39c2524c3 Files: refactoring 2020-12-04 13:52:07 +03:00
Ilya Oleshko
c32fc83399 Web: Client: Fixed property name, added missing property 2020-12-04 11:58:15 +03:00
Ilya Oleshko
d03584fcdd Web: Fixed isAuthenticated logic 2020-12-04 11:38:15 +03:00