Commit Graph

11935 Commits

Author SHA1 Message Date
80aeb705ce Web: Files: fixed selection of files with the same id 2021-04-14 09:48:02 +03:00
TatianaLopaeva
39064cf4e2 Web: Settings: Added cancel and save button. 2021-04-13 22:51:43 +03:00
ad534bbc2f ResManager: fix 2021-04-13 22:49:43 +03:00
TatianaLopaeva
a599b70c96 Web: Added name of current template. 2021-04-13 21:43:23 +03:00
3600151c4f ResManager: fix 2021-04-13 21:19:48 +03:00
a30915f618 Settings: post and put customschemas 2021-04-13 21:11:38 +03:00
783a5f2b37 Merge branch 'feature/team-template' of github.com:ONLYOFFICE/AppServer into feature/team-template 2021-04-13 20:10:32 +03:00
0df4b998d1 Api: removed SchemaItemModel 2021-04-13 20:10:14 +03:00
Ilya Oleshko
81ec061632 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2021-04-13 17:30:34 +03:00
Ilya Oleshko
ab6dc4b690
Merge pull request #222 from ONLYOFFICE/feature/react-selectable
Feature/react selectable
2021-04-13 17:21:54 +03:00
4b5c73b3e7 Web: fixed input user-select 2021-04-13 17:05:23 +03:00
262bb10857 Merge branch 'develop' into feature/products 2021-04-13 15:48:45 +03:00
a321619c98 Web: fixed input select 2021-04-13 15:18:33 +03:00
TatianaLopaeva
ff370259e9 Web: Added "learn more and help url for common setting. 2021-04-13 14:47:46 +03:00
TatianaLopaeva
3487e40c51 Web: Settings: Added logic for team template, added getCustomSchema. 2021-04-13 14:34:04 +03:00
TatianaLopaeva
73d113e26f Wen: Settings: Added translation. 2021-04-13 14:28:36 +03:00
cfd58847f9 Merge branch 'develop' into feature/react-selectable 2021-04-13 14:11:20 +03:00
c324404767 Web: fixed firefox frame 2021-04-13 14:07:44 +03:00
176a46de65 Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop 2021-04-13 13:15:50 +03:00
7c412aa42a Merge branch 'master' into develop 2021-04-13 13:15:36 +03:00
Alexey Kostenko
e99f66267f Style fix 2021-04-13 13:15:30 +03:00
0a8c9cf10d
Merge pull request #221 from ONLYOFFICE/hotfix/0.1.5
Files: fixed root query
2021-04-13 13:08:23 +03:00
c7017920e8 Web: fixed selection for mobile devices 2021-04-13 12:56:03 +03:00
5daf690ffb Web: fixed selection 2021-04-13 12:49:37 +03:00
9b3d0b8d39 Files: fixed root query 2021-04-13 12:46:25 +03:00
5936640ce2 Web: fixed selection 2021-04-13 12:43:17 +03:00
Alexey Kostenko
571b412d27 Web: Client/Components: Fixed facebook button styles/icon, fixed translations 2021-04-13 11:17:39 +03:00
Alexey Kostenko
544a24d0f1 Web: Client/Components: Style fix and added translations 2021-04-13 09:45:52 +03:00
8cfd5eb644 Web: Added SelectedFrame 2021-04-13 09:35:07 +03:00
Ilya Oleshko
8e61b6e104 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2021-04-13 09:01:55 +03:00
Alexey Kostenko
64ccdf81ae Web: Client: Added oAuth to create user form 2021-04-12 18:14:39 +03:00
Ilya Oleshko
f93dd3547b Merge branch 'bugfix/v0.1.2' into develop 2021-04-12 17:49:52 +03:00
830beacf9d
Merge pull request #220 from ONLYOFFICE/bugfix/v0.1.2
Bugfix/v0.1.2
2021-04-12 17:47:55 +03:00
TatianaLopaeva
3b94348cf5 Web: Settings: Fixed translation. 2021-04-12 15:59:20 +03:00
TatianaLopaeva
8c7ec5d0d0 Web: Settings: Added team template to the settings tree. 2021-04-12 14:34:08 +03:00
6fbb566c4e Web: Init Mail/Calendar Comming Soon pages 2021-04-12 13:41:16 +03:00
Ilya Oleshko
57a878df50 Merge branch 'develop' into bugfix/v0.1.2 2021-04-12 12:56:23 +03:00
TatianaLopaeva
91bd2c8c74 Web: Settings: Added team-template page. 2021-04-12 12:56:08 +03:00
2c89dd483b
Merge pull request #216 from ONLYOFFICE/bugfix/files-panel
Bugfix/files panel
2021-04-12 12:32:07 +03:00
2c0dd28ad4
Merge branch 'develop' into bugfix/files-panel 2021-04-12 12:09:33 +03:00
Ilya Oleshko
12255e771f Merge branch 'develop' into bugfix/v0.1.2 2021-04-12 11:42:34 +03:00
Alexey Kostenko
cf7072a714 Refactoring 2021-04-12 10:57:21 +03:00
Alexey Kostenko
6f3c3d6c2a Web: People: Fixed facebook social button style 2021-04-12 10:36:37 +03:00
4d644aff17 Merge branch 'master' into develop 2021-04-12 10:34:56 +03:00
Alexey Kostenko
0e4e7debac Web: Login: Show facebook button first 2021-04-12 10:26:46 +03:00
TatianaLopaeva
ed1dcfa4a4 Merge branch 'bugfix/v0.1.2' of github.com:ONLYOFFICE/AppServer into bugfix/v0.1.2 2021-04-09 17:49:51 +03:00
TatianaLopaeva
7073d0cd61 Web: Files: Fixed upload files. 2021-04-09 17:39:11 +03:00
9bb02d2d72
Merge pull request #219 from ONLYOFFICE/hotfix/v0.1.4
Fix version mismach
2021-04-09 16:31:59 +03:00
be66f17d92
Fix version mismach 2021-04-09 16:29:45 +03:00
Alexey Kostenko
6a6e4c4705 Web: Login: Added translations 2021-04-09 16:01:04 +03:00