|
|
b13e71fcae
|
Web: Files: fixed table filter
|
2021-07-28 17:45:09 +03:00 |
|
|
|
eb1049790b
|
Web: Files: fixed table filter
|
2021-07-28 17:22:50 +03:00 |
|
|
|
75e7ca893f
|
Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Editor/src/Editor.jsx
|
2021-07-28 17:19:05 +03:00 |
|
|
|
2abbd580c2
|
Merge branch 'develop' into feature/table-view
# Conflicts:
# public/locales/en/Common.json
# public/locales/ru/Common.json
|
2021-07-28 16:53:23 +03:00 |
|
|
|
3edc22c2fb
|
Web: Files: added change of view from table to rows
|
2021-07-28 16:42:07 +03:00 |
|
|
|
c4163231a2
|
Web: Files: moved links in constant
|
2021-07-28 14:20:15 +03:00 |
|
|
|
18fb288ad3
|
Web: Files: fixed loader hoc
|
2021-07-28 14:13:22 +03:00 |
|
|
|
5c5235cf3a
|
Merge branch 'develop' into feature/editor-extention
|
2021-07-28 13:43:49 +03:00 |
|
|
|
f99090ec9b
|
Web: Files: Remove Comments.
|
2021-07-28 12:33:09 +03:00 |
|
|
|
cf7d002bc1
|
Merge branch 'develop' into feature/calendar
|
2021-07-28 12:16:39 +03:00 |
|
|
|
48d94b4a2d
|
Merge branch 'develop' into feature/editor-extention
|
2021-07-28 11:53:36 +03:00 |
|
|
|
3be8ab673c
|
Web: Editor: Fixed not displaying data of Sharing Panel.
|
2021-07-28 11:15:55 +03:00 |
|
|
|
1035ac6244
|
crm: set listitem id for dto object
|
2021-07-27 19:05:25 +03:00 |
|
|
|
441102ad79
|
Web: Files: fixed table styles
|
2021-07-27 16:21:36 +03:00 |
|
|
|
6fbdaf0d31
|
Calendar: post-merge fixes
|
2021-07-27 16:09:30 +03:00 |
|
|
|
6b08fa8a84
|
Web: Files: fixed table styles
|
2021-07-27 16:02:25 +03:00 |
|
|
|
eddb323ff6
|
Web: Editor/Files: Added create new file option.
|
2021-07-27 15:47:08 +03:00 |
|
|
|
475d6d638f
|
Web: Files: added column filtering
|
2021-07-27 15:22:51 +03:00 |
|
|
|
050ce4ce8d
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-07-27 14:00:39 +03:00 |
|
|
|
ee35713b89
|
Web: Files: added download app list
|
2021-07-27 13:59:59 +03:00 |
|
|
|
43c079e15e
|
Web: Files: added translations
|
2021-07-27 13:58:23 +03:00 |
|
|
|
445c7ae43f
|
Web: Files: added cell type
|
2021-07-27 13:51:56 +03:00 |
|
|
|
f1668a3b43
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar
|
2021-07-27 12:43:01 +03:00 |
|
|
|
d8c8d267c9
|
Web: Files: added an avatar to the author's cell
|
2021-07-27 09:57:00 +03:00 |
|
|
|
4874d783fc
|
Web: Files: fixed date cell
|
2021-07-26 18:58:42 +03:00 |
|
|
|
e2d3f3195d
|
Merge branch 'develop' into release/1.0.0
|
2021-07-26 15:40:05 +03:00 |
|
|
|
fcd46cfe3c
|
Web: Files: Deleted preview and edit options for not supported formats.
|
2021-07-26 14:19:30 +03:00 |
|
|
|
538d65c724
|
Web: Remove query hash from remoteEntry.js
|
2021-07-26 14:02:10 +03:00 |
|
|
|
be2322a1ca
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-07-26 12:58:51 +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 |
|
|
|
a57f018def
|
Web: Files: Added icon for fb2 format.
|
2021-07-26 11:59:08 +03:00 |
|
|
|
d86605e2da
|
Web: Files: added drag and drop for table
|
2021-07-23 18:13:06 +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 |
|
|
|
7f389e200e
|
Web: Files: added dragOptions to TableRow
|
2021-07-23 16:19:53 +03:00 |
|
|
|
b02bf63a8e
|
Web: Files: fixed display of share column
|
2021-07-23 14:17:23 +03:00 |
|
|
|
9b47aa8d4a
|
Merge branch 'develop' into feature/table-view
|
2021-07-22 16:56:48 +03:00 |
|
|
|
09c9cfe645
|
Web: Table: added the opportunity to hide columns, fixed styles, refactoring
|
2021-07-22 16:55:26 +03:00 |
|
|
|
573862f0b7
|
FactoryIndexer: fix async
|
2021-07-22 15:43:43 +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 |
|
|
|
c92d8318f1
|
Web: Files: fixed header sorting, removed unused code
|
2021-07-21 12:16:46 +03:00 |
|
|
|
f7ce0e210b
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
# Conflicts:
# packages/asc-web-common/utils/sw-helper.js
|
2021-07-21 07:20:51 +03:00 |
|
|
|
653066af0c
|
Merge branch 'develop' into release/1.0.0
# Conflicts:
# config/nginx/onlyoffice.conf
|
2021-07-20 18:21:00 +03:00 |
|
|
|
64ff924721
|
Web: Files: fixed the content of the created column
|
2021-07-20 18:08:46 +03:00 |
|
|
|
b586154b1d
|
Web: Files: fixed EditingWrapperComponent styles
|
2021-07-20 16:13:55 +03:00 |
|
|
|
d8e90c7dac
|
Web: Files: added creation, renaming of files to table view
|
2021-07-20 16:03:06 +03:00 |
|
|
|
d84229886f
|
Web: Components: Table: added header filtering, refactoring
|
2021-07-20 13:29:39 +03:00 |
|
|
|
829edbbda5
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-07-20 13:22:44 +03:00 |
|
|
|
eab97bbfed
|
Web: init new single sw.js creation
|
2021-07-20 12:32:27 +03:00 |
|
|
|
4d389cab91
|
Web: Files: fixed SimpleFilesRow click
|
2021-07-19 14:37:54 +03:00 |
|
|
|
5ed5adbb9b
|
Web: Components: Table: added settings, fixed table group menu header
|
2021-07-19 14:09:09 +03:00 |
|
|
|
6585acce04
|
Calendar: fixed download ical
|
2021-07-18 19:59:26 +03:00 |
|
|
|
923db85ca1
|
crm: fixed bug with crash app for contacts list more than 25 and fixed bug with always infoType set 0
|
2021-07-16 19:01:57 +03:00 |
|
|
|
f9e8b3daa1
|
Merge branch 'develop' into feature/table-view
|
2021-07-16 17:44:54 +03:00 |
|
|
|
bfa7f75eb2
|
Web: Files: added translations to TableHeader.js
|
2021-07-16 13:24:25 +03:00 |
|
|
|
075d9232ec
|
Web: People: moved translation "Name" to Common.json
|
2021-07-16 13:23:52 +03:00 |
|
|
|
4cb025b5b2
|
Web: Files: added selectbox support
|
2021-07-16 12:36:47 +03:00 |
|
|
|
cd8242ee69
|
Web: Files: added context-menu to files module
|
2021-07-15 18:10:37 +03:00 |
|
|
|
f00f07ce1e
|
Web: Files: added TableGroupMenu to files module
|
2021-07-15 17:00:47 +03:00 |
|
|
|
e81ef462f6
|
Web: Files: moved getting header menus item to the store, changed the header display logic
|
2021-07-15 17:00:15 +03:00 |
|
|
|
9f3d12dacb
|
Web: Files: added table-view to files module
|
2021-07-15 13:45:04 +03:00 |
|
|
|
2d75554b0d
|
DbContext: optimization
|
2021-07-15 13:07:47 +03:00 |
|
|
|
568aa61071
|
Web: Table: refactoring
|
2021-07-15 10:57:06 +03:00 |
|
|
|
e9af9374ca
|
Web: Files: hidden annoying loader on first load
|
2021-07-14 17:37:30 +03:00 |
|
|
|
1ebc588a93
|
Web: Bumped version to 1.0.0
|
2021-07-14 13:26:36 +03:00 |
|
|
|
ad57feecd8
|
Log: fix configuring
|
2021-07-13 21:17:18 +03:00 |
|
|
|
20234a0f31
|
Web: Files: lowercase banner image
|
2021-07-13 12:58:24 +03:00 |
|
|
|
3dddd9abce
|
Web: Table: changed the logic of work
|
2021-07-13 11:12:22 +03:00 |
|
|
|
08a380d5aa
|
Web: Table: changed the logic of work
|
2021-07-13 11:07:50 +03:00 |
|
|
|
cb8d225707
|
Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
# products/ASC.Files/Client/src/store/index.js
|
2021-07-12 13:08:40 +03:00 |
|
|
|
cc2377aa33
|
Merge branch 'develop' into feature/table-view
|
2021-07-12 11:19:59 +03:00 |
|
|
|
8388a4e306
|
Merge branch 'develop' into feature/personal
|
2021-07-12 10:56:30 +03:00 |
|
|
|
354b7423ed
|
Files: fixed feed
|
2021-07-11 18:22:18 +03:00 |
|
|
|
28c0dced54
|
Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal
|
2021-07-09 18:50:04 +03:00 |
|
|
|
fccdd5f97a
|
Web: Files: fixed translations
|
2021-07-09 18:49:57 +03:00 |
|
|
|
d8612e2e01
|
Hide Privacy Rooms on personal
|
2021-07-09 18:41:07 +03:00 |
|
|
|
1bfeef948f
|
Web: Files: SelectFolderInput: Added missing props.
|
2021-07-09 17:23:29 +03:00 |
|
|
|
ee544dcde5
|
Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal
|
2021-07-09 17:02:01 +03:00 |
|
|
|
d14655900c
|
Web: Files: fixed
|
2021-07-09 17:01:48 +03:00 |
|
|
|
4cd1b3fa75
|
Web: People: Applied prettier style fix
|
2021-07-09 16:15:13 +03:00 |
|
|
|
dde99b792a
|
Web: Files: Applied prettier style fix
|
2021-07-09 16:13:50 +03:00 |
|
|
|
e0b37cfd1b
|
Fix Cancel click on edit profile on personal
|
2021-07-09 15:30:32 +03:00 |
|
|
|
f08bd76e74
|
Merge branch 'feature/file-folder-selectors' of github.com:ONLYOFFICE/AppServer into feature/file-folder-selectors
|
2021-07-09 14:54:51 +03:00 |
|
|
|
a491b1879a
|
Web: Files: SelectFileDialog: Added possibility to pass children.
|
2021-07-09 14:53:41 +03:00 |
|
|
|
39b7163267
|
Web: Files: added new table cells, fixed table styles
|
2021-07-09 13:39:09 +03:00 |
|
|
|
1a06bd6a83
|
Web: Files: hid inLoad log
|
2021-07-09 12:00:05 +03:00 |
|
|
|
64f455eb59
|
Web: init table view
|
2021-07-09 11:59:20 +03:00 |
|
|
|
dc94e29af7
|
Web: Files: expose SelectFolderDialog
|
2021-07-09 10:48:09 +03:00 |
|
|
|
80947ef342
|
Web: Files: get auth store
|
2021-07-09 10:47:36 +03:00 |
|
|
|
a8f49a74d1
|
Merge branch 'feature/file-folder-selectors' of github.com:ONLYOFFICE/AppServer into feature/file-folder-selectors
|
2021-07-09 09:54:22 +03:00 |
|
|
|
e2d80ff306
|
Web: Files: Added default value.
|
2021-07-08 23:18:43 +03:00 |
|
|
|
90450a79aa
|
Web:Files: Deleted useless code & Refactoring.
|
2021-07-08 23:08:16 +03:00 |
|
|
|
458153f68f
|
Web: Files: Rename Files.
|
2021-07-08 22:52:10 +03:00 |
|
|
|
044c1155b1
|
WEb: Files: SelectFolderInput/SelectFileInput: Rename classes.
|
2021-07-08 22:31:50 +03:00 |
|
|
|
71e511c714
|
Merge branch 'feature/file-folder-selectors' of github.com:ONLYOFFICE/AppServer into feature/file-folder-selectors
|
2021-07-08 17:17:16 +03:00 |
|
|
|
fcea13a983
|
Web: Files: SelectFileInput: Deleted useless parameters.
|
2021-07-08 17:01:36 +03:00 |
|
|
|
9906380a96
|
Web: Files: Return folder icon to the files module.
|
2021-07-08 16:22:32 +03:00 |
|
|
|
6e041aa594
|
Merge branch 'feature/file-folder-selectors' of github.com:ONLYOFFICE/AppServer into feature/file-folder-selectors
|
2021-07-08 15:40:09 +03:00 |
|
|
|
966e6656cf
|
Web: Files: Deleted useless code.
|
2021-07-08 15:35:03 +03:00 |
|
|
|
2763650de8
|
Merge branch 'feature/file-folder-selectors' of github.com:ONLYOFFICE/AppServer into feature/file-folder-selectors
|
2021-07-08 15:31:17 +03:00 |
|
|
|
4f27876b54
|
Web: Files: Fixed styles.
|
2021-07-08 15:30:40 +03:00 |
|
|
|
b7aae0c1c2
|
WEb: Files: Deleted useless console.log.
|
2021-07-08 15:13:59 +03:00 |
|
|
|
713af18dfe
|
Merge branch 'feature/file-folder-selectors' of github.com:ONLYOFFICE/AppServer into feature/file-folder-selectors
|
2021-07-08 15:13:45 +03:00 |
|
|
|
a2460959c9
|
Web: Files: Deleted useless request (optimization).
|
2021-07-08 15:09:42 +03:00 |
|
|
|
515cf80e45
|
Web: Files: fixed typo
|
2021-07-08 14:41:15 +03:00 |
|
|
|
3556497de6
|
Merge branch 'develop' into feature/personal
|
2021-07-08 14:38:26 +03:00 |
|
|
|
79962c867b
|
Merge branch 'feature/file-folder-selectors' of github.com:ONLYOFFICE/AppServer into feature/file-folder-selectors
|
2021-07-08 14:22:58 +03:00 |
|
|
|
48ea45fa3b
|
Web: Files: get auth store
|
2021-07-08 14:22:30 +03:00 |
|
|
|
b0604da79b
|
Web: Files: expose SelectFileDialog
|
2021-07-08 14:13:20 +03:00 |
|
|
|
57bba777dc
|
Web: Files: Removed icons (32, 64, 96 sizes) to the root folder.
|
2021-07-08 14:08:44 +03:00 |
|
|
|
d141e6cb5b
|
Web: Files: Refactoring & deleted useless code.
|
2021-07-08 13:51:14 +03:00 |
|
|
|
08d3e9df5e
|
Web: Files: Optimization: deleted getFiles function.
|
2021-07-08 13:25:24 +03:00 |
|
|
|
b7190218c3
|
Web: Files: Refactoring & optimization.
|
2021-07-08 12:55:10 +03:00 |
|
|
|
3d8213db8b
|
Web: Files: Deleted useless code.
|
2021-07-07 18:03:07 +03:00 |
|
|
|
7f42b5bdfd
|
Web: Files: Fixed translations, added common translation.
|
2021-07-07 17:56:10 +03:00 |
|
|
|
b1029b7e9e
|
Web: Files: Fixed icon path, deleted icon from files module.
|
2021-07-07 17:33:12 +03:00 |
|
|
|
037c7cd256
|
Web:Files: Added translations for empty list.
|
2021-07-07 17:26:24 +03:00 |
|
|
|
4829db5490
|
Web: Files: Return translations.
|
2021-07-07 17:05:00 +03:00 |
|
|
|
ce2741acd6
|
Web:Files: Added loader for aside panel.
|
2021-07-07 12:00:46 +03:00 |
|
|
|
783fbb2774
|
Web: Files: Deleted useless code.
|
2021-07-07 11:45:11 +03:00 |
|
|
|
c5b409a571
|
Merge branch 'develop' into feature/file-folder-selectors
|
2021-07-07 11:41:45 +03:00 |
|
|
|
ecd9fd26ce
|
Web: Files: SelectFileDialog: Refactoring.
|
2021-07-07 11:33:29 +03:00 |
|
|
|
3c9fa72225
|
Web: Files: Changed styles.
|
2021-07-07 11:20:50 +03:00 |
|
|
|
1110a578aa
|
WEb: Files: SelectFileDialog: Refactoring.
|
2021-07-07 10:29:58 +03:00 |
|
|
|
d05115a597
|
Web: Files: SelectFileDoalog: Component optimization for aside view.
|
2021-07-07 10:27:18 +03:00 |
|
|
|
7fef814e1b
|
Web: Files: Component optimization & refactoring.
|
2021-07-07 10:12:02 +03:00 |
|
|
|
aa5b65617e
|
Web: Files: Added store for selected file.
|
2021-07-07 09:59:01 +03:00 |
|
|
|
6b99ee4fc1
|
WEb:Files:SelectFolderInput/SelectFolderDialog: Added saving selected folder between other views.
|
2021-07-06 17:33:46 +03:00 |
|
|
|
fed1ece277
|
Web: Files: fixed display of share menu
|
2021-07-06 17:07:56 +03:00 |
|
|
|
376f9c6af1
|
Web: Files:SelectFileDialog: Fixed no re-render for aside view.
|
2021-07-06 16:27:50 +03:00 |
|
|
|
fcf3c2b0cb
|
Web: Files: SelectFolderDialog: added automatic parameter setting when passed id.
|
2021-07-06 16:10:34 +03:00 |
|
|
|
271590b47e
|
Web: Files: SelectFileDialog: Added possibility to pass folder id and expand the folder tree.
|
2021-07-06 16:03:21 +03:00 |
|
|
|
22a66e287c
|
Web: Files: SelectFolderDailog: Removed convertPathParts function to the static.
|
2021-07-06 16:01:36 +03:00 |
|
|
|
899f9d9699
|
Web: Files: SelectFolderInput/SelectFolderDialog: Added the ability to pass id to input, added full path if id was passed. Refactoring.
|
2021-07-06 14:14:38 +03:00 |
|
|
|
99f23471f0
|
WEb: Files: SelectFolderDialog: Added the ability to pass the folder id and expand the folder tree to it.
|
2021-07-06 13:05:15 +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 |
|
|
|
3c3fe37cb2
|
Web:Files: Fixed styles for empty container.
|
2021-07-05 18:33:44 +03:00 |
|
|
|
1eab1bdf31
|
Web: Files: SelectFolderDialog: Fixed.
|
2021-07-05 18:25:48 +03:00 |
|
|
|
a6fdfb7a2b
|
Web: Files: Fixed tree folder body for Ipad.
|
2021-07-05 18:19:09 +03:00 |
|
|
|
49db5f5348
|
Web: Files: fixed campaigns logic
|
2021-07-05 18:00:15 +03:00 |
|
|
|
a3818bf6b7
|
Web: Files: SelectFileDialog: Disabled save button if file was not selected.
|
2021-07-05 17:55:06 +03:00 |
|
|
|
33ce11eab8
|
Web: Files: Removed inputs for select dile and folder to the component.
|
2021-07-05 17:48:21 +03:00 |
|
|
|
951e2fbeaf
|
Web: Files: Removed tree body component.
|
2021-07-05 16:10:51 +03:00 |
|
|
|
2413daa175
|
Web: Files: get campaigns from firebase
|
2021-07-05 15:51:56 +03:00 |
|
|
|
21bb4e619a
|
Web: Files: SelectFileDialog: Refactoring.
|
2021-07-05 13:30:56 +03:00 |
|
|
|
50ea66c6f5
|
Web: SelectFileDialog: Refactoring.
|
2021-07-05 13:26:04 +03:00 |
|
|
|
7a0dfdc1ec
|
Web: Files: SelectFileDialog: Added saving function.
|
2021-07-05 13:18:53 +03:00 |
|
|
|
e822857eb5
|
Web: Files: Added radio/checkbox, added selecting file and save button.
|
2021-07-05 12:54:12 +03:00 |
|
|
|
e47ecb1767
|
Web: Files: Close dialog, when display type was changes.
|
2021-07-05 10:37:38 +03:00 |
|
|
|
b10bbcfc9d
|
Web: Files: SelectFileDialog: Added base selected folder for select file component for aside view.
|
2021-07-05 10:25:38 +03:00 |
|
|
|
6a6fa35ab8
|
Web: Files: Added styles for input.
|
2021-07-05 09:50:12 +03:00 |
|
|
|
ffb1e32c23
|
Web: Files: SelectFileDialog: Added empty container to the files list.
|
2021-07-02 20:53:41 +03:00 |
|
|
|
577a720691
|
WEb:Files: Removed translations for empty header container from files to root.
|
2021-07-02 20:52:48 +03:00 |
|
|
|
56768292e0
|
Web: Files: SelectFileDialog/SelectFileInput: Added loader text.
|
2021-07-02 20:00:19 +03:00 |
|
|
|
27963e6ace
|
WEb: Added prop types and refactoring.
|
2021-07-02 19:40:15 +03:00 |
|
|
|
719fb969c1
|
Web: Files: SelectFileDialog: Deleted useless code.
|
2021-07-02 18:46:47 +03:00 |
|
|
|
a325507b0e
|
WEb: SelectFileFolder: Added custom types of files.
|
2021-07-02 18:35:38 +03:00 |
|
|
|
8811bf1d1f
|
Web: Files: fixed ThirdPartyList width
|
2021-07-02 18:02:56 +03:00 |
|
|
|
71608b1a1b
|
Web: Files: show banner only for personal
|
2021-07-02 16:42:43 +03:00 |
|
|
|
b3fd47a216
|
Merge branch 'feature/CampaignsBanner' of github.com:ONLYOFFICE/AppServer into feature/personal
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/index.js
|
2021-07-02 16:42:05 +03:00 |
|
|
|
dfaaf254e4
|
Web: Files: consecutive ads
|
2021-07-02 16:39:10 +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 |
|
|
|
87c556ec85
|
Web: Files: Deleted icons 24px size.
|
2021-07-02 16:16:52 +03:00 |
|
|
|
dd94145f3b
|
WEb: Files: Fixed styles.
|
2021-07-02 16:12:38 +03:00 |
|
|
|
da924cc3b3
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/CampaignsBanner
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/index.js
|
2021-07-02 16:12:06 +03:00 |
|
|
|
658b7052c3
|
Web: Client: About: Removed useless component
|
2021-07-02 15:42:04 +03:00 |
|
|
|
77606f11c1
|
Web: Files: Removed icons 24 size to the root folder.
|
2021-07-02 15:36:58 +03:00 |
|
Artem Tarasov
|
8abb14c9c5
|
Merge branch 'feature/translations-loaders' of github.com:ONLYOFFICE/AppServer into feature/translations-loaders
|
2021-07-02 14:55:01 +03:00 |
|
Artem Tarasov
|
88ca0fb0af
|
Web: Files: fixed selection
|
2021-07-02 14:54:12 +03:00 |
|
|
|
2a44887b22
|
Web: hid temp loaders
|
2021-07-02 14:28:11 +03:00 |
|
|
|
45920f7535
|
Web: fixed MainButton loader
|
2021-07-02 14:05:38 +03:00 |
|
|
|
5e97c7d287
|
WEb: Files: SelectFolderDialog: Added based selected folder.
|
2021-07-02 13:51:05 +03:00 |
|
|
|
aa93554785
|
Web: Files: Fixed not showing files, when latest folder was empty.
|
2021-07-02 13:50:35 +03:00 |
|
|
|
4f9e03212f
|
Web: Files: added filter cleaning
|
2021-07-02 13:44:58 +03:00 |
|
|
|
81f93c3640
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/CampaignsBanner
|
2021-07-02 13:22:40 +03:00 |
|
|
|
c940aae128
|
Web: refactoring translation loaders
|
2021-07-02 12:25:36 +03:00 |
|
|
|
ae9a3b7886
|
Web: Settings: SelectFolder/SelectFolderInput: Added aside and modal view.
|
2021-07-02 11:27:28 +03:00 |
|
|
|
94b6783ddc
|
Web: Files: Removed scrollbar to the FolderTreeBody, added height content custom parameters.
|
2021-07-02 10:25:42 +03:00 |
|
|
|
b68b9763f0
|
Web: Files: SelectDolderDialog: Added scrollbar to the modal view dialog.
|
2021-07-01 21:03:21 +03:00 |
|
|
|
0d4159a907
|
Web: Files: Removed icon to common folder.
|
2021-07-01 19:18:24 +03:00 |
|
|
|
c9665cf692
|
Web: Files: SelectFileDialog/SelectFileInput: Added custom header.
|
2021-07-01 18:47:55 +03:00 |
|
|
|
996e1d6086
|
Web: Files: Added border to the SelectFileDialog.
|
2021-07-01 18:35:17 +03:00 |
|
|
|
c65771b3a8
|
Web: Files: SelectFileDialog/SelectFileInput: Added latest selected folder.
|
2021-07-01 17:43:44 +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 |
|
|
|
b195036cd0
|
Web: People: added withLoader HOC to Section Header
|
2021-07-01 16:43:42 +03:00 |
|
NikolayRechkin
|
56c0d8dccd
|
Calendar: core: fix
|
2021-07-01 16:20:32 +03:00 |
|
|
|
c63287a1cd
|
Web: Files: SelectFileInput: Refactoring.
|
2021-07-01 15:58:36 +03:00 |
|
|
|
cfe2ad8a14
|
Web: Files: Added translations.
|
2021-07-01 15:58:04 +03:00 |
|
|
|
13acc5f511
|
Web: Files: added banner store
|
2021-07-01 15:53:28 +03:00 |
|
|
|
abfcba8993
|
Web: People: added withLoader HOC to MainButton
|
2021-07-01 15:48:26 +03:00 |
|
|
|
9754b50178
|
Web: Files: Added styles.
|
2021-07-01 15:45:05 +03:00 |
|
|
|
574fb26838
|
Web: Settings: Fixed imports.
|
2021-07-01 15:40:41 +03:00 |
|
|
|
28451417dd
|
Web :Files: SelectFileInput: Added styles to separate file.
|
2021-07-01 15:34:34 +03:00 |
|
|
|
b4fef17807
|
Web: Files: Added SelectFileInput.
|
2021-07-01 15:32:12 +03:00 |
|
|
|
568aeb86af
|
Web: Files: Added SelectFileDialog component.
|
2021-07-01 15:31:41 +03:00 |
|
|
|
ee35648212
|
Web: Files: FolderTreeBody: Fixed styles.
|
2021-07-01 15:23:06 +03:00 |
|
|
|
57276f308c
|
Web: Files: SelectFolderDialog: Deleted useless code.
|
2021-07-01 15:13:23 +03:00 |
|
|
|
34f536b1e5
|
Web: Files: SelectFolderDialog: Added last selected folder.
|
2021-07-01 15:12:50 +03:00 |
|
|
|
8776c45895
|
Web: Files: fixed ThirdPartyList width
|
2021-07-01 14:37:09 +03:00 |
|
|
|
bed81a48d9
|
Web: Files: Added "certain folder" parameter.
|
2021-07-01 13:55:20 +03:00 |
|
|
|
3b4477e548
|
Web: Files: Added parameter "without provider" to the tree folders.
|
2021-07-01 13:50:13 +03:00 |
|
|
|
57550164ed
|
Web: Files: fixed banner visibility
|
2021-07-01 13:46:44 +03:00 |
|
|
|
15a268f83b
|
Web: Settings: Removed icons to common folder.
|
2021-07-01 13:38:24 +03:00 |
|
|
|
50d9d9113f
|
Web: Files: fixed files selection
|
2021-07-01 13:15:10 +03:00 |
|
|
|
e08630f740
|
Web: Files: Added StyledPanels.
|
2021-07-01 13:14:52 +03:00 |
|
|
|
a7d56b56f2
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/CampaignsBanner
|
2021-07-01 13:12:18 +03:00 |
|
|
|
5a07094755
|
Web: Files: added banner loader
|
2021-07-01 13:10:45 +03:00 |
|
|
|
3fa967fd39
|
Web: Files: Added styles to separate file.
|
2021-07-01 13:03:16 +03:00 |
|
|
|
e12db8fe11
|
Web: Files: Added SelectFolderInput component.
|
2021-07-01 12:59:43 +03:00 |
|
|
|
ac59a0d3bb
|
Web: Files: SelectFileDialog: Renamed parameters.
|
2021-07-01 12:54:47 +03:00 |
|
|
|
2771ff504d
|
Web: Files: Added SelectFolderDialog and FolderTreeBody, and translations for them.
|
2021-07-01 12:50:28 +03:00 |
|
|
|
7b3f411605
|
Web: Files: fixed scroll
|
2021-07-01 12:50:01 +03:00 |
|
|
|
cfeeb6c17b
|
Web: Files: fixed privacy icons styles
|
2021-07-01 12:35:06 +03:00 |
|
NikolayRechkin
|
0dba0bb76f
|
Calendar: core: fix
|
2021-07-01 12:15:59 +03:00 |
|
|
|
f0c971dd02
|
Web: Files: added campaigns banner
|
2021-07-01 11:26:52 +03:00 |
|
|
|
c05d05bab2
|
Merge branch 'develop' into feature/privacy-rooms-page
|
2021-07-01 09:13:58 +03:00 |
|
|
|
bcf7ceb568
|
Merge branch 'develop' into feature/translations-loaders
# Conflicts:
# packages/asc-web-common/components/Loaders/index.js
|
2021-07-01 09:13:17 +03:00 |
|
|
|
4be9f847fa
|
crm: fixed sql
|
2021-06-30 19:55:20 +03:00 |
|
|
|
b6b1c72769
|
core: added new ThenBy linq extension. crm: fixed sql
|
2021-06-30 19:08:41 +03:00 |
|
|
|
2c1bdf086a
|
Web: People: added loaders to people translations
|
2021-06-30 18:29:06 +03:00 |
|
|
|
c93a4eda8e
|
Merge branch 'develop' into feature/privacy-rooms-page
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
|
2021-06-30 17:20:54 +03:00 |
|
Artem Tarasov
|
e7e0f55403
|
Web: Files: deleted unnecessary code
|
2021-06-30 17:06:57 +03:00 |
|
Artem Tarasov
|
ef25c07ddc
|
Web: Common: FilterInput: fixed transfer viewSettings
|
2021-06-30 17:05:11 +03:00 |
|
NikolayRechkin
|
2e2bcfa35e
|
Calendar: core: fix
|
2021-06-30 16:36:45 +03:00 |
|
|
|
69889cab4c
|
Merge branch 'develop' into feature/privacy-rooms-page
# Conflicts:
# packages/asc-web-common/components/PageLayout/index.js
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/helpers/constants.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
|
2021-06-30 16:28:37 +03:00 |
|
|
|
1083fd8416
|
Merge branch 'develop' into feature/personal
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
|
2021-06-30 16:09:53 +03:00 |
|
Artem Tarasov
|
0f19f240d1
|
Web: Files: fixed reset selection
|
2021-06-30 15:02:29 +03:00 |
|
|
|
d9eca86efa
|
Web: People: added tReady to file dialogs
|
2021-06-30 14:11:52 +03:00 |
|
|
|
f905d72caa
|
Web: Files: fixed article max width
|
2021-06-30 13:58:00 +03:00 |
|
Artem Tarasov
|
4f963784d3
|
Merge branch 'develop' into feature/thumbnails
|
2021-06-30 13:47:41 +03:00 |
|
|
|
f915deeaf0
|
Web: Files: added translation loaders to the file module
|
2021-06-30 12:55:52 +03:00 |
|
Artem Tarasov
|
51e17e5510
|
Web: Files: fixed reset selection when open aside
|
2021-06-30 12:55:10 +03:00 |
|
|
|
bf31efc939
|
Files: removed ItemDictionary
|
2021-06-30 12:39:08 +03:00 |
|
|
|
41f7a87ad1
|
Web: Files: added tReady to file panels
|
2021-06-30 10:29:48 +03:00 |
|
|
|
fff65d1ee9
|
Web: Files: added tReady to file dialogs
|
2021-06-30 10:28:13 +03:00 |
|
NikolayRechkin
|
5060e81b5f
|
Calendar: core: api
|
2021-06-30 09:37:17 +03:00 |
|
|
|
67f3782a41
|
Web: Files: fixed dragging
|
2021-06-29 18:57:55 +03:00 |
|
|
|
f327f42bf8
|
Web: Common: added filed encrypted to startUploadSession function
|
2021-06-29 17:54:24 +03:00 |
|
Artem Tarasov
|
9de3ebe20b
|
Web: Files: deleted unnecessary code
|
2021-06-29 17:00:52 +03:00 |
|
Artem Tarasov
|
6466432c9c
|
Merge branch 'develop' into feature/thumbnails
|
2021-06-29 15:49:11 +03:00 |
|
Artem Tarasov
|
3385d367d4
|
Web: Files: refactoring
|
2021-06-29 15:48:17 +03:00 |
|
Artem Tarasov
|
0cae3990cc
|
Web: Files: added usage ViewSelector
|
2021-06-29 15:32:48 +03:00 |
|
|
|
b0f64ca924
|
Merge branch 'develop' into feature/personal
|
2021-06-29 14:50:51 +03:00 |
|
|
|
9870859fe1
|
Web: Files: fixed dragging
|
2021-06-29 13:36:04 +03:00 |
|
|
|
73cdaad3fb
|
Web: Files: added hiding group file menu
|
2021-06-29 13:13:05 +03:00 |
|
|
|
c6ede6fff7
|
Merge branch 'develop' into feature/remove_itemList
|
2021-06-29 12:47:56 +03:00 |
|
|
|
c906c2c419
|
remove itemList in tests
|
2021-06-29 12:47:32 +03:00 |
|
|
|
6590529260
|
Web: Files: removed margin for privacy folder
|
2021-06-29 12:32:59 +03:00 |
|
