IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,809 Commits 40 Branches 22 Tags 420 MiB
a21d40ca87
Commit Graph

11809 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexey Kostenko
a21d40ca87 ThirdParty: Handling error 2021-04-22 14:45:33 +03:00
Alexey Kostenko
667a76b95f Oauth: Refactoring 2021-04-22 13:34:42 +03:00
Ilya Oleshko
c02656d200 Web: Files: Dialog: Fixed setting token data for oAuth providers for ThriParty page 2021-04-22 12:50:16 +03:00
Alexey Kostenko
138fe92f9f OAuth: Refactoring 2021-04-21 16:31:18 +03:00
Alexey Kostenko
71baafe682 Reverted kafka config 2021-04-21 16:08:24 +03:00
Alexey Kostenko
6f2a726210 Web: Files: Close the window after getting the code 2021-04-21 16:02:52 +03:00
Alexey Kostenko
691e7d5498 Merge branch 'develop' into feature/oauth2.0 2021-04-21 15:04:26 +03:00
Alexey Kostenko
1aae2e60cf Web: Client/Login: Removed 2nd window for actions through oAuth 2021-04-21 14:48:17 +03:00
Alexey Safronov
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
AlexeySafronov
bd495757cc Merge branch 'master' into develop 2021-04-19 18:52:56 +03:00
AlexeySafronov
36c65c1c43 Bump version v0.1.6 2021-04-19 18:41:27 +03:00
AlexeySafronov
0b0dbb971f Web: Settings: Fix enabledJoin setup 2021-04-19 18:39:00 +03:00
Alexey Safronov
ab1aaa1e59
Merge pull request #228 from ONLYOFFICE/bugfix/v0.1.6 
Bugfix/v0.1.6
 2021-04-19 18:34:42 +03:00
Alexey Safronov
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
gopienkonikita
3734027f4f Web: Files: fixed newItem styles 2021-04-19 14:16:42 +03:00
gopienkonikita
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
gopienkonikita
9b6e4ace8b Web: Files: fixed badge for tree menu 2021-04-19 14:08:40 +03:00
AlexeySafronov
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
gopienkonikita
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
gopienkonikita
ce48583873 Web: Files: fixed row content mobile click 2021-04-19 10:26:24 +03:00
Alexey Kostenko
2749df79df Web: Client: Redirect to default page after OAuth registration 2021-04-19 10:19:27 +03:00
Alexey Kostenko
c45cfe87a1 Merge branch 'feature/oauth2.0' of github.com:ONLYOFFICE/AppServer into feature/oauth2.0 2021-04-19 09:50:05 +03:00
Alexey Kostenko
d9860256ec Web: Common/Components: FacebookButton style fix 2021-04-19 09:49:47 +03:00
Alexey Kostenko
03ec607cbf Merge branch 'develop' into feature/oauth2.0 2021-04-19 08:25:42 +03:00
Alexey Bannov
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
pavelbannov
4b756843ca Tfa: validate confirm link 2021-04-16 21:54:53 +03:00
pavelbannov
4917131ccc People: fixed signup 2021-04-16 21:50:50 +03:00
AlexeySafronov
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
Alexey Bannov
5f2998af87 refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile 2021-04-16 19:33:26 +03:00
pavelbannov
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
AlexeySafronov
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
AlexeySafronov
ee76d58ee8 Web: People|Files: Added timeout for 500 ms on setup "isLoading" flag (for quickly responses) 2021-04-16 16:37:22 +03:00