|
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 |
|
|
56ecbc95ea
|
Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0
|
2021-11-19 18:18:13 +03:00 |
|
|
e7f92b096c
|
Web: Added new translation and files for another languages.
|
2021-11-19 18:17:46 +03:00 |
|
|
180ca914ad
|
Web: Files: HOC: Fixed form icon inside context menu
|
2021-11-19 18:08:11 +03:00 |
|
|
677263354f
|
Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0
|
2021-11-19 18:01:56 +03:00 |
|
|
922622676c
|
Web: Files: MainButton: Reworked data model for button items
|
2021-11-19 18:01:34 +03:00 |
|
|
8e88d27340
|
Web: Files: Article: Added translations for sub-level menu
|
2021-11-19 18:00:40 +03:00 |
|
|
4cd9d042de
|
Web: Files: fixed styles after Cherry picking.
|
2021-11-19 16:58:31 +03:00 |
|
|
4ccc19981b
|
Web: Files: Force loading dialog translations.
|
2021-11-19 16:10:24 +03:00 |
|
|
5b98387057
|
Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0
|
2021-11-19 14:26:01 +03:00 |
|
|
0c09d46eca
|
Web: Removed warnings.
|
2021-11-19 14:12:16 +03:00 |
|
|
839d81f356
|
Web: Files: Added "Fill in the form" context menu action from ".ofrom" files
|
2021-11-19 13:25:09 +03:00 |
|
|
ce41e5d4cb
|
Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v1.1.0
|
2021-11-19 12:58:03 +03:00 |
|
|
8a0b29c12b
|
Web: Files: Added '.oform' files edit icon + update access.edit.react.svg
|
2021-11-19 12:57:56 +03:00 |
|
|
1b9b7e163d
|
Web: Files: Article: Fixed translate file
|
2021-11-19 12:55:38 +03:00 |
|
|
c63ad1792f
|
Web: Files: Fixed document filtering by extension in the file selection dialog.
|
2021-11-19 12:12:54 +03:00 |
|
|
2356ace636
|
Web: Files: Fixed the name of the created docx file from the existing file.
|
2021-11-19 12:09:18 +03:00 |
|
|
3dcebb924d
|
Web: Deleted useless code.
|
2021-11-19 10:29:21 +03:00 |
|
|
65a82827a0
|
Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0
|
2021-11-18 18:21:30 +03:00 |
|
|
d5fb86fd41
|
Web: Files: delete useless
|
2021-11-18 17:47:11 +03:00 |
|
|
c3cc75401c
|
Web: Files: fix comment
|
2021-11-18 17:41:38 +03:00 |
|
|
ce528338b8
|
Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into bugfix/Bug53151
|
2021-11-18 17:39:27 +03:00 |
|
|
8c8bf95fae
|
Web: Files: fixed empty trash
|
2021-11-18 17:39:12 +03:00 |
|
|
68ab26ed6d
|
Web: Files: Fixed loaders.
|
2021-11-18 16:21:28 +03:00 |
|
|
594b767a3d
|
Web: Files: Fixed loaders according layouts.
|
2021-11-18 15:26:48 +03:00 |
|
|
26d5de5c93
|
Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into bugfix/Bug53151
|
2021-11-18 14:52:57 +03:00 |
|
|
3dbb55cfc4
|
Web: Files: Removed global changes of tree when changes local tree at file dialog.
|
2021-11-18 10:45:36 +03:00 |
|
|
ea27fb433b
|
Web: fixed modal dialog styles.
|
2021-11-18 10:28:36 +03:00 |
|
|
3a866b14bb
|
Web: Fixed styles of aside files list.
|
2021-11-18 10:24:51 +03:00 |
|
|
8ff0bbba61
|
Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0
|
2021-11-18 10:02:47 +03:00 |
|
|
eaa7bd9c80
|
Web: Fixed translations according layouts.
|
2021-11-18 10:01:09 +03:00 |
|
|
2a842cc401
|
Web: Files: Remove extra padding for folder dialog.
|
2021-11-18 09:29:12 +03:00 |
|
|
d113abe541
|
Web: Files: Fixed translation for file dialog.
|
2021-11-18 09:16:40 +03:00 |
|
|
68d889fb2b
|
Web: Fixed can create in editor dialog, changed translation, added buttons of selection folder for files dialog.
|
2021-11-18 09:06:03 +03:00 |
|
|
e6f008cc6f
|
Web: Files: Store: Added convert map docx to docxf
|
2021-11-17 18:16:23 +03:00 |
|
|
0e7aee7918
|
Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0
|
2021-11-17 18:11:27 +03:00 |
|
|
fb903bd9bf
|
Web: Files: Store: Added new formats inside document constant
|
2021-11-17 18:11:18 +03:00 |
|
|
84439d98e1
|
Web: Files: delete action
|
2021-11-17 17:43:27 +03:00 |
|
|
4894779a17
|
Web: Files: add restore all
|
2021-11-17 17:42:59 +03:00 |
|
|
017b9e912c
|
Web: Files: add menu in trash
|
2021-11-17 17:41:46 +03:00 |
|
|
b5fa787353
|
Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0
|
2021-11-17 17:41:27 +03:00 |
|
|
7560d4aae5
|
Web: Files: Added new form from file.
|
2021-11-17 17:39:56 +03:00 |
|
|
8546bc2662
|
Web: Files: Home: Fixed translate file
|
2021-11-17 17:15:28 +03:00 |
|
|
bc4758114f
|
Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0
|
2021-11-17 16:48:29 +03:00 |
|
|
c4fd5b3626
|
Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0
|
2021-11-17 16:40:45 +03:00 |
|
|
e1a248ae7c
|
Web: Files: Store: Added new data parameters
|
2021-11-17 16:39:38 +03:00 |
|
|
635dc7c7aa
|
Web: Files: Store: Added new formats inside constants
|
2021-11-17 16:39:10 +03:00 |
|
|
166cca86c6
|
Web: Files: Helpers: Added title for new forms
|
2021-11-17 16:38:26 +03:00 |
|
|
2f7b465cea
|
Web: Files: Home: Added translation key for new form file
|
2021-11-17 16:37:46 +03:00 |
|
|
79cf36a41c
|
Web: Files: Fixed tree opening.
|
2021-11-17 16:28:31 +03:00 |
|
|
e5d045c090
|
Web: Files: Added select file dialog to the main menu.
|
2021-11-17 15:46:35 +03:00 |
|
|
36050dd6c9
|
Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0
# Conflicts:
# products/ASC.Files/Client/public/locales/en/Article.json
|
2021-11-17 15:45:19 +03:00 |
|
|
6a319d9bf8
|
Web: Files: Fixed styles according the layouts.
|
2021-11-17 15:33:43 +03:00 |
|
|
b102011139
|
Web: Files: Added button mane prop.
|
2021-11-17 13:09:54 +03:00 |
|
|
af55b39eab
|
Web: Files: Added select file dialog to the panels.
|
2021-11-17 11:47:00 +03:00 |
|
|
19c925fcbf
|
Web: Files: Fixed aside panel.
|
2021-11-17 10:13:58 +03:00 |
|
|
e704f2f127
|
Web: Files: Added new foldersType, removed saving folder to store.
|
2021-11-17 09:56:04 +03:00 |
|
|
99f73e8aee
|
Web: Files: Added translations for files dialog.
|
2021-11-17 09:53:41 +03:00 |
|
|
4af7032a9a
|
Web: Files: Added blank actions for form file. Added form action icons. Added en translation key`s for action buttons.
|
2021-11-16 16:40:27 +03:00 |
|
|
adbb316dd2
|
Web: moved "Owner" translation to Common
|
2021-11-15 18:33:32 +03:00 |
|
|
13fdab9e1f
|
Web: Files: fixed markAsRead action
|
2021-11-15 17:55:02 +03:00 |
|
|
d6836cc3d3
|
Merge pull request #457 from ONLYOFFICE/feature/translate-1.0.1
Feature/translate 1.0.1
|
2021-11-13 20:04:11 +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 |
|
|
478ca3215b
|
Web: Restored missing translations
|
2021-11-12 21:53:28 +03:00 |
|
|
9eb6c04a5a
|
Web: Removed useless translation keys
|
2021-11-12 21:52:47 +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 |
|
|
d45f863f64
|
Web: Files: Fix showing success operation toast on empty trash
|
2021-11-12 20:45:31 +03:00 |
|
|
1c8f091dce
|
Web: Fix DublicatesByContentTest translation issues
|
2021-11-12 20:12:33 +03:00 |
|
|
d8cf12f9d7
|
translations
|
2021-11-12 19:00:01 +03:00 |
|
|
400612f9ff
|
Web: Files: fixed checkUpdateNode
|
2021-11-12 17:22:17 +03:00 |
|
|
63aee3fd73
|
Merge pull request #456 from ONLYOFFICE/bugfix/fixed-tree-menu-class-list
Web: Files: moved the tree id from classname to dataset
|
2021-11-12 16:44:50 +03:00 |
|
|
b5b61c4385
|
Web: Files: fixed tree folders drag
|
2021-11-12 16:16:17 +03:00 |
|
|
3c0b1a410e
|
Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.0.1
|
2021-11-12 17:50:05 +05:00 |
|
|
77de50578d
|
Fixed bug 53531 - Web: Files: added toastr when we delete a file or folder
|
2021-11-12 17:49:50 +05:00 |
|
|
0bd634dd16
|
Web: Files: added className for tree root folders
|
2021-11-12 15:36:56 +03:00 |
|
|
3809273075
|
bump version to 1.1.0
|
2021-11-12 15:19:40 +03:00 |
|
|
eb5f69213e
|
Web: Files: Settings: added className to TreeSettings
|
2021-11-12 14:33:32 +03:00 |
|
|
3363cb4111
|
Web: added className to MainButton
|
2021-11-12 14:17:20 +03:00 |
|
|
8910f4446a
|
Web: Files: added className for MainButton items
|
2021-11-12 14:13:29 +03:00 |
|
|
549a0abe99
|
Web: Files: moved the tree id from classname to dataset
|
2021-11-12 12:25:28 +03:00 |
|
|
ea1a64cbab
|
Web: Files: fixed addNewFile
|
2021-11-11 18:41:09 +03:00 |
|
|
967d6123a1
|
Merge pull request #455 from ONLYOFFICE/bugfix/fix-diplay-converted-files
Fixed Bug 53633 - Client: Files. Fixed display of files after conversion
|
2021-11-11 18:29:39 +03:00 |
|
|
40fb928ee7
|
Fixed Bug 53633 - Client: Files. Fixed display of files after conversion
|
2021-11-11 17:40:50 +03:00 |
|
|
ae0a437474
|
Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.0.1
|
2021-11-11 19:25:50 +05:00 |
|
|
4c55228f73
|
Fixed bug 53162 - Web: Files: fixed context-menu-wrapper padding since row was shifted
|
2021-11-11 19:25:39 +05:00 |
|
|
2b5e4bad38
|
Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.0.1
|
2021-11-11 15:37:31 +03:00 |
|
|
2ea63910a2
|
Web: Added encoding/decoding operations for string file ids. Fixed errors with opening folders and files with string id s
|
2021-11-11 15:37:23 +03:00 |
|
|
0fdb4a3218
|
Web: Files: fix memory leak
|
2021-11-11 14:32:13 +03:00 |
|
|
80d6b801eb
|
Web: Files: fix upload panel loading button
|
2021-11-11 14:24:22 +03:00 |
|
|
0006d428e3
|
Web: Files: fixed update tree nodes
|
2021-11-11 12:21:43 +03:00 |
|
|
b34d8091f3
|
Web: Files: fixed error notifications for upload panel
|
2021-11-11 12:10:39 +03:00 |
|
|
6b299a48e3
|
Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.0.1
|
2021-11-10 21:25:08 +03:00 |
|
|
0f2b65c215
|
Merge pull request #438 from ONLYOFFICE/bugfix/sharing-panel
Bugfix/sharing panel
|
2021-11-10 21:24:19 +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 |
|
|
0b13f992bd
|
Web: Files: fixed upload
|
2021-11-09 18:24:16 +03:00 |
|
|
6de5f819ae
|
Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.0.1
|
2021-11-09 17:55:35 +03:00 |
|
|
51fec4ff31
|
Web: Files: Fixed error for getting subfolders of root
|
2021-11-09 17:54:26 +03:00 |
|
Artem Tarasov
|
8ddf907338
|
Merge pull request #452 from ONLYOFFICE/bugfix/fix-tile-view-styles
Web: Files: fixed TileContainer styles
|
2021-11-09 16:48:04 +03:00 |
|