Artem Tarasov
|
7be7073908
|
added styles for border
|
2020-07-16 17:40:45 +03:00 |
|
Artem Tarasov
|
8e817c7c91
|
Merge branch 'master' into feature/input-file
|
2020-07-16 16:42:50 +03:00 |
|
Artem Tarasov
|
b599d5f163
|
added styles for property size
|
2020-07-16 16:38:34 +03:00 |
|
|
679e77a3ea
|
Update yarn.lock files
|
2020-07-16 16:09:09 +03:00 |
|
Vladislav Makhov
|
20fcb5dab7
|
Merge branch 'master' into feature/field-container-label-view
|
2020-07-16 16:07:48 +03:00 |
|
|
098e872a38
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
|
2020-07-16 15:58:43 +03:00 |
|
|
42b0275f5c
|
web: components: bump version
|
2020-07-16 15:54:52 +03:00 |
|
|
f0b50f7185
|
web: common: bump version
|
2020-07-16 15:54:24 +03:00 |
|
|
ec8c6a5ddb
|
Fixed security vulnerability in lodash
|
2020-07-16 15:54:04 +03:00 |
|
Vladislav Makhov
|
95f96d9a7c
|
web: components: bump version
|
2020-07-16 15:44:46 +03:00 |
|
Vladislav Makhov
|
01867762f0
|
Update README.md
|
2020-07-16 15:44:28 +03:00 |
|
Vladislav Makhov
|
587058c4c1
|
Add visibility of field label section
|
2020-07-16 15:44:15 +03:00 |
|
|
78b10ab893
|
Update yarn.lock files
|
2020-07-16 14:55:40 +03:00 |
|
|
0e351b88d7
|
web: components: bump version
|
2020-07-16 14:41:56 +03:00 |
|
|
8d0d5fd908
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/ASC.Files.Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/ASC.Files.Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs
# web/ASC.Web.Components/package.json
|
2020-07-16 14:41:32 +03:00 |
|
Vladislav Makhov
|
85dcdb5689
|
Merge branch 'master' into feature/password-input-simple-view
|
2020-07-16 14:32:11 +03:00 |
|
Vladislav Makhov
|
8a907a0df7
|
Fix hover color
|
2020-07-16 14:27:42 +03:00 |
|
Artem Tarasov
|
045688390b
|
Merge branch 'master' into feature/input-file
|
2020-07-16 13:09:37 +03:00 |
|
Artem Tarasov
|
4fb3b16fd2
|
add scale
|
2020-07-16 13:08:09 +03:00 |
|
Artem Tarasov
|
e42d5d2c3f
|
icon position fix
|
2020-07-16 12:37:22 +03:00 |
|
Artem Tarasov
|
b5c066c957
|
fixed Loader size and position
|
2020-07-16 12:31:18 +03:00 |
|
Artem Tarasov
|
5a5ebe651e
|
fixed Loader in Button and propTypes
|
2020-07-16 12:10:50 +03:00 |
|
Vladislav Makhov
|
d258a640c0
|
web: components: bump version
|
2020-07-16 11:59:31 +03:00 |
|
Vladislav Makhov
|
fd6d90a797
|
Fix styles
|
2020-07-16 11:59:17 +03:00 |
|
Vladislav Makhov
|
423f148cfb
|
Update icon pic
|
2020-07-16 11:58:58 +03:00 |
|
Artem Tarasov
|
eb97b2f212
|
created Component FileInput
|
2020-07-16 11:42:10 +03:00 |
|
Alexey
|
b4304d8526
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-07-16 11:33:17 +03:00 |
|
Vladislav Makhov
|
2ffb65eec8
|
Fix icon
|
2020-07-16 10:53:12 +03:00 |
|
Vladislav Makhov
|
545a5d0431
|
Update README.md
|
2020-07-16 10:38:13 +03:00 |
|
Vladislav Makhov
|
2a4df5fd55
|
Add simple view option
|
2020-07-16 10:30:30 +03:00 |
|
|
576e8a6de0
|
Files: revert
|
2020-07-16 00:49:25 +03:00 |
|
|
f18f14fa34
|
DocumentService: fix
|
2020-07-16 00:36:48 +03:00 |
|
|
cb1bf99393
|
Files: fix
|
2020-07-16 00:25:19 +03:00 |
|
|
f03ab16127
|
Converter: fix
|
2020-07-16 00:08:28 +03:00 |
|
|
d99f6ff0a5
|
Files: additional logging
|
2020-07-15 23:39:43 +03:00 |
|
Artem Tarasov
|
cdf487bc74
|
Merge branch 'master' into feature/Button-large
|
2020-07-15 22:17:48 +03:00 |
|
Artem Tarasov
|
e2b9789e6f
|
added test for large prop
|
2020-07-15 19:14:00 +03:00 |
|
Alexey
|
3fd30e7a83
|
web: common: bump version
|
2020-07-15 19:06:14 +03:00 |
|
Alexey
|
965b2e97d3
|
Web: Common: Tile view temporarily hidden
|
2020-07-15 19:05:40 +03:00 |
|
Artem Tarasov
|
c6b81a3aac
|
added description property size="large" in readme
|
2020-07-15 19:00:36 +03:00 |
|
Artem Tarasov
|
550da8cbe7
|
fix padding
|
2020-07-15 18:49:12 +03:00 |
|
|
9ee887d270
|
DocumentService log error
|
2020-07-15 18:06:35 +03:00 |
|
Artem Tarasov
|
3004890d98
|
fixed paddings
|
2020-07-15 17:58:33 +03:00 |
|
|
9d0df35a17
|
DocumentService log error
|
2020-07-15 17:58:12 +03:00 |
|
|
414e17ac1f
|
DocumentService log error
|
2020-07-15 17:40:58 +03:00 |
|
Artem Tarasov
|
4b942c6964
|
added min-width
|
2020-07-15 17:34:01 +03:00 |
|
Vladislav Makhov
|
e5bdfe32d7
|
Merge branch 'master' into feature/text-input-large
|
2020-07-15 17:24:33 +03:00 |
|
Artem Tarasov
|
db7669eccd
|
added button size large in all.button.stories.js
|
2020-07-15 17:20:11 +03:00 |
|
Artem Tarasov
|
4ee0cee88d
|
added large button size
|
2020-07-15 17:17:37 +03:00 |
|
Vladislav Makhov
|
5393bec4af
|
web: components: bump version
|
2020-07-15 17:17:18 +03:00 |
|
Vladislav Makhov
|
1c0db2edfd
|
Update README.md
|
2020-07-15 17:09:29 +03:00 |
|
Vladislav Makhov
|
eac05e5750
|
Add large prop
|
2020-07-15 17:07:58 +03:00 |
|
|
a54be3b64c
|
Merge branch 'master' into feature/files
|
2020-07-15 16:57:14 +03:00 |
|
Vladislav Makhov
|
a7b0968252
|
Add social buttons mock
|
2020-07-15 16:18:09 +03:00 |
|
Alexey
|
dd000d197d
|
Web: Common: Removed viewSelector from people module
|
2020-07-15 16:12:10 +03:00 |
|
|
e10ac2ccfa
|
BaseStartup: refactoring
|
2020-07-15 15:33:44 +03:00 |
|
|
baa71247d8
|
Merge branch 'master' into feature/general-startup
|
2020-07-15 13:06:32 +03:00 |
|
|
533935906f
|
Resource: fix
|
2020-07-15 12:55:31 +03:00 |
|
Vladislav Makhov
|
55a0c01183
|
Fix styles
|
2020-07-15 10:12:49 +03:00 |
|
Alexey
|
b573555024
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-07-15 08:00:04 +03:00 |
|
Alexey
|
62ed90e9a0
|
web: common: bump version
|
2020-07-15 07:59:56 +03:00 |
|
Alexey
|
e886437d83
|
Web: Files: Fix tile styles
|
2020-07-15 07:30:59 +03:00 |
|
Vladislav Makhov
|
5af854226a
|
Fix styles
|
2020-07-14 13:40:56 +03:00 |
|
Vladislav Makhov
|
806f64abae
|
Fix styles and responsive layout
|
2020-07-14 12:55:09 +03:00 |
|
Vladislav Makhov
|
505e98b1a1
|
Add textAlign prop (left as default)
|
2020-07-14 12:54:11 +03:00 |
|
|
88e932a0a7
|
Merge branch 'master' into feature/files
|
2020-07-13 16:46:42 +03:00 |
|
Vladislav Makhov
|
3b8c2f0e69
|
Fix responsive layout for start login page
Move header logo to a separate component
|
2020-07-13 16:20:02 +03:00 |
|
Alexey
|
41f59c9130
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-07-13 16:00:51 +03:00 |
|
Alexey
|
e5b71cff4f
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/files/actions.js
|
2020-07-13 16:00:32 +03:00 |
|
Ilya Oleshko
|
c9eb590f1e
|
web: common: bump version
|
2020-07-13 15:56:36 +03:00 |
|
Ilya Oleshko
|
2d8b694374
|
Web: Common: Fixed order of returning filter props, add new
|
2020-07-13 15:56:24 +03:00 |
|
Alexey
|
8612f32ae5
|
web: common: bump version
|
2020-07-13 15:54:43 +03:00 |
|
Alexey
|
665915804e
|
Web: Common: Fixed mobile view selector
|
2020-07-13 15:53:29 +03:00 |
|
Vladislav Makhov
|
001c8c2620
|
Fix responsive layout for textarea
|
2020-07-13 14:16:36 +03:00 |
|
Vladislav Makhov
|
7dd8308069
|
Fix height scale
|
2020-07-13 14:15:44 +03:00 |
|
Vladislav Makhov
|
c085d3c00d
|
Fix styles
|
2020-07-13 12:28:13 +03:00 |
|
Alexey
|
3ca42459a1
|
Web: Files: Separated the logic of the Filter and ViewSelector
|
2020-07-13 12:10:40 +03:00 |
|
|
589eaa17f1
|
web: components: bump version
|
2020-07-12 20:48:49 +03:00 |
|
|
4efe98ff9e
|
Revert "Fix Re-rendered because of props changes: props.onClick"
This reverts commit 7c8f84ab8b .
|
2020-07-12 20:48:15 +03:00 |
|
Vladislav Makhov
|
52dde654b8
|
Fix validate
|
2020-07-10 15:15:38 +03:00 |
|
Vladislav Makhov
|
22029e6468
|
Fix styles
|
2020-07-10 15:13:08 +03:00 |
|
|
58a9fc188c
|
web: components: bump version
|
2020-07-10 14:39:52 +03:00 |
|
|
6f316242cb
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-07-10 14:38:44 +03:00 |
|
Ilya Oleshko
|
87a892ee73
|
web: components: bump version
|
2020-07-10 14:39:59 +03:00 |
|
Ilya Oleshko
|
62bdbf68a3
|
Web: Components: Fixed ContextMenuButton, removed bindings and added event property for onClick
|
2020-07-10 14:39:49 +03:00 |
|
Vladislav Makhov
|
900755fb37
|
Rename translate parameter
|
2020-07-10 14:21:28 +03:00 |
|
|
7c8f84ab8b
|
Fix Re-rendered because of props changes: props.onClick
|
2020-07-10 14:15:30 +03:00 |
|
Vladislav Makhov
|
4e37091d9b
|
Add email field validation
|
2020-07-10 14:02:44 +03:00 |
|
Vladislav Makhov
|
b3d2db8d10
|
Add error messages
|
2020-07-10 13:48:54 +03:00 |
|
Vladislav Makhov
|
b508ca2cd4
|
Render fixes
|
2020-07-10 13:02:44 +03:00 |
|
Vladislav Makhov
|
229b63e04d
|
Fix button view in aside modal
|
2020-07-10 13:00:59 +03:00 |
|
Vladislav Makhov
|
81f6a041c7
|
return 100% width
|
2020-07-10 10:46:22 +03:00 |
|
Alexey
|
e07cfee5a9
|
web: components: bump version
|
2020-07-10 10:37:53 +03:00 |
|
Alexey
|
132242b06a
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-07-10 08:54:01 +03:00 |
|
|
954551873f
|
web: common: bump version
|
2020-07-09 22:27:27 +03:00 |
|
|
d0f66c66e7
|
Web: Files: Implemented CompleteVersion
|
2020-07-09 22:26:43 +03:00 |
|
SuhorukovAnton
|
f8e42cbd08
|
api-defaultvalue: add JsonPropertyNames
|
2020-07-09 22:06:08 +03:00 |
|
SuhorukovAnton
|
28e70e91f6
|
api-defaultvalue: add JsonPropertyNames
|
2020-07-09 18:37:36 +03:00 |
|
Vladislav Makhov
|
d8a97b0457
|
Add translation for placeholder
|
2020-07-09 11:30:13 +03:00 |
|
|
5988855b61
|
Fix License
|
2020-07-08 18:30:23 +03:00 |
|
Vladislav Makhov
|
73e189583e
|
Fix validate
|
2020-07-08 18:28:04 +03:00 |
|
Vladislav Makhov
|
142f4c10fa
|
Update README.md
|
2020-07-08 18:27:50 +03:00 |
|
Vladislav Makhov
|
2013cf61da
|
Add hasError prop
|
2020-07-08 16:57:34 +03:00 |
|
SuhorukovAnton
|
8b5ab8c9a4
|
api-defaultvalue: delete DataContracts
|
2020-07-08 13:10:09 +03:00 |
|
Alexey
|
6435d8759b
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
|
2020-07-08 13:02:01 +03:00 |
|
Vladislav Makhov
|
8c4f94098a
|
Add fields validate
|
2020-07-08 12:47:05 +03:00 |
|
Alexey
|
1a99461091
|
Web: Files: Added file view as tiles
|
2020-07-08 12:26:25 +03:00 |
|
Vladislav Makhov
|
d6ae6ae2c0
|
Fix password tooltip
Add translations
|
2020-07-08 09:41:26 +03:00 |
|
Vladislav Makhov
|
ae7bb806df
|
Add adaptive styles, remove unused code
|
2020-07-08 09:11:51 +03:00 |
|
SuhorukovAnton
|
9d069de30a
|
general-startup: transform GeneralStartup to BaseStartup
|
2020-07-07 23:00:39 +03:00 |
|
|
6b97af6df3
|
web: common: bump version
|
2020-07-07 17:56:02 +03:00 |
|
|
a18212da87
|
Web: Files: added files convert to row, fixed api
|
2020-07-07 17:55:01 +03:00 |
|
Vladislav Makhov
|
200b027092
|
Add translation, fix styles
|
2020-07-07 14:17:26 +03:00 |
|
SuhorukovAnton
|
a43c14dcb3
|
Merge branch 'master' into feature/api-defaultvalue
|
2020-07-07 12:38:35 +03:00 |
|
Vladislav Makhov
|
3016af962c
|
Add input handlers
|
2020-07-07 12:27:01 +03:00 |
|
Vladislav Makhov
|
67cc4f5abc
|
Add props validation
|
2020-07-07 10:43:47 +03:00 |
|
Vladislav Makhov
|
d113f17b2b
|
Add pointer cursor, fix "onRecoverClick" callback event.
|
2020-07-07 10:42:31 +03:00 |
|
|
b4ac3f3113
|
web: common: bump version
|
2020-07-07 10:35:59 +03:00 |
|
|
925654c3f6
|
Web: Common: added convert api
|
2020-07-07 10:27:04 +03:00 |
|
Alexey
|
e7b4727b77
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-07-07 07:45:32 +03:00 |
|
Alexey
|
50ed35c9e5
|
Web: Files: Added folder view as tiles
|
2020-07-07 07:45:22 +03:00 |
|
Vladislav Makhov
|
44c9c728c3
|
Fix title styles
|
2020-07-06 19:19:55 +03:00 |
|
Vladislav Makhov
|
bc2f1fa670
|
add mock on send recover
|
2020-07-06 18:08:47 +03:00 |
|
Vladislav Makhov
|
13a1218dd9
|
fix z-index
|
2020-07-06 16:12:19 +03:00 |
|
Vladislav Makhov
|
209262b622
|
Add "Register", fix styles
|
2020-07-06 16:06:37 +03:00 |
|
Vladislav Makhov
|
63dc366083
|
Remove unused component from import
|
2020-07-06 16:04:34 +03:00 |
|
SuhorukovAnton
|
00558dd95f
|
general-startup: fix
|
2020-07-06 10:56:17 +03:00 |
|
|
0e02ee4ec3
|
web: components: bump version
|
2020-07-06 10:29:08 +03:00 |
|
|
d3dc618ad9
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-07-06 10:28:44 +03:00 |
|
|
02c40ad657
|
Web: Files: moved dragging prop to redux, added onDrop function to TreeFolders
|
2020-07-06 10:28:31 +03:00 |
|
|
51a993b2ea
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
# products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
# web/ASC.Web.Components/package.json
|
2020-07-05 14:35:14 +03:00 |
|
SuhorukovAnton
|
71d90ebfa2
|
general-startup: fix
|
2020-07-03 18:57:59 +03:00 |
|
Vladislav Makhov
|
f170ce525d
|
Add translation for recover access
|
2020-07-03 16:28:20 +03:00 |
|
SuhorukovAnton
|
2f5491f1ba
|
general-startup: first version
|
2020-07-03 14:47:27 +03:00 |
|
|
b534cb1d1f
|
web: components: bump version
|
2020-07-03 11:43:06 +03:00 |
|
|
023b5169b8
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-07-03 11:42:09 +03:00 |
|
|
903d474194
|
Web: Components: fixed progressBar value
|
2020-07-03 11:41:38 +03:00 |
|
Vladislav Makhov
|
2e00b4533f
|
Add console.log
|
2020-07-03 11:40:12 +03:00 |
|
Vladislav Makhov
|
aa4a8e4699
|
Add "recover access" functionality
|
2020-07-03 10:30:38 +03:00 |
|
SuhorukovAnton
|
6647217371
|
api-defaultvalue: fix
|
2020-07-02 23:51:18 +03:00 |
|
NikolayRechkin
|
f9fd3d5122
|
web: common: bump version
|
2020-07-02 17:18:03 +03:00 |
|
NikolayRechkin
|
379974e8f2
|
web: common: added a double tap event
|
2020-07-02 17:17:23 +03:00 |
|
Vladislav Makhov
|
4f27d908f3
|
Redesign styles
|
2020-07-02 11:44:17 +03:00 |
|
NikolayRechkin
|
d4eac18a74
|
web: common: bump version
|
2020-07-02 11:03:21 +03:00 |
|
NikolayRechkin
|
478e03530b
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/AppServer into feature/files
|
2020-07-02 11:03:03 +03:00 |
|
NikolayRechkin
|
1a32e11f2c
|
web: Common: added a touch events
|
2020-07-02 11:02:50 +03:00 |
|
SuhorukovAnton
|
0ec331db76
|
api-defaultvalue: fix
|
2020-06-30 16:56:38 +03:00 |
|
|
cf3ee949da
|
web: common: bump version
|
2020-06-30 15:03:28 +03:00 |
|
|
0025f3b858
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-06-30 15:00:57 +03:00 |
|
|
5c3ff62d2e
|
Web: Files: added badge click event
|
2020-06-30 15:00:44 +03:00 |
|
Vladislav Makhov
|
6015a1d101
|
update prop validation
|
2020-06-30 14:37:43 +03:00 |
|
Vladislav Makhov
|
f7799d3bdb
|
Revert "Hide burger menu on Login Page"
This reverts commit fdd2df9265 .
|
2020-06-30 14:35:13 +03:00 |
|
Vladislav Makhov
|
fdd2df9265
|
Hide burger menu on Login Page
|
2020-06-30 13:18:26 +03:00 |
|
Ilya Oleshko
|
6c07204658
|
web: common: bump version
|
2020-06-30 12:26:21 +03:00 |
|
Ilya Oleshko
|
00d9c26640
|
Web: Common: Fixed itemId check for filter change view
|
2020-06-30 12:26:14 +03:00 |
|
Ilya Oleshko
|
f883297700
|
web: common: bump version
|
2020-06-30 11:43:48 +03:00 |
|
Ilya Oleshko
|
c2a9189d4e
|
Web: Files: Home: Filter: Added viewSettings to SortComboBox for mobile devices
|
2020-06-30 11:43:40 +03:00 |
|
Vladislav Makhov
|
5d9b713859
|
Add possibility to hide password generation button
|
2020-06-30 10:31:12 +03:00 |
|
Vladislav Makhov
|
bea394c230
|
Fix margin top
|
2020-06-30 09:48:06 +03:00 |
|
Alexey
|
8cb95b4a64
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-06-30 09:41:04 +03:00 |
|
Alexey
|
a3dd53878e
|
Web: Files/Common: added ViewSelector component
|
2020-06-30 09:40:09 +03:00 |
|
Vladislav Makhov
|
8742342873
|
Remove cancel button from modal
|
2020-06-30 08:13:12 +03:00 |
|
Vladislav Makhov
|
199d266f18
|
Fix header style in modal window
|
2020-06-30 08:12:21 +03:00 |
|
Vladislav Makhov
|
582f6b1110
|
Fix font style
|
2020-06-30 08:01:54 +03:00 |
|
Vladislav Makhov
|
1ea6db8538
|
Update password field using PasswordInput component
|
2020-06-30 07:28:04 +03:00 |
|
Vladislav Makhov
|
97fa7010ea
|
Set scale prop at the "sign in" button
|
2020-06-30 06:48:14 +03:00 |
|
Vladislav Makhov
|
a93ee38107
|
Rename remember text
|
2020-06-30 06:45:30 +03:00 |
|
Vladislav Makhov
|
fb386a8783
|
Change "forgot password" styles
|
2020-06-30 06:44:08 +03:00 |
|
Vladislav Makhov
|
8eaf1f02b7
|
Make greetingTitle black
|
2020-06-30 06:39:14 +03:00 |
|
Vladislav Makhov
|
df996552c3
|
Make Header component is available on login page
|
2020-06-30 06:26:31 +03:00 |
|
|
6c2352d4e5
|
Merge branch 'master' into feature/files
|
2020-06-29 17:54:33 +03:00 |
|
|
b035a6347e
|
Notify: fix
|
2020-06-29 17:49:15 +03:00 |
|
Vladislav Makhov
|
05263bf36e
|
Remove logo from FormContainer
|
2020-06-29 17:12:32 +03:00 |
|
|
c6975459cb
|
Merge branch 'master' into feature/files
|
2020-06-29 16:54:44 +03:00 |
|
|
feedc8a1b0
|
Core: fix
|
2020-06-29 16:53:55 +03:00 |
|
|
6d05a77b60
|
Merge branch 'master' into feature/files
|
2020-06-29 12:40:47 +03:00 |
|
|
eb6be17333
|
Backup: removed notify reference
|
2020-06-29 12:32:43 +03:00 |
|
|
87f85fdefe
|
Merge branch 'master' into feature/files
|
2020-06-29 09:53:07 +03:00 |
|
|
57454bae0c
|
References updated
|
2020-06-28 16:55:21 +03:00 |
|
|
461fc55f22
|
Merge pull request #45 from ONLYOFFICE/feature/backup
Feature/backup
|
2020-06-28 16:23:36 +03:00 |
|
|
155e0b2c9b
|
Backup: fix
|
2020-06-28 14:46:16 +03:00 |
|
|
2d1d09096c
|
web: common: bump version
|
2020-06-26 17:41:11 +03:00 |
|
|
6bf6a774ef
|
Web: Common: fix hammer off error
|
2020-06-26 17:40:24 +03:00 |
|
|
1626d179ee
|
web: common: bump version
|
2020-06-26 15:59:13 +03:00 |
|
|
6e37032e21
|
web: components: bump version
|
2020-06-26 15:58:43 +03:00 |
|
|
792f8ff7a8
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-06-26 15:55:54 +03:00 |
|
|
0c9fa66e36
|
Web: Common: added new api methods
|
2020-06-26 15:52:46 +03:00 |
|
|
6d40997d09
|
Web: Components: removed badge from tree-menu, fixed tree styles
|
2020-06-26 15:51:47 +03:00 |
|
|
eafafef8df
|
Thumb: fix
|
2020-06-26 11:02:21 +03:00 |
|
|
817d0d1bb1
|
Thumb: fix
|
2020-06-26 11:01:37 +03:00 |
|
|
cfdc6d495e
|
Merge branch 'master' into feature/files
|
2020-06-26 09:46:04 +03:00 |
|
|
29a0e752bb
|
Merge branch 'master' into feature/backup
# Conflicts:
# ASC.Web.sln
# web/ASC.Web.Api/Controllers/PortalController.cs
|
2020-06-25 19:21:42 +03:00 |
|
|
1798e7bb7b
|
web: components: bump version
|
2020-06-25 18:14:06 +03:00 |
|
|
e2a80c0e0c
|
Web: Components: Passed event to onClick handler
|
2020-06-25 18:11:34 +03:00 |
|
|
23945aeb24
|
Api: backup removed
|
2020-06-25 16:25:03 +03:00 |
|
|
b01b3d85f8
|
Backup: fix
|
2020-06-25 16:10:28 +03:00 |
|
|
d53b11967a
|
Merge branch 'master' into feature/backup
|
2020-06-25 15:37:53 +03:00 |
|
|
1871959768
|
fix
|
2020-06-25 15:17:22 +03:00 |
|
|
2fe2c2167b
|
Merge branch 'master' into feature/thumbnails
# Conflicts:
# ASC.Web.sln
|
2020-06-25 15:01:38 +03:00 |
|
|
d14313c6c1
|
References updated
|
2020-06-25 14:38:34 +03:00 |
|