Artem Tarasov
|
797dd6c249
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-07 18:27:39 +03:00 |
|
Artem Tarasov
|
6d68dfd0c6
|
added redirect from / to homepage(settings in state.auth.settings.homepage)
|
2020-09-07 18:26:44 +03:00 |
|
|
|
886c7d6464
|
Merge branch 'master' into feature/files
|
2020-09-07 18:16:33 +03:00 |
|
|
|
98c20197fd
|
web: components: bump version
|
2020-09-07 18:12:13 +03:00 |
|
|
|
58d2db1d97
|
Web: Components: fixed text-input disable color
|
2020-09-07 18:10:40 +03:00 |
|
|
|
9899880bff
|
web: common: bump version
|
2020-09-07 17:32:02 +03:00 |
|
|
|
d9783ecf26
|
Web: Common: fixed sort-combobox styles, added isMobile prop
|
2020-09-07 17:31:36 +03:00 |
|
|
|
96df0ab8ca
|
Api: added payment settings
|
2020-09-07 16:53:39 +03:00 |
|
SuhorukovAnton
|
80198032a4
|
scope: refactoring
|
2020-09-07 15:01:15 +03:00 |
|
TatianaLopaeva
|
e802727b1b
|
Changed style for buttons
|
2020-09-07 14:46:58 +03:00 |
|
TatianaLopaeva
|
ca16bff3d0
|
Deleted text about Created Portals
|
2020-09-07 14:34:51 +03:00 |
|
TatianaLopaeva
|
5be50ebef9
|
Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
# web/ASC.Web.Common/src/api/client.js
|
2020-09-06 13:10:24 +03:00 |
|
TatianaLopaeva
|
71fee5aab4
|
Added id for FileInput
|
2020-09-06 13:04:33 +03:00 |
|
TatianaLopaeva
|
23666db461
|
Changed style for buttons, added logic for loading file when clicking a file, hidden FileInput
|
2020-09-06 12:49:37 +03:00 |
|
|
|
52104fafd6
|
Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
# web/ASC.Web.Common/src/api/client.js
|
2020-09-04 21:36:25 +03:00 |
|
|
|
a2f050590b
|
Update yarn.lock files
|
2020-09-04 21:04:05 +03:00 |
|
|
|
cf53c32ff4
|
web: common: bump version
|
2020-09-04 20:54:50 +03:00 |
|
|
|
31f19a0f96
|
Web: Client: Refactoring of initial requests calling
|
2020-09-04 20:37:53 +03:00 |
|
|
|
de41a366f6
|
Web: Client: Fixed layout in Wizard and removed useless constant
|
2020-09-04 20:34:00 +03:00 |
|
|
|
8907f8b315
|
Web: Common: API client: Added support of 402 and +500 statuses
|
2020-09-04 20:32:34 +03:00 |
|
|
|
ac8fa40c01
|
Web: Common: Added body text to Error520
|
2020-09-04 20:30:34 +03:00 |
|
|
|
22b7b8ff52
|
web: common: bump version
|
2020-09-04 15:57:06 +03:00 |
|
|
|
4fd7cffa63
|
Web: Common: fixed sort button
|
2020-09-04 15:56:49 +03:00 |
|
Ilya Oleshko
|
728b00ab93
|
web: common: bump version
|
2020-09-04 13:56:49 +03:00 |
|
Ilya Oleshko
|
4794084ef1
|
Web: Common: FilterInput : Fix default height for items
|
2020-09-04 13:56:37 +03:00 |
|
|
|
f9e1c7bc02
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-04 12:25:57 +03:00 |
|
TatianaLopaeva
|
eb8b6fce38
|
Changed the license upload notification: Added toastr and Deleted modal-dialog-container, Changed text of notification
|
2020-09-04 12:05:55 +03:00 |
|
Artem Tarasov
|
f4329a6ef9
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-04 11:36:41 +03:00 |
|
Artem Tarasov
|
a017814a62
|
fixed wizard render
|
2020-09-04 11:36:16 +03:00 |
|
|
|
f48574a809
|
Merge branch 'master' into feature/scope
|
2020-09-04 11:26:03 +03:00 |
|
|
|
4686122183
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-04 10:15:48 +03:00 |
|
TatianaLopaeva
|
c104ed287c
|
Delete debugger
|
2020-09-04 08:41:47 +03:00 |
|
|
|
cbace5e1b4
|
Merge branch 'master' into feature/files
|
2020-09-03 18:32:51 +03:00 |
|
|
|
82dd4a8828
|
Settings: fix timeZones for unix
|
2020-09-03 18:30:14 +03:00 |
|
|
|
db97b65727
|
Merge branch 'master' into feature/files
|
2020-09-03 17:40:26 +03:00 |
|
TatianaLopaeva
|
9b240a3539
|
Changed appsettings added window.location.href for 402
|
2020-09-03 17:01:59 +03:00 |
|
|
|
0f4877b541
|
AuthService: selectel instruction fix
|
2020-09-03 12:12:03 +03:00 |
|
|
|
4fc7427aed
|
AuthService: added description
|
2020-09-03 11:43:13 +03:00 |
|
|
|
db0539a8fa
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-02 18:02:59 +03:00 |
|
Artem Tarasov
|
bad94255f7
|
web: components: bump version
|
2020-09-02 18:05:25 +03:00 |
|
Artem Tarasov
|
72476521cd
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-02 18:03:27 +03:00 |
|
|
|
4ed48f06b4
|
Web: Client: Added forceBackend in createI18N
|
2020-09-02 18:02:42 +03:00 |
|
Artem Tarasov
|
70ea5261db
|
Changed layout of ToggleButton (fixed indent for caption)
|
2020-09-02 18:02:36 +03:00 |
|
|
|
3c11d95772
|
Web: Settings: Fixed crash on language undefined
|
2020-09-02 18:02:15 +03:00 |
|
TatianaLopaeva
|
2a56b6dda4
|
Changed text by figma
|
2020-09-02 16:52:13 +03:00 |
|
|
|
dc0940cca0
|
Web: Settings: Fixed TypeError: Cannot read property 'label' of undefined
|
2020-09-02 13:01:24 +03:00 |
|
|
|
0eb3b2b4d3
|
Update yarn.lock files
|
2020-09-02 12:30:53 +03:00 |
|
|
|
0b208d2fa2
|
web: common: bump version
|
2020-09-02 12:19:46 +03:00 |
|
|
|
da50146545
|
Web: Clients: Added useEffect for changeLanguage call if functional components (issue: Warning: Cannot update a component https://fb.me/setstate-in-render)
|
2020-09-02 12:19:21 +03:00 |
|
|
|
4babaa5e67
|
Web: People: Fixed work with customNames
|
2020-09-02 11:59:36 +03:00 |
|
|
|
6bf251bb8e
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-01 18:34:23 +03:00 |
|
|
|
0152274029
|
Web: Clients: Fixed workbox.expiration.Plugin is not a constructor
|
2020-09-01 18:34:06 +03:00 |
|
Artem Tarasov
|
f28406832b
|
web: common: bump version
|
2020-09-01 18:33:54 +03:00 |
|
Artem Tarasov
|
dfb32288e8
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-01 18:32:48 +03:00 |
|
|
|
00c6ce5e9b
|
Web: Clients: Added api-cache in service-worker for base info for 30 Minutes
|
2020-09-01 18:11:20 +03:00 |
|
|
|
bd6c0d0338
|
Web: Clients: Fixed windows is not defined
|
2020-09-01 18:09:39 +03:00 |
|
|
|
bc8613c4f6
|
Web: Clients: Uncommented self.skipWaiting() on install service-worker
|
2020-09-01 17:53:24 +03:00 |
|
Ilya Oleshko
|
bfee8e1365
|
web: components: bump version
|
2020-09-01 16:56:18 +03:00 |
|
Ilya Oleshko
|
3feccaaca7
|
Web: Components: Fixed ESLint validation
|
2020-09-01 16:55:28 +03:00 |
|
Ilya Oleshko
|
a15e1756d3
|
Web: Components: EmailInput, GroupButtonsMenu : Fixed ESLint validation for props
|
2020-09-01 16:28:35 +03:00 |
|
Ilya Oleshko
|
a2a2e6cda2
|
web: common: bump version
|
2020-09-01 16:07:15 +03:00 |
|
Ilya Oleshko
|
8edef50722
|
Web: Common: PageLayout : Fix ReactResizeDetector options for fast resize
|
2020-09-01 16:07:07 +03:00 |
|
Ilya Oleshko
|
8e04466542
|
web: common: bump version
|
2020-09-01 15:26:59 +03:00 |
|
Ilya Oleshko
|
d4db078349
|
web: components: bump version
|
2020-09-01 15:26:49 +03:00 |
|
Ilya Oleshko
|
4e663b9514
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-01 15:25:43 +03:00 |
|
Ilya Oleshko
|
f1902e1ec6
|
Web: Common: PageLayout : Added size calculating on first mount for ReactResizeDetector
|
2020-09-01 15:22:49 +03:00 |
|
Ilya Oleshko
|
1652513c73
|
Web: Components: RowContent : Added new property for more adaptive resize, fixed not work (ignore) styles
|
2020-09-01 15:20:55 +03:00 |
|
Ilya Oleshko
|
d8b0f60800
|
Web: Components: Row : Fixed refs, now it create inside constructor, add missing PropType
|
2020-09-01 15:17:59 +03:00 |
|
Ilya Oleshko
|
cdc370b04b
|
Web: Components: Utils : Size constants now imported like object of numbers
|
2020-09-01 15:15:43 +03:00 |
|
Artem Tarasov
|
f61799f1b4
|
added export Error520
|
2020-09-01 14:56:23 +03:00 |
|
TatianaLopaeva
|
6ee4cbc5b4
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-01 11:05:58 +03:00 |
|
TatianaLopaeva
|
319dbc1158
|
Added translation and text for trial period
|
2020-09-01 10:51:19 +03:00 |
|
TatianaLopaeva
|
29d2bfab61
|
Changed logic of trial
|
2020-09-01 10:35:15 +03:00 |
|
TatianaLopaeva
|
35a0cf98c0
|
Added logic of trial at header-container
|
2020-09-01 10:34:20 +03:00 |
|
Artem Tarasov
|
ba42cdcb71
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-01 10:16:53 +03:00 |
|
Artem Tarasov
|
d560610396
|
web: common: bump version
|
2020-09-01 10:15:27 +03:00 |
|
TatianaLopaeva
|
991cc488d7
|
Added information about trial at reducer
|
2020-09-01 09:11:30 +03:00 |
|
Artem Tarasov
|
461cb53b4e
|
added getFilesSettings
|
2020-09-01 01:05:28 +03:00 |
|
|
|
29d9f21d05
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# web/ASC.Web.Core/Files/DocumentService.cs
|
2020-08-31 17:45:57 +03:00 |
|
|
|
5f7265931c
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-31 17:45:52 +03:00 |
|
|
|
062a3a793f
|
Update yarn.lock files
|
2020-08-31 17:45:37 +03:00 |
|
|
|
fa6144919e
|
web: common: bump version
|
2020-08-31 17:36:05 +03:00 |
|
|
|
d16652f051
|
Web: Common: fixed login page for new PageLayout body
|
2020-08-31 17:35:39 +03:00 |
|
|
|
36e283fc5c
|
web: common: bump version
|
2020-08-31 16:34:56 +03:00 |
|
|
|
a14c7b447c
|
web: components: bump version
|
2020-08-31 16:34:28 +03:00 |
|
|
|
946ed771ac
|
Web: Components: fixed empty-screen-container to new article
|
2020-08-31 16:31:56 +03:00 |
|
TatianaLopaeva
|
e8751d21c0
|
Added information when support is no longer available
|
2020-08-31 15:40:42 +03:00 |
|
TatianaLopaeva
|
af9457df7a
|
Changed logic of date
|
2020-08-31 15:15:33 +03:00 |
|
|
|
2db018dcf6
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-08-31 13:52:34 +03:00 |
|
|
|
44aaf5267e
|
Web: Common: fixed section styles
|
2020-08-31 13:31:39 +03:00 |
|
|
|
d9f70df70a
|
Update yarn.lock files
|
2020-08-31 12:42:36 +03:00 |
|
|
|
67f2e3feb8
|
Web: Client: Added Webpack-bundle-analyzer
|
2020-08-31 11:43:26 +03:00 |
|
SuhorukovAnton
|
90f1c4fa3d
|
Merge branch 'master' into feature/scope
|
2020-08-31 11:29:44 +03:00 |
|
SuhorukovAnton
|
132a6b05ae
|
scope: add deconstructs
|
2020-08-31 11:18:07 +03:00 |
|
|
|
1fb90663ee
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-08-31 10:04:45 +03:00 |
|
|
|
927d7619a7
|
web: common: bump version
|
2020-08-31 10:04:24 +03:00 |
|
|
|
a4a9234328
|
Web: Common: added react-resize-detector package, fixed styles
|
2020-08-31 10:03:19 +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 |
|
Artem Tarasov
|
b859f35e5e
|
implemented access to admin settings by checking the value of the isAdmin property in state.auth.user.isAdmin. Added api methods
|
2020-08-28 12:13:53 +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 |
|
maksim
|
95299daaf9
|
ASC.Data.Storage.Migration: adding listener and extension
|
2020-08-27 17:06:03 +03:00 |
|
maksim
|
8282f3f658
|
fix
|
2020-08-27 17:01:37 +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 |
|
|
|
5633d2467b
|
Merge branch 'master' into feature/files
|
2020-08-27 10:42:47 +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 |
|
|
|
952e0f40c7
|
Settings: authservice api
|
2020-08-26 17:34:21 +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 |
|
|
|
60bf8d02f1
|
Web: Components: added react-dropzone library to drag-and-drop component
|
2020-08-26 11:34:01 +03:00 |
|
|
|
28dc9efd16
|
Web: Common: moved DragAndDrop component
|
2020-08-26 11:30:46 +03:00 |
|
|
|
b91d86340c
|
web: common: bump version
|
2020-08-25 16:28:35 +03:00 |
|
|
|
667b3f0032
|
web: common: Fixed Cannot update a component from inside the function body of a different component (issue: call of i18n.changeLanguage without useEffect)
|
2020-08-25 16:28:14 +03:00 |
|
|
|
9f3413841e
|
web: common: bump version
|
2020-08-25 14:09:32 +03:00 |
|
|
|
366821d868
|
Web: Common: fixed filter
|
2020-08-25 14:03:49 +03:00 |
|
Ilya Oleshko
|
46425cd159
|
web: common: bump version
|
2020-08-25 13:07:38 +03:00 |
|
Ilya Oleshko
|
a003d65f66
|
Web: People: FilterBlock : Fixed showItem condition for simple selector
|
2020-08-25 13:07:22 +03:00 |
|
SuhorukovAnton
|
055e787d63
|
scope: fix
|
2020-08-24 21:41:06 +03:00 |
|
SuhorukovAnton
|
c96620554d
|
Merge branch 'master' into feature/scope
|
2020-08-24 17:09:42 +03:00 |
|
|
|
ded117d37a
|
web: components: bump version
|
2020-08-24 11:21:57 +03:00 |
|
|
|
232da628f8
|
Web: Components: fixed tree styles, fixed main button styles
|
2020-08-24 11:20:40 +03:00 |
|
maksim
|
eb58c24d2e
|
LaunchSettings: fix
|
2020-08-24 10:45:51 +03:00 |
|
maksim
|
eecf23f214
|
ASC.Data.Storage.Migration: bugfix
|
2020-08-24 09:52:17 +03:00 |
|
|
|
e9b0775605
|
web: common: bump version
|
2020-08-21 17:38:38 +03:00 |
|
|
|
42927df84d
|
Web: Common: fixed selector selected group
|
2020-08-21 17:38:11 +03:00 |
|
|
|
b372705c3f
|
web: components: bump version
|
2020-08-21 16:20:15 +03:00 |
|
|
|
f29fad894f
|
web: common: bump version
|
2020-08-21 16:20:01 +03:00 |
|
|
|
fd587b7f6b
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-08-21 16:19:52 +03:00 |
|
|
|
7982449828
|
Web: Components: fixed the display of the context-menu-button
|
2020-08-21 16:19:09 +03:00 |
|
|
|
76d48fabdd
|
Web: Common: fixed the display and closing of the filter
|
2020-08-21 16:18:17 +03:00 |
|
maksim
|
280604e41d
|
ASC.Data.Storage.Migration: adding protocol buffers and event listening
|
2020-08-21 11:05:27 +03:00 |
|
|
|
fd5a9a74f0
|
Merge branch 'master' into feature/files
|
2020-08-20 17:51:14 +03:00 |
|
|
|
4501d3229a
|
Nuget: replaced thirdparty
|
2020-08-20 17:50:08 +03:00 |
|
|
|
c480404b22
|
web: components: bump version
|
2020-08-20 17:42:09 +03:00 |
|
|
|
28b6f56aee
|
web: common: bump version
|
2020-08-20 17:41:50 +03:00 |
|
|
|
603a8bbbc5
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-08-20 17:40:52 +03:00 |
|
|
|
2c17848368
|
Web: Components: fixed context menu displayType state
|
2020-08-20 17:40:35 +03:00 |
|
|
|
d58cdc3cc5
|
Web: Common: fixed selector styles
|
2020-08-20 17:39:57 +03:00 |
|
|
|
49f77646a5
|
web: common: bump version
|
2020-08-20 12:46:31 +03:00 |
|
|
|
9620f56594
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-08-20 12:46:06 +03:00 |
|
|
|
14abe9c3f4
|
Web: Common: fixed profile menu
|
2020-08-20 12:45:59 +03:00 |
|
|
|
22a2cd3e4b
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-20 12:43:27 +03:00 |
|
|
|
15ba6828c5
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
|
2020-08-20 12:43:12 +03:00 |
|
|
|
d5942241e8
|
Web: Clients: Parallelized initial API queries
|
2020-08-20 12:17:36 +03:00 |
|
|
|
05bc905831
|
Web: Clients: Fixed regex to transltaion.json files for serviceWorker
|
2020-08-19 21:18:23 +03:00 |
|
|
|
27f52a2dc2
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-19 20:00:57 +03:00 |
|
|
|
8d11e1b0c8
|
Web: Clients: Changed interaction with serviceWorker
|
2020-08-19 20:00:41 +03:00 |
|
|
|
b7b7cfeeb7
|
web: components: bump version
|
2020-08-19 17:45:26 +03:00 |
|
|
|
0f1ecd1ae2
|
Web: Components: update ContextMenuButton styles
|
2020-08-19 17:45:06 +03:00 |
|
Ilya Oleshko
|
c34ecd5ecb
|
web: components: bump version
|
2020-08-19 15:38:52 +03:00 |
|
Ilya Oleshko
|
53da5042f8
|
Web: Components: GroupButtonsMenu : Added orientationchange event listener
|
2020-08-19 15:38:46 +03:00 |
|
|
|
eb19b4ee38
|
web: common: bump version
|
2020-08-19 14:58:46 +03:00 |
|
|
|
d7b5444385
|
Web: Common: fixed selector styles
|
2020-08-19 14:58:23 +03:00 |
|
|
|
140c79ad16
|
web: common: bump version
|
2020-08-19 10:39:21 +03:00 |
|
|
|
257949735f
|
web: components: bump version
|
2020-08-19 10:39:08 +03:00 |
|
|
|
9b491cf1d8
|
Web: Common: added aside panel to context-menu-button
|
2020-08-19 10:37:52 +03:00 |
|
|
|
8617da3c50
|
Web: Components: added aside panel to context-menu-button
|
2020-08-19 10:36:27 +03:00 |
|
|
|
49ead142d0
|
web: common: bump version
|
2020-08-18 17:05:11 +03:00 |
|
|
|
2b37363939
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-08-18 17:04:01 +03:00 |
|
|
|
32f335ba50
|
Web: Common: added new styles
|
2020-08-18 17:02:20 +03:00 |
|
Ilya Oleshko
|
a23c6c3163
|
web: components: bump version
|
2020-08-18 14:46:08 +03:00 |
|
Ilya Oleshko
|
fc0fbec33e
|
Web: Components: GroupButtonsMenu : Fix tests
|
2020-08-18 14:46:00 +03:00 |
|
TatianaLopaeva
|
19ba763a44
|
added onClick
|
2020-08-18 14:11:34 +03:00 |
|
Ilya Oleshko
|
9703c2bec4
|
web: components: bump version
|
2020-08-18 13:20:17 +03:00 |
|
Ilya Oleshko
|
2a5db42e40
|
Web: Components: GroupButtonsMenu : Fix update menu with uncommon size
|
2020-08-18 13:20:06 +03:00 |
|
TatianaLopaeva
|
e359ed7e79
|
update props
|
2020-08-18 10:55:36 +03:00 |
|
|
|
6fc134f16b
|
web: common: bump version
|
2020-08-18 10:48:34 +03:00 |
|
|
|
ef34adb788
|
Web: Common: fixed Selector
|
2020-08-18 10:47:33 +03:00 |
|
TatianaLopaeva
|
684667d5de
|
en support
|
2020-08-18 10:32:06 +03:00 |
|
TatianaLopaeva
|
b1f31c5bae
|
en support
|
2020-08-18 10:31:22 +03:00 |
|
TatianaLopaeva
|
fecb7383dd
|
added styled for desktop
|
2020-08-18 08:49:35 +03:00 |
|
|
|
59f54e0cd5
|
web: common: bump version
|
2020-08-17 16:49:58 +03:00 |
|
|
|
ca0ba3a828
|
web: components: bump version
|
2020-08-17 16:49:44 +03:00 |
|
|
|
9fb1a37af3
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-08-17 16:49:05 +03:00 |
|
|
|
eb9592abd5
|
Web: Common: fixed selector styles, fixed filter styles
|
2020-08-17 16:45:14 +03:00 |
|
|
|
8dba11ac56
|
Web: Components: fixed scroll styles, fixed separator styles
|
2020-08-17 16:43:47 +03:00 |
|
|
|
5d5083f40b
|
web: common: bump version
|
2020-08-17 15:38:59 +03:00 |
|
|
|
d7920176e0
|
Web: Common: i18nBaseSettings: restored interpolation.format + turned on useSuspense
|
2020-08-17 15:38:53 +03:00 |
|
|
|
df96f4cd0a
|
web: common: bump version
|
2020-08-17 15:37:30 +03:00 |
|
|
|
08e27857d8
|
web: common: bump version
|
2020-08-17 14:44:08 +03:00 |
|
|
|
c16c9b280a
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-17 14:19:19 +03:00 |
|
|
|
5542e211df
|
Web Client: refactoring
|
2020-08-17 13:16:04 +03:00 |
|
Tatiana Lopaeva
|
271bfc1eb8
|
added payments
|
2020-08-17 12:20:24 +03:00 |
|
|
|
a1c4a8a9f5
|
Web Client: refactoring
|
2020-08-17 10:54:42 +03:00 |
|
SuhorukovAnton
|
faec4269db
|
Merge branch 'master' into feature/scope
|
2020-08-16 12:23:20 +03:00 |
|
|
|
fb44538e69
|
web: common: bump version
|
2020-08-14 22:35:30 +03:00 |
|
|
|
105ac1a577
|
Web Common: simplified configuration of i18n
|
2020-08-14 22:32:21 +03:00 |
|
|
|
c398eb8229
|
Web Client: simplified configuration of i18n (+ removed useless requests)
|
2020-08-14 22:14:42 +03:00 |
|
|
|
f00a964c32
|
Merge branch 'master' into feature/private
# Conflicts:
# common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2020-08-14 17:19:36 +03:00 |
|
|
|
91e3db56cb
|
web: common: bump version
|
2020-08-14 17:08:08 +03:00 |
|
|
|
a5bde0148c
|
web: components: bump version
|
2020-08-14 17:07:50 +03:00 |
|
|
|
129160c35e
|
Web: Common: fixed filter styles
|
2020-08-14 17:06:08 +03:00 |
|
|
|
487ea08bb5
|
Web: Components: fixed badge styles, added isFill prop to context-menu-button
|
2020-08-14 17:05:47 +03:00 |
|
|
|
34696bfc37
|
web: common: bump version
|
2020-08-14 13:02:56 +03:00 |
|
|
|
7bd1e7abe1
|
Web: Files: added version api
|
2020-08-14 13:02:23 +03:00 |
|
Alexey
|
7199e3f7ba
|
web: components: bump version
|
2020-08-14 09:35:13 +03:00 |
|
Alexey
|
9084bbb692
|
Web: Components: Added keyboard handling to SaveCancelButtons component
|
2020-08-14 09:35:07 +03:00 |
|
Alexey
|
8987b29192
|
Web: Components: Style fix
|
2020-08-14 09:21:35 +03:00 |
|
Alexey
|
a9627fd9ef
|
Web: Components: Added test and storybook to SaveCancelButtons component
|
2020-08-14 09:05:07 +03:00 |
|
Alexey
|
a0e989d82b
|
web: components: bump version
|
2020-08-14 08:29:23 +03:00 |
|
Alexey
|
fada82ae41
|
Web: Components: Fix rotate in avatar editor
|
2020-08-14 08:29:15 +03:00 |
|
|
|
59b5c5f951
|
Merge pull request #64 from ONLYOFFICE/feature/customization
Feature/customization
|
2020-08-13 18:42:59 +03:00 |
|
|
|
18e3ff6bc6
|
web: common: bump version
|
2020-08-13 14:42:57 +03:00 |
|
|
|
0626d82fa8
|
Web: Files: added unblock/check-in api
|
2020-08-13 14:42:29 +03:00 |
|
Alexey
|
58e73a9ffb
|
Web: Client: Settings: Refactoring
|
2020-08-13 14:21:59 +03:00 |
|
Alexey
|
cc0c852ae1
|
Web: Client: Settings: code formatting
|
2020-08-13 12:01:45 +03:00 |
|
Alexey
|
6d1a78922d
|
Web: Client: Settings: Refactoring
|
2020-08-13 11:11:03 +03:00 |
|
|
|
4891311488
|
Merge branch 'feature/files' into feature/customization
# Conflicts:
# web/ASC.Web.Components/src/components/icons/svg/index.js
|
2020-08-13 10:15:11 +03:00 |
|
|
|
5795c6f324
|
Merge branch 'feature/files' into feature/customization
# Conflicts:
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Components/src/index.js
|
2020-08-13 10:07:14 +03:00 |
|
|
|
3c32cf3f9f
|
web: components: bump version
|
2020-08-13 09:59:44 +03:00 |
|
|
|
b60dad90b8
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-08-13 09:59:13 +03:00 |
|
|
|
f0d2d42e97
|
Web: Components: added new icons
|
2020-08-13 09:57:21 +03:00 |
|
Ilya Oleshko
|
6f7ff8cee9
|
web: components: bump version
|
2020-08-12 18:23:46 +03:00 |
|
Ilya Oleshko
|
b005ae7c50
|
Web: Components: Fix missing import
|
2020-08-12 18:22:22 +03:00 |
|
Ilya Oleshko
|
37fe1cab21
|
Merge branch 'master' into feature/files
|
2020-08-12 18:05:29 +03:00 |
|
Artem Tarasov
|
1bd341fc33
|
fix translate
|
2020-08-12 17:17:14 +03:00 |
|
Artem Tarasov
|
c6d1198ae0
|
deleted console.log, simple condition
|
2020-08-12 16:38:34 +03:00 |
|
Artem Tarasov
|
4499d82de9
|
decomposition
|
2020-08-12 16:32:42 +03:00 |
|
Artem Tarasov
|
c301178a16
|
fixed translate
|
2020-08-12 16:32:17 +03:00 |
|
Alexey
|
512de9658e
|
web: common: bump version
|
2020-08-12 16:11:37 +03:00 |
|
Alexey
|
73d1cf269b
|
Web: Common: Added keyboard events to MediaViewer
|
2020-08-12 16:11:30 +03:00 |
|
Artem Tarasov
|
171ae1b147
|
web: common: bump version
|
2020-08-12 14:57:41 +03:00 |
|
Artem Tarasov
|
00fcc549e5
|
web: components: bump version
|
2020-08-12 14:57:24 +03:00 |
|
