Commit Graph

6845 Commits

Author SHA1 Message Date
TatianaLopaeva
af9457df7a Changed logic of date 2020-08-31 15:15:33 +03:00
TatianaLopaeva
93e4f42e19 Rename visible of modal-dialog-container 2020-08-28 18:25:09 +03:00
TatianaLopaeva
611a58b7df Added changed language to end data of license 2020-08-28 18:19:16 +03:00
TatianaLopaeva
d3dde62de3 Changed max-width for mobile, changed api for UploadLicense, added path into App 2020-08-28 11:46:39 +03:00
TatianaLopaeva
2022bd4ac1 Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
#	web/ASC.Web.Components/src/components/icons/svg/index.js
2020-08-28 10:57:59 +03:00
TatianaLopaeva
54464c3320 Changed margin-top at header-container 2020-08-28 10:51:22 +03:00
TatianaLopaeva
6816ebc6cb Rename at index and modal-dialog-container 2020-08-28 10:50:38 +03:00
TatianaLopaeva
9bac1c0639 Added headline for payments and some translations 2020-08-28 10:49:18 +03:00
TatianaLopaeva
4fb43397d7 Added translation for payments in StudioLayoute 2020-08-28 10:48:45 +03:00
TatianaLopaeva
ca776849a1 Rename and changed store for payments 2020-08-28 10:47:38 +03:00
TatianaLopaeva
8bea385182 Added a link and icon for payments in StudioLayout 2020-08-28 10:46:37 +03:00
TatianaLopaeva
da91e178d4 Added a link to payments and icon to sidebar 2020-08-28 10:45:56 +03:00
TatianaLopaeva
a65e06f847 Delete commit at index.js 2020-08-28 10:44:03 +03:00
TatianaLopaeva
35d35af498 Added translation and style for modal-dailog-container 2020-08-28 10:43:27 +03:00
TatianaLopaeva
ca90e4b6c2 Update index.js as a class, button-container and added modal-dialog container 2020-08-28 10:41:48 +03:00
TatianaLopaeva
5561348cdf Rename click events 2020-08-28 10:41:00 +03:00
TatianaLopaeva
0e9e39387f Update files with files upload, input was hidden, some changed in reducer 2020-08-28 10:39:49 +03:00
TatianaLopaeva
58054d1d91 Added setLiscense, some translations and changed action for payments 2020-08-28 10:39:12 +03:00
TatianaLopaeva
07f9344496 Changed styles by figma 2020-08-28 10:37:49 +03:00
TatianaLopaeva
3a756ed4e9 Added division into Enterprise and SaaS, added reducer for payments 2020-08-28 10:36:26 +03:00
TatianaLopaeva
792f2368ce Changed images and rename them 2020-08-28 10:33:59 +03:00
TatianaLopaeva
745f3ed131 Added adaptation for mobile 2020-08-28 10:32:25 +03:00
TatianaLopaeva
251c222c24 Update files with containers and added adaptation for tablet 2020-08-28 10:28:23 +03:00
TatianaLopaeva
9fff932736 Changed App and images from png into svg, added action and reducer for payments 2020-08-28 10:26:39 +03:00
TatianaLopaeva
47e0b43485 Added state and propTypes 2020-08-28 09:48:44 +03:00
17c4cf02fc Merge branch 'master' into feature/files 2020-08-27 18:06:05 +03:00
be5abb8cd3 Files: added settings methods 2020-08-27 18:05:21 +03:00
Artem Tarasov
551d171ac1 added error403 to Settings, when thirdParty is disabled 2020-08-27 18:00:20 +03:00
Artem Tarasov
00337a45ed web: common: bump version 2020-08-27 13:36:21 +03:00
Artem Tarasov
20cefbf1e4 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-27 13:35:29 +03:00
Artem Tarasov
2b36634f96 added Error403 2020-08-27 13:33:06 +03:00
955d1c4db6 Merge branch 'master' into feature/files 2020-08-27 12:07:08 +03:00
be32dfb86a Docker: fix publish 2020-08-27 12:06:21 +03:00
5633d2467b Merge branch 'master' into feature/files 2020-08-27 10:42:47 +03:00
Artem Tarasov
69a54a0717 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-27 10:39:54 +03:00
Artem Tarasov
84d4446b23 added api methods for settings, refactoring 2020-08-27 10:38:46 +03:00
13cef58770 Settings: auth. Translate 2020-08-26 19:13:41 +03:00
33f4bdca92
Merge pull request #73 from ONLYOFFICE/feature/auth-keys
Settings: authservice api
2020-08-26 17:55:41 +03:00
952e0f40c7 Settings: authservice api 2020-08-26 17:34:21 +03:00
e1dbf344c7 Web: Files: fixed logout to files module 2020-08-26 16:26:38 +03:00
7fa6111cc3 Web: Files: fixed DragAndDrop 2020-08-26 15:21:22 +03:00
Artem Tarasov
95d5414718 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-26 13:55:49 +03:00
Artem Tarasov
872d0dae0d Fixed MainButton accessibility when going to Settings 2020-08-26 13:55:04 +03:00
3fce8d1027 Web: Files: fixed row click on mobile 2020-08-26 13:36:30 +03:00
65149259a9 web: components: bump version 2020-08-26 13:14:58 +03:00
0178acb2f0 Web: Components: fixed drag-and-drop styles 2020-08-26 13:14:36 +03:00
0c518770d9 web: common: bump version 2020-08-26 11:35:50 +03:00
0996222642 web: components: bump version 2020-08-26 11:35:38 +03:00
82af63f80d Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-26 11:35:19 +03:00
78e62b36fc Web: Files: removed custom dropzone function, refactoring 2020-08-26 11:35:12 +03:00