Commit Graph

11763 Commits

Author SHA1 Message Date
3782ea4bc3 Applied last changes in Mail/Calendar ComingSoon pages 2021-04-21 22:03:49 +03:00
1516fe0249 Merge branch 'develop' into feature/products 2021-04-21 21:49:39 +03:00
6a4fed2d2c Init Calendar Server back-end 2021-04-21 21:47:27 +03:00
d57433c9dc Added MailServer.bat 2021-04-21 21:46:59 +03:00
090154ae59 Server: Mail: Fix applying launchSettings.json 2021-04-21 21:46:33 +03:00
63a8caeb97 Init Mail Server back-end 2021-04-21 19:00:38 +03:00
01b9f71d3b
Merge pull request #224 from ONLYOFFICE/feature/team-template
Feature/team template
2021-04-20 13:50:53 +03:00
TatianaLopaeva
0f3eb1350b Merge branch 'develop' into feature/team-template
# Conflicts:
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
2021-04-20 12:05:19 +03:00
TatianaLopaeva
ce20ae3de2 Web: Fixed tabIndex. 2021-04-20 11:55:14 +03:00
Ilya Oleshko
94e5eceabb
Merge pull request #225 from ONLYOFFICE/feature/access-rights-new
Feature/access rights new
2021-04-19 19:12:46 +03:00
Ilya Oleshko
7adfe3112f Merge branch 'feature/access-rights-new' of github.com:ONLYOFFICE/AppServer into feature/access-rights-new 2021-04-19 18:54:12 +03:00
Ilya Oleshko
b8910edc01 Merge branch 'develop' into feature/access-rights-new 2021-04-19 18:53:55 +03:00
Ilya Oleshko
434ce42f5f Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2021-04-19 18:53:32 +03:00
bd495757cc Merge branch 'master' into develop 2021-04-19 18:52:56 +03:00
36c65c1c43 Bump version v0.1.6 2021-04-19 18:41:27 +03:00
0b0dbb971f Web: Settings: Fix enabledJoin setup 2021-04-19 18:39:00 +03:00
ab1aaa1e59
Merge pull request #228 from ONLYOFFICE/bugfix/v0.1.6
Bugfix/v0.1.6
2021-04-19 18:34:42 +03:00
6c8654ba77
Merge branch 'develop' into feature/team-template 2021-04-19 16:47:52 +03:00
TatianaLopaeva
224bee68b4 Web: Settings: Added tabIndex. 2021-04-19 16:46:15 +03:00
Alexey Kostenko
1627490b05 Merge branch 'develop' into feature/access-rights-new 2021-04-19 16:21:38 +03:00
Alexey Kostenko
6bb13d77c8 Web: Client: Fixed HelpButton on mobile devices 2021-04-19 16:21:02 +03:00
Alexey Kostenko
49c2496391 Web: Client: Fixed translation in PeopleSelector, small refactoring 2021-04-19 16:12:34 +03:00
Ilya Oleshko
175cee8b86 Web: Empty: Fixed displaying translation keys on loading 2021-04-19 15:41:27 +03:00
Ilya Oleshko
fbf69d2bdf Web: Files: Home: Fixed displaying content if translation loading 2021-04-19 15:40:28 +03:00
3734027f4f Web: Files: fixed newItem styles 2021-04-19 14:16:42 +03:00
c48060aadb Merge branch 'bugfix/v0.1.6' of https://github.com/ONLYOFFICE/AppServer into bugfix/v0.1.6 2021-04-19 14:08:55 +03:00
9b6e4ace8b Web: Files: fixed badge for tree menu 2021-04-19 14:08:40 +03:00
461110e1a7 Web: Fix show loaders timeout for quickly responses 2021-04-19 13:36:40 +03:00
TatianaLopaeva
2a3d50cfd5 Web: Settings: Fixed position of buttons for desktop. 2021-04-19 12:30:54 +03:00
3037c23e55 Merge branch 'bugfix/v0.1.6' of https://github.com/ONLYOFFICE/AppServer into bugfix/v0.1.6 2021-04-19 10:26:33 +03:00
ce48583873 Web: Files: fixed row content mobile click 2021-04-19 10:26:24 +03:00
2a6a556a38
Merge pull request #226 from ONLYOFFICE/feature/dotnet-core-debugging-with-WSL-2
Feature/dotnet core debugging with wsl 2
2021-04-17 11:36:14 +03:00
Ilya Oleshko
64fae284ee Web: Projects: Fixed style for mobile and tablet devices, fixed description, disabled learn more button 2021-04-16 22:12:41 +03:00
Ilya Oleshko
c083473d5a Web: CRM: Fixed style for mobile and tablet devices, fixed description, disabled learn more button 2021-04-16 22:12:25 +03:00
4b756843ca Tfa: validate confirm link 2021-04-16 21:54:53 +03:00
e586d42d3b Web: Added clickBackdrop() for close unpinned Article on Tablet and Mobile 2021-04-16 20:23:08 +03:00
Ilya Oleshko
e9890ba711 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2021-04-16 19:49:46 +03:00
5f2998af87 refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile 2021-04-16 19:33:26 +03:00
995579ac8b People: change number method 2021-04-16 18:32:31 +03:00
Alexey Kostenko
49fd31c19b Web: Client: Style fix 2021-04-16 18:22:04 +03:00
TatianaLopaeva
ab10641b45 Web: Rename teamTemplate. 2021-04-16 17:10:37 +03:00
ca876c4349 Merge branch 'bugfix/v0.1.6' of https://github.com/ONLYOFFICE/AppServer into bugfix/v0.1.6 2021-04-16 16:37:30 +03:00
ee76d58ee8 Web: People|Files: Added timeout for 500 ms on setup "isLoading" flag (for quickly responses) 2021-04-16 16:37:22 +03:00
Vladislav Makhov
a05d5218ab web: files: hid filter block, if no items in current dir 2021-04-16 16:31:26 +03:00
7cb9affc77 Web: Remove tap-highlight 2021-04-16 16:27:07 +03:00
3aae413e12 replace Path.Combine to CrossPlatform.PathCombine 2021-04-16 16:26:26 +03:00
Vladislav Makhov
d9179337e8 Merge branch 'bugfix/v0.1.6' of github.com:ONLYOFFICE/AppServer into bugfix/v0.1.6 2021-04-16 16:22:39 +03:00
Vladislav Makhov
4a82ab2355 web: files: fix translation view in filter block, after second visit module 2021-04-16 16:22:23 +03:00
7062c713ad Merge branch 'bugfix/v0.1.6' of https://github.com/ONLYOFFICE/AppServer into bugfix/v0.1.6 2021-04-16 16:05:01 +03:00
a289256846 Web: Files: added ConflictResolveDialog, refactoring files operations 2021-04-16 16:04:50 +03:00