gectokot
|
dc621dac89
|
Web: Studio: Homepage: Added SVG illustration
|
2021-12-08 15:04:14 +03:00 |
|
|
20a17fca96
|
rename pt
|
2021-12-07 16:50:09 +03:00 |
|
|
f9c92a6bd7
|
edit pt_PT
|
2021-12-07 12:40:49 +03:00 |
|
|
7973639195
|
edit vi
|
2021-12-07 10:37:30 +03:00 |
|
|
ee935ec401
|
edit az
|
2021-12-06 18:21:35 +03:00 |
|
|
6ef7c23bac
|
add pt_PT
|
2021-12-06 18:20:48 +03:00 |
|
|
9126ea393d
|
add uk
|
2021-12-06 17:29:19 +03:00 |
|
|
40c5a0d6b2
|
add az
|
2021-12-06 17:11:54 +03:00 |
|
|
a059fc9b7c
|
edit translations
|
2021-12-06 13:05:31 +03:00 |
|
|
af2e95dfd7
|
edit cs
|
2021-12-06 11:28:11 +03:00 |
|
|
e60c082a1d
|
Web: Client: fixed position profile menu drop down
|
2021-12-02 18:58:43 +05:00 |
|
|
3a50fca3cc
|
Merge branch 'hotfix/v1.1.1' into bugfix/dropdown-correct-display
|
2021-12-02 18:32:36 +05:00 |
|
|
a012038f3b
|
Merge branch 'develop' into feature/catalog
|
2021-12-02 14:59:31 +08:00 |
|
|
edff6e2f40
|
update pl
|
2021-12-01 18:32:54 +03:00 |
|
|
870f05fc83
|
add el
|
2021-12-01 17:42:50 +03:00 |
|
|
7823b9804c
|
update bg
|
2021-12-01 14:36:04 +03:00 |
|
|
d5d87a679f
|
update translations
|
2021-11-30 12:35:00 +03:00 |
|
|
b2c123d6f4
|
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
|
2021-11-30 11:46:22 +03:00 |
|
|
43d04b28de
|
edit uk
|
2021-11-29 15:27:40 +03:00 |
|
|
5a5169b391
|
edit cz
|
2021-11-29 15:22:40 +03:00 |
|
|
bbe874054e
|
update translations
|
2021-11-29 12:37:32 +03:00 |
|
|
18d0cd0842
|
Web: Shell: Fix minimization on production build static
|
2021-11-25 17:39:25 +03:00 |
|
|
08746974f4
|
Web: SW: Added SW unregister + refactoring
|
2021-11-25 15:08:18 +03:00 |
|
|
ff9bb93efd
|
Web: Scripts: Hide shx mkdir errors
|
2021-11-25 15:06:19 +03:00 |
|
|
465c57b8f6
|
Fixed Bug 54013 - Client.Files.Returned the ability to select elements on the About program page.
|
2021-11-24 11:09:52 +03:00 |
|
|
11d527ba03
|
Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# packages/asc-web-components/package.json
# packages/browserslist-config-asc/package.json
# packages/debug-info/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Login/package.json
|
2021-11-21 14:40:24 +03:00 |
|
|
f675415228
|
Merge branch 'master' into release/v1.1.0
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# packages/asc-web-components/package.json
# packages/browserslist-config-asc/package.json
# packages/debug-info/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/public/locales/en/SelectFile.json
# products/ASC.Files/Client/public/locales/en/SelectFolder.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.People/Client/public/locales/en/Translations.json
# products/ASC.People/Client/public/locales/ru/Translations.json
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Login/package.json
|
2021-11-21 14:26:20 +03:00 |
|
|
4cd9d042de
|
Web: Files: fixed styles after Cherry picking.
|
2021-11-19 16:58:31 +03:00 |
|
|
2c6e0d45bc
|
Web: Fix wrong braces of variables inside translation files
|
2021-11-13 19:07:48 +03:00 |
|
|
c7c7267a9a
|
Test: Added new WrongTranslationVariablesTest and fix it's issues
|
2021-11-13 19:03:10 +03:00 |
|
|
623313e4be
|
Web: Restored missing 'ru' translations
|
2021-11-12 21:14:44 +03:00 |
|
|
5ff07a8293
|
Web: Fix UselessTranslationKeysTest translation issues
|
2021-11-12 20:46:04 +03:00 |
|
|
d8cf12f9d7
|
translations
|
2021-11-12 19:00:01 +03:00 |
|
|
17e3e5cb98
|
bump version to 1.1.1
|
2021-11-12 15:21:25 +03:00 |
|
|
3809273075
|
bump version to 1.1.0
|
2021-11-12 15:19:40 +03:00 |
|
|
11769e8c9e
|
Fix Bug 53180 - Client: Profile. Error «.../pt/Common.json 404» on pt-BR language.
|
2021-11-10 19:59:03 +03:00 |
|
|
e917b4bb56
|
Fix Bug 53454 - Client: Sign out. Error on api/2.0/people/@self.json
|
2021-11-10 15:52:36 +03:00 |
|
|
cd897aa8f1
|
Web: About: Fix DublicatesByContentTest translation issue
|
2021-11-08 15:33:27 +03:00 |
|
|
a876ce8b67
|
Web:Common:PageLayout: add catalog in readme and storybook
|
2021-11-08 17:23:56 +08:00 |
|
|
d37aa52f09
|
Merge branch 'develop' into feature/catalog
|
2021-11-02 21:04:46 +08:00 |
|
|
4e018d2d71
|
Web: Bump version to 1.0.1
|
2021-11-02 14:02:46 +03:00 |
|
|
f5d5e92fb8
|
Web: Client: Added redirect to default page for personal
|
2021-10-27 17:13:03 +03:00 |
|
|
657e34d474
|
Web:Studio:NavMenu: fix showing navigation icons
|
2021-10-21 20:36:25 +08:00 |
|
|
9aa3fd7047
|
Web:Common:Catalog: update branch
|
2021-10-20 22:31:39 +08:00 |
|
|
7481f3a2d0
|
Merge branch 'develop' into feature/catalog
|
2021-10-19 15:51:12 +08:00 |
|
|
58fce28bf5
|
Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display
|
2021-10-15 16:53:45 +05:00 |
|
|
7c9980b475
|
Web: Removed index from remoteEntry url (disk cache issue)
|
2021-10-15 12:49:15 +03:00 |
|
|
9c7207dfe3
|
Web:Studio:Header: fixed badge style
|
2021-10-15 17:19:28 +08:00 |
|
|
bc37fcc8ce
|
Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display
|
2021-10-14 16:06:55 +05:00 |
|
|
1c38f29440
|
Web: Added new logo files and setup is_retina cookie for better icons inside Editor on retina resolution
|
2021-10-13 15:19:31 +03:00 |
|
|
6e4e3d69aa
|
Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display
|
2021-10-12 20:26:45 +05:00 |
|
|
31570e57d7
|
Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row
|
2021-10-07 17:47:54 +03:00 |
|
|
335c580d78
|
Web: Dev: Downgrade lerna to v3.22.1 and update webpack-dev-server and webpack-cli (yarn start + Ctrl-C stop issue)
|
2021-10-07 17:32:32 +03:00 |
|
|
b0fe6bd9e2
|
Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display
|
2021-10-07 15:17:04 +03:00 |
|
|
deffb0c901
|
Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row
|
2021-10-06 21:01:53 +03:00 |
|
|
5dbf54c2b3
|
Web: Fix open '/Products/Files' and '/Products/Files/?desktop=true' (desktop provider 'onlyoffice' issue)
|
2021-10-06 20:52:22 +03:00 |
|
|
a33d49f356
|
Web: Files: fixed icons, fixed styles
|
2021-10-06 15:23:12 +03:00 |
|
|
4dc7977ec7
|
Web:Studio:NavMenu: deleted comments
|
2021-10-06 20:07:32 +08:00 |
|
|
435cf08f30
|
Web:Studio:NavMenu: fixed tablet view
|
2021-10-06 18:09:45 +08:00 |
|
|
d4fd6c470d
|
Web:Studio:NavMenu: deleted console log
|
2021-10-06 18:01:37 +08:00 |
|
|
a7f676e92d
|
Web:Studio: edited nav menu v1.2.1
|
2021-10-06 17:58:57 +08:00 |
|
|
edd967de76
|
Web:Studio: edited nav menu v1.2.1
|
2021-10-06 17:58:09 +08:00 |
|
|
aa66baf2b6
|
Web: Client: fixed header logo
|
2021-10-06 12:36:42 +03:00 |
|
|
55cb1e875e
|
Web: fixed header height
|
2021-10-06 12:22:28 +03:00 |
|
|
4a16633734
|
Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display
|
2021-10-05 18:14:15 +05:00 |
|
|
ed20953d9c
|
Web: Hide warning overlay
|
2021-10-05 14:57:42 +03:00 |
|
|
5d3d8f4d45
|
Web: Changed opportunity to show/hide DebugInfo to appsettings.json param "debug-info:enabled" and 'api/2.0/settings.json'
|
2021-10-05 11:13:38 +03:00 |
|
|
159e284dd0
|
Web: Added opportunity to show/hide debug info
|
2021-10-05 09:56:59 +03:00 |
|
|
6e926eceb9
|
Web: Removed browserslist (loading bundle issues)
|
2021-10-05 09:48:08 +03:00 |
|
|
ee4b6de3ff
|
Web: Optimizated debuginfo.md loading
|
2021-10-04 19:43:38 +03:00 |
|
|
dec1c42b71
|
Web: Fix dialog content height
|
2021-10-04 19:37:01 +03:00 |
|
|
9ce696e624
|
Web: Studio: Init Debug Info
+ Added About version from package.json
+ Fix DocumentServer version
|
2021-10-04 17:08:03 +03:00 |
|
|
fdeab37e01
|
Fix bug 52874: letters instead of avatar
|
2021-09-30 18:19:14 +03:00 |
|
|
b36f141cfb
|
Web:Common: fixed catalog on big screen tablet or mobile
|
2021-09-30 17:05:04 +08:00 |
|
|
e5807a43fc
|
Merge develop branch
|
2021-09-29 20:52:55 +08:00 |
|
|
6591080403
|
Fix Bug 52797 with unsupported browsers. Added new packages/browserslist-config-asc with browserlist.config.js
|
2021-09-27 16:04:37 +03:00 |
|
|
a5c57fea52
|
Web: added catalog layout and document catalog
|
2021-09-27 20:59:37 +08:00 |
|
|
4531d38e6f
|
Web: Removed duplicates
|
2021-09-24 21:18:50 +03:00 |
|
|
844b996a66
|
Web: Client: fixed window height for IOS (Firefox, Safari)
|
2021-09-22 16:37:11 +03:00 |
|
|
15e7cf9bfd
|
Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display
|
2021-09-16 12:28:20 +05:00 |
|
|
b88a6f5ddf
|
Merge branch 'release/1.0.0' of https://github.com/ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-15 15:56:28 +03:00 |
|
|
1f5554c748
|
Web: Shell: Fix bad merge
|
2021-09-15 15:56:15 +03:00 |
|
|
1ca554f82d
|
Merge branch 'develop' into release/1.0.0
# Conflicts:
# packages/asc-web-components/campaigns-banner/index.js
# web/ASC.Web.Client/src/Shell.jsx
|
2021-09-15 14:45:33 +03:00 |
|
|
8857702fcb
|
Web: Client: fix open profile
|
2021-09-15 13:59:48 +03:00 |
|
|
b92deb5391
|
Web: Shell: Added key to login route
|
2021-09-15 11:49:20 +03:00 |
|
|
03d8d560ba
|
Web: Hide internal login from personal mode
|
2021-09-14 16:44:39 +03:00 |
|
|
11dfddb031
|
Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display
|
2021-09-14 18:33:01 +05:00 |
|
|
fe6014a440
|
Web: Update webpack to v5.52.1
|
2021-09-13 15:08:48 +03:00 |
|
|
e6e49559a9
|
Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display
|
2021-09-13 14:59:06 +05:00 |
|
|
009dc5b7a3
|
Web: Studio: added ref for drop-down
|
2021-09-13 14:57:51 +05:00 |
|
|
1fe11360a8
|
Web: Components: added portals to drop-down
|
2021-09-13 14:56:02 +05:00 |
|
|
f06e3c076b
|
Fix Bug 52282 - Client.Files. When grabbing the left mouse button, page elements go beyond their boundaries
|
2021-09-13 12:54:59 +03:00 |
|
|
c7ad040293
|
Web: Sorted all "package.json" files by vscode-sort-package-json
|
2021-09-13 12:36:07 +03:00 |
|
|
38242e83c1
|
Web: Moved other common dependencies to sharedDependencies.js
|
2021-09-13 12:29:44 +03:00 |
|
|
a47c73b5ce
|
Web: Moved "mobx", "moment", prop-types" to sharedDependencies.js
|
2021-09-10 16:50:23 +03:00 |
|
|
956c9b3467
|
Web: Moved "react", "react-dom", "react-router", "react-router-dom", "styled-components" to sharedDependencies.js
|
2021-09-10 15:57:14 +03:00 |
|
|
d2f3c93c14
|
Web: Moved "@babel/runtime", "i18next", "i18next-http-backend", "react-i18next" to sharedDependencies.js
|
2021-09-10 15:15:51 +03:00 |
|
|
46161eef95
|
Web: Moved axios to sharedDependencies.js
|
2021-09-10 14:49:20 +03:00 |
|
|
f0c7a09a6c
|
Web: Moved common shared dependencies to sharedDependencies.js + moved workbox-window
|
2021-09-10 14:20:19 +03:00 |
|
|
f7c46a70fa
|
Web: Updates next dev packages:
- @babel/preset-env
- css-loader
- sass
- sass-loader
- serve
- source-map-loader
- style-loader
- terser-webpack-plugin
- webpack-dev-server
+ Fixed css-loader url resolution issues
|
2021-09-10 11:30:27 +03:00 |
|
|
15dab2adaa
|
Web: Updated copy-webpack-plugin package
|
2021-09-09 13:17:27 +03:00 |
|
|
b4661539ec
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-09 13:06:12 +03:00 |
|
|
5b880d5b6a
|
Web: Updated clean-webpack-plugin package
|
2021-09-09 12:58:49 +03:00 |
|
|
f73ffec535
|
Web: Layout: Fixed selection of scroll body for ipad.
|
2021-09-09 11:55:16 +03:00 |
|
|
d4bd4dcb50
|
Web: Updated webpack and it's dependencies (new v5.52.0) + moved to new webpack-dev-server v4.1.1
|
2021-09-09 11:28:52 +03:00 |
|
|
18718aab93
|
Web: Updated babel packages
|
2021-09-08 17:40:31 +03:00 |
|
|
bfb85fd05f
|
Web: Removed duplicated dependency declaration (attr-accept)
|
2021-09-08 17:17:57 +03:00 |
|
|
8c731a1630
|
Web: Turned off wdyr
|
2021-09-08 16:57:40 +03:00 |
|
|
fabaaef0f9
|
Web: Updated react-toastify and extended ModuleFederationPlugin shared section
|
2021-09-08 16:28:10 +03:00 |
|
|
899507000f
|
Web: fixed login route
|
2021-09-08 16:24:20 +03:00 |
|
|
11aa89a628
|
Web: Updated @babel/runtime and extended ModuleFederationPlugin shared section
|
2021-09-08 16:04:05 +03:00 |
|
|
c41eb97a0f
|
Web: Extended ModuleFederationPlugin shared section
|
2021-09-08 15:41:11 +03:00 |
|
|
67eeb56f16
|
Web: Removed duplicated dependency declaration (email-addresses)
|
2021-09-08 13:54:49 +03:00 |
|
|
d66e8a4046
|
Web: Files: fixed drag files
|
2021-09-08 11:36:43 +03:00 |
|
|
c0cd0ea269
|
fix Bug 51444
|
2021-09-07 22:42:31 +03:00 |
|
|
7684723dd1
|
Web: Fixed scroll for mobile layout.
|
2021-09-07 14:22:00 +03:00 |
|
|
a30f75b0b4
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-07 11:38:30 +03:00 |
|
|
009a801be7
|
Web: Personal: fixed redirect to login
|
2021-09-07 11:38:24 +03:00 |
|
|
0eaee99856
|
Fix bug 51365: update avatar in header
|
2021-09-07 02:31:56 +03:00 |
|
|
1fdb42a53a
|
Fix Error 52282 - Client.Files. When grabbing the left mouse button, page elements go beyond their boundaries.
|
2021-09-01 15:25:20 +03:00 |
|
|
51c2341248
|
Fix Bug 52089 - Client.Files. Elements of the page are not selected using left mouse button.
|
2021-08-30 15:59:17 +03:00 |
|
|
68e0da72d7
|
Web: Added no selection of logo.
|
2021-08-23 13:56:35 +03:00 |
|
|
0cfb70d9e2
|
Error 52089 - Client.Files. Elements of the page are not selected using left mouse button.
|
2021-08-23 13:50:21 +03:00 |
|
|
46a97efb52
|
Merge branch 'develop' into release/1.0.0
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
|
2021-08-18 16:59:00 +03:00 |
|
|
34408c6e41
|
Web: Components: added style props for snackbar
|
2021-08-17 21:20:31 +03:00 |
|
|
9715719994
|
Merge branch 'develop' into bugfix/canShare
|
2021-08-16 11:07:30 +03:00 |
|
|
e60815b15d
|
Web: Refactoring and API calls optimization
|
2021-08-13 20:32:50 +03:00 |
|
|
fad2a178d8
|
Build: Added build.static.bat + change rimraf, mkdirp packages to single shx package (npm command line util)
|
2021-08-12 16:18:48 +03:00 |
|
|
4919b34fd0
|
Web: Webpack: increased performance maxEntrypointSize and maxAssetSize
|
2021-08-11 20:40:31 +03:00 |
|
|
a26e475c94
|
Web: fix no license warning
|
2021-08-11 20:39:24 +03:00 |
|
|
f642090c66
|
Web: Client: fixed
|
2021-08-11 10:44:00 +03:00 |
|
|
3f56790c85
|
Fix bug 51365: update avatar in header
|
2021-08-11 10:18:10 +03:00 |
|
|
b04b8c7edb
|
Fix bug 51828: about links
|
2021-08-09 16:39:03 +03:00 |
|
|
514387652e
|
Web: Client: fixed about
|
2021-08-05 12:30:14 +03:00 |
|
|
fbf0ee3bf0
|
Web: Client: added about dialog
|
2021-08-04 12:06:37 +03:00 |
|
|
a9734f78e1
|
Web: Client: added about content
|
2021-08-04 12:06:16 +03:00 |
|
|
d2fbca0a27
|
Web: Client: rewrite about page
|
2021-08-03 16:01:56 +03:00 |
|
|
fb922f04d6
|
Web: Client: change About translations
|
2021-08-03 16:01:31 +03:00 |
|
|
180c0a7407
|
Web: Client: fixed
|
2021-07-27 16:09:56 +03:00 |
|
|
e2d3f3195d
|
Merge branch 'develop' into release/1.0.0
|
2021-07-26 15:40:05 +03:00 |
|
|
538d65c724
|
Web: Remove query hash from remoteEntry.js
|
2021-07-26 14:02:10 +03:00 |
|
|
30b41aac42
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-07-26 12:37:01 +03:00 |
|
|
0f27a6c673
|
Merge branch 'develop' into release/1.0.0
|
2021-07-23 17:34:43 +03:00 |
|
|
675fb8de21
|
Web: Fix caching remoteEntry.js
|
2021-07-23 17:20:42 +03:00 |
|
|
fa500d094f
|
Merge branch 'develop' into release/1.0.0
|
2021-07-22 11:12:37 +03:00 |
|
|
e703927239
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-07-21 18:30:33 +03:00 |
|
|
13f8f5ef7d
|
Fix sw.js creation
|
2021-07-21 18:28:56 +03:00 |
|
|
e44040cf8a
|
Web: Client: fix
|
2021-07-21 12:57:20 +03:00 |
|
|
a8d4a2678a
|
Web: Client: added snackbar button action
|
2021-07-21 12:52:57 +03:00 |
|
|
5371b7682e
|
Web: Client: fixed show snackbar
|
2021-07-21 12:45:18 +03:00 |
|
|
653066af0c
|
Merge branch 'develop' into release/1.0.0
# Conflicts:
# config/nginx/onlyoffice.conf
|
2021-07-20 18:21:00 +03:00 |
|
|
eab97bbfed
|
Web: init new single sw.js creation
|
2021-07-20 12:32:27 +03:00 |
|
|
e81c3df0be
|
Added displaying version from appsettings.json (api/2.0/settings.json)
|
2021-07-14 17:31:06 +03:00 |
|
|
1ebc588a93
|
Web: Bumped version to 1.0.0
|
2021-07-14 13:26:36 +03:00 |
|
|
d125220aa0
|
Merge branch 'feature/personal' of https://github.com/ONLYOFFICE/AppServer into feature/personal
|
2021-07-09 18:28:24 +03:00 |
|
|
b4c4625f3f
|
Moved getting firebase config to API method /api/2.0/settings.json
|
2021-07-09 18:28:08 +03:00 |
|
|
1c24e809fc
|
Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal
|
2021-07-09 17:41:07 +03:00 |
|
|
537fe50394
|
Web: Client: About: fixed logo
|
2021-07-09 17:40:53 +03:00 |
|
|
1c0e201c2c
|
Merge branch 'feature/personal' of https://github.com/ONLYOFFICE/AppServer into feature/personal
|
2021-07-09 17:25:42 +03:00 |
|
|
0297620036
|
Fix SnackBar usage
|
2021-07-09 17:25:20 +03:00 |
|
|
d90413a436
|
Web: Client: Firebase: removed unused code
|
2021-07-09 16:32:37 +03:00 |
|
|
d26169adca
|
Web: Client: fixed header-module-title styles
|
2021-07-09 16:23:47 +03:00 |
|
|
5b76c9bfc6
|
Merge branch 'feature/personal' of https://github.com/ONLYOFFICE/AppServer into feature/personal
|
2021-07-08 14:38:45 +03:00 |
|
|
3556497de6
|
Merge branch 'develop' into feature/personal
|
2021-07-08 14:38:26 +03:00 |
|
|
1ebe1f1ded
|
Web: Client: fixed
|
2021-07-07 11:18:40 +03:00 |
|
|
db7ea5c88f
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/v1.0.0
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/index.js
|
2021-07-06 11:38:02 +03:00 |
|
|
f0f0c49bb8
|
Web: Client: fixed campaigns logic
|
2021-07-05 17:59:58 +03:00 |
|
|
181240854f
|
Web: Client: get campaigns from firebase
|
2021-07-05 15:51:09 +03:00 |
|
|
a31dc583c1
|
Merge branch 'develop' into feature/personal
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/pages/Settings/index.js
|
2021-07-02 16:26:45 +03:00 |
|
|
658b7052c3
|
Web: Client: About: Removed useless component
|
2021-07-02 15:42:04 +03:00 |
|
|
c940aae128
|
Web: refactoring translation loaders
|
2021-07-02 12:25:36 +03:00 |
|
|
513ec04e33
|
Merge branch 'develop' into feature/translations-loaders
# Conflicts:
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/pages/Home/Section/Header/index.js
|
2021-07-01 16:47:34 +03:00 |
|
|
c5da5a1950
|
Web: Client: added tReady for confirm pages
|
2021-06-30 18:24:29 +03:00 |
|
|
cc1fc30b0f
|
Web: Client: fixed logo header position
|
2021-06-28 10:40:42 +03:00 |
|
|
99f9d27fd0
|
Web: Files: added checkProtocol helper, fixed toast
|
2021-06-27 09:31:07 +03:00 |
|
|
bf67b5c296
|
Web: Files: added PrivateRoomsPage
|
2021-06-24 16:23:14 +03:00 |
|
|
282738cb13
|
Merge branch 'develop' into feature/personal
|
2021-06-22 18:44:12 +03:00 |
|
|
b1662e7ac6
|
Web: Init maintenance displaying
|
2021-06-22 13:41:11 +03:00 |
|
|
741de9f2f7
|
Web: Files: added react-selecto library
|
2021-06-17 14:36:45 +03:00 |
|
|
65378cc089
|
Merge branch 'develop' into feature/personal
# Conflicts:
# products/ASC.CRM/Client/public/index.html
# products/ASC.Calendar/Client/public/index.html
# products/ASC.Files/Client/public/index.html
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Mail/Client/public/index.html
# products/ASC.People/Client/public/index.html
# products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.Projects/Client/public/index.html
|
2021-06-15 11:49:39 +03:00 |
|
Artem Tarasov
|
f181a491fb
|
Merge branch 'develop' into bugfix/fixed-styles
|
2021-06-11 14:56:52 +03:00 |
|
|
bac090e180
|
Merge branch 'develop' into feature/personal
# Conflicts:
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
|
2021-06-11 13:11:08 +03:00 |
|
|
1d9e49b88f
|
Web: Client: Settings: Fixed translation keys
|
2021-06-10 11:31:47 +03:00 |
|
|
fbb480671b
|
Web: Client: fixed translates
|
2021-06-09 17:30:10 +03:00 |
|
|
a3c5eea477
|
Web: Client: deleted unused translations key
|
2021-06-09 17:16:37 +03:00 |
|
|
ff5ea3019b
|
Web: Client: added select all
|
2021-06-09 16:42:43 +03:00 |
|
|
026ceec20c
|
Web: Client: fixed
|
2021-06-09 16:18:06 +03:00 |
|
|
82fddadd6d
|
Web: Client: fixed tooltip color
|
2021-06-09 04:03:18 +03:00 |
|
|
4fcd83ae6d
|
Web: Client: fixed translate
|
2021-06-09 03:31:52 +03:00 |
|
|
20a1869cfd
|
Web: Client: fixed label
|
2021-06-09 03:10:38 +03:00 |
|
|
bc46acebcc
|
Web: Client: bringing code to common style
|
2021-06-09 02:57:11 +03:00 |
|
|
5ea562e996
|
Web: Client: fixed translations
|
2021-06-09 02:43:07 +03:00 |
|
|
167ca1fbb5
|
Web: Client: fixed loading
|
2021-06-09 00:39:08 +03:00 |
|
|
9019b36951
|
Web: Client: moved pages in sub-components
|
2021-06-09 00:33:04 +03:00 |
|
|
db21597f17
|
Web: Client: fixed access portal urls
|
2021-06-09 00:30:19 +03:00 |
|
|
3db9fde5aa
|
Web: Client: fixed title
|
2021-06-09 00:25:45 +03:00 |
|
|
b7ce4a35e7
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/access-rights-admins
# Conflicts:
# products/ASC.Files/Server/DocStore
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
# web/ASC.Web.Client/src/components/pages/Settings/index.js
|
2021-06-09 00:23:12 +03:00 |
|
Artem Tarasov
|
3db9b30e5e
|
Merge branch 'develop' into bugfix/fixed-styles
# Conflicts:
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
|
2021-06-08 17:58:29 +03:00 |
|
|
783bedffbb
|
Web: Client: deleted unused image
|
2021-06-08 16:06:07 +03:00 |
|
Artem Tarasov
|
c25fa589a9
|
Web: People: deleted fonts with ext .woff, added hash to font name
|
2021-06-08 15:26:56 +03:00 |
|