|
|
d783bd8ab4
|
crm: fixed warnings
|
2021-06-18 20:38:32 +03:00 |
|
|
|
f340924612
|
Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup
|
2021-06-18 20:19:56 +03:00 |
|
|
|
ae17671043
|
Merge branch 'develop' into feature/backup
# Conflicts:
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/store/SettingsSetupStore.js
|
2021-06-18 18:08:38 +03:00 |
|
|
|
ad8a769cb4
|
Merge branch 'develop' into feature/changing-selectbox-library
|
2021-06-18 17:18:28 +03:00 |
|
|
|
a55544454a
|
Web: Common: added support scroll to selectbox, fixed styles
|
2021-06-18 17:17:59 +03:00 |
|
|
|
dd64101332
|
remove itemList
|
2021-06-18 15:56:15 +03:00 |
|
Sergey Kirichenko
|
7af9bb08c9
|
Fix elasticsearch configure (#285)
|
2021-06-18 14:30:11 +03:00 |
|
|
|
0005169b2b
|
Web: Common: fixed dragCondition
|
2021-06-18 14:10:20 +03:00 |
|
|
|
7905b07c0c
|
Web: Files: added dragCondition to Selecto
|
2021-06-18 13:53:32 +03:00 |
|
|
|
00cc15fbf5
|
Merge branch 'develop' into feature/ClearEvents
|
2021-06-18 12:21:54 +03:00 |
|
|
|
d0b813cc71
|
update packages
|
2021-06-18 12:11:25 +03:00 |
|
Artem Tarasov
|
83549b62cd
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# packages/asc-web-common/api/files/index.js
# products/ASC.Files/Client/src/pages/Home/index.js
|
2021-06-18 12:02:10 +03:00 |
|
|
|
f70794a717
|
Merge branch 'develop' into feature/changing-selectbox-library
|
2021-06-18 11:58:06 +03:00 |
|
|
|
30e143eedf
|
subproject update
|
2021-06-18 11:57:04 +03:00 |
|
|
|
d3113fdc2e
|
Merge branch 'develop' into dependabot/npm_and_yarn/common/ASC.Socket.IO/redis-3.1.1
|
2021-06-18 11:32:55 +03:00 |
|
|
|
95aaff4e68
|
Web: api: Changed parameters at url.
|
2021-06-18 11:07:06 +03:00 |
|
|
|
3024cb8fff
|
Web: Files: SelectFileDialog: Rename function.
|
2021-06-18 11:06:12 +03:00 |
|
|
|
a1df9b74db
|
Web: Files: SelectFileDialog: Added loadNextPage and Added new functions for modalView for save and close modal dialog.
|
2021-06-18 11:04:14 +03:00 |
|
|
|
443da941be
|
Web: Files: fixed select for thirdparty folders
|
2021-06-18 11:00:31 +03:00 |
|
|
|
688de9106b
|
Web: Files: SelectFileDialog: Added infinity scroll for files list.
|
2021-06-18 10:58:01 +03:00 |
|
|
|
3d3a8a2d6a
|
Merge branch 'develop' into feature/remove_binary_formatter
|
2021-06-18 10:49:07 +03:00 |
|
|
|
a226cca872
|
Files: update document templates
|
2021-06-18 10:45:45 +03:00 |
|
Artem Tarasov
|
d2f77fb06a
|
Web: Files: Thumbnails: fixed styles tile, refactoring, added thumbnailUrl
|
2021-06-18 02:02:30 +03:00 |
|
Artem Tarasov
|
5034495b28
|
Web: Files: Thumbnails: added ThumbnailsStore, api for create thumbs
|
2021-06-18 01:13:49 +03:00 |
|
|
|
249af955d1
|
Web: Files: added onSelect function for selectbox
|
2021-06-17 18:46:22 +03:00 |
|
|
|
df70473ce5
|
Merge branch 'develop' into feature/changing-selectbox-library
|
2021-06-17 17:19:17 +03:00 |
|
|
|
b6b88b2506
|
bug fix: exception when call "getbackuphistory"
|
2021-06-17 16:48:20 +03:00 |
|
|
|
52cd479c5c
|
Merge pull request #279 from ONLYOFFICE/feature/tree-menu-bugfix
Feature/tree menu bugfix
|
2021-06-17 15:36:00 +03:00 |
|
Artem Tarasov
|
6c61ee105c
|
Merge branch 'develop' into feature/tree-menu-bugfix
|
2021-06-17 15:02:41 +03:00 |
|
Artem Tarasov
|
a8fe50142c
|
Web: Tree: fixed position of scrollbar on tablet
|
2021-06-17 15:01:35 +03:00 |
|
|
|
741de9f2f7
|
Web: Files: added react-selecto library
|
2021-06-17 14:36:45 +03:00 |
|
|
|
0aa2eb3e85
|
Web: Files: removed react-selectable-fast library
|
2021-06-17 14:27:41 +03:00 |
|
Sergey Kirichenko
|
a91ea81e89
|
Modify elasticsearch configuration (#281)
* Modify elasticsearch config
* Modify version ELK
* Cosmetic modify
|
2021-06-17 12:49:39 +03:00 |
|
|
|
a3298a49ac
|
Web: Files: fixed createTreeFolders
|
2021-06-17 12:04:01 +03:00 |
|
|
|
d7c8f22ea3
|
Merge branch 'develop' into feature/tree-menu-bugfix
|
2021-06-17 11:09:19 +03:00 |
|
|
|
3fe118fc3d
|
Web: Components: SaveCancelButtons: Added propType.
|
2021-06-17 09:31:35 +03:00 |
|
|
|
39b1b24262
|
Web:Files: SelecFolderDialog: Added store to folderTreeBody.
|
2021-06-17 09:16:33 +03:00 |
|
|
|
8fc9bef6c6
|
Core: fix cache
|
2021-06-16 22:25:02 +03:00 |
|
|
|
b6d4408ce0
|
Files: fixed subfolders method
|
2021-06-16 21:53:56 +03:00 |
|
|
|
a8527e1a57
|
WebApi: sendsms, setphone
|
2021-06-16 20:46:24 +03:00 |
|
|
|
7ad56c275b
|
Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup
|
2021-06-16 20:17:23 +03:00 |
|
|
|
01639a56cc
|
RazorCompileOnBuild:false<
GenerateMvcApplicationPartsAssemblyAttributes:false
|
2021-06-16 20:08:26 +03:00 |
|
|
|
53ee0ef484
|
fixed warnings
|
2021-06-16 18:00:27 +03:00 |
|
|
|
3018e1822f
|
crm: fix path
|
2021-06-16 17:30:31 +03:00 |
|
|
|
c22c25e5bf
|
bug fix: DistributedTask.Exception clean up when OnCompleted
|
2021-06-16 17:24:48 +03:00 |
|
|
|
050bc214df
|
Web: Settings: Backup/Restore Backup: Changed styles.
|
2021-06-16 17:04:50 +03:00 |
|
|
|
e314f6ff1c
|
Merge pull request #245 from ONLYOFFICE/feature/crm-migrate
Feature/crm migrate
|
2021-06-16 17:02:46 +03:00 |
|
|
|
5fcbdbd7dd
|
added health checks
|
2021-06-16 16:54:36 +03:00 |
|
|
|
056d34a66d
|
Web: Files: Added resize listener.
|
2021-06-16 15:35:05 +03:00 |
|
|
|
1250201319
|
Web: Files: fixed upload progress
|
2021-06-16 14:31:13 +03:00 |
|
