|
|
b8b375a19a
|
Merge pull request #263 from ONLYOFFICE/feature/scroll
fixed scrolling due to footer : ab82be9b3d
|
2022-03-02 16:40:13 +03:00 |
|
|
|
fec77a9e75
|
fixed scrolling due to footer : ab82be9b3d
|
2022-03-02 14:30:57 +03:00 |
|
|
|
f0171cbb18
|
Merge pull request #262 from ONLYOFFICE/feature/anonymus-without-id
new branch + anonymus without id
|
2022-03-02 13:55:20 +03:00 |
|
|
|
8416f36581
|
mobile-upload:centering
|
2022-03-02 13:48:01 +03:00 |
|
|
|
b9f3bfd2e2
|
new branch + anonymus without id
|
2022-03-02 11:16:24 +03:00 |
|
|
|
02b22e9e26
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/mobile-upload
|
2022-03-01 16:01:30 +03:00 |
|
|
|
ded2d19672
|
C# - fix body display
|
2022-03-01 15:45:55 +03:00 |
|
|
|
1d7775f25b
|
C# - Add viewport device display on index page
|
2022-03-01 15:44:00 +03:00 |
|
|
|
23169c6fea
|
block height fix:upload for mobile
|
2022-03-01 10:45:29 +03:00 |
|
|
|
f542e9dcfc
|
csharp:upload for mobile
|
2022-02-28 18:27:42 +03:00 |
|
|
|
2f5b25d6ab
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/jwtHistoryFiles
# Conflicts:
# web/documentserver-example/ruby/Gemfile.lock
|
2022-02-15 16:31:57 +03:00 |
|
|
|
81f8bd1a9b
|
fix help
|
2022-02-11 11:31:00 +03:00 |
|
|
|
c4c819c513
|
format
|
2022-02-11 10:54:03 +03:00 |
|
|
|
03332b3cd9
|
csharp: revert coediting
|
2022-02-11 10:36:48 +03:00 |
|
|
|
ebc864736d
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/jwtHistoryFiles
# Conflicts:
# web/documentserver-example/java/README.md
|
2022-02-11 10:22:04 +03:00 |
|
|
|
af86ec1ca3
|
update submodule
|
2022-02-11 10:19:44 +03:00 |
|
|
|
c663bfe464
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/userInfoGroups
# Conflicts:
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/ExampleData.java
# web/documentserver-example/java/src/main/java/helpers/Users.java
# web/documentserver-example/php/users.php
# web/documentserver-example/python/src/utils/users.py
# web/documentserver-example/ruby/app/models/users.rb
|
2022-02-11 10:14:06 +03:00 |
|
|
|
88b7fbf55c
|
csharp: userInfoGroups
|
2022-02-11 00:43:01 +03:00 |
|
|
|
468488c384
|
note to index page
|
2022-02-09 10:55:02 +03:00 |
|
|
|
20012c7678
|
change note in readme
|
2022-02-09 10:17:36 +03:00 |
|
|
|
382160f2fc
|
Merge remote-tracking branch 'remotes/origin/release/v7.1.0' into develop
# Conflicts:
# web/documentserver-example/csharp-mvc/assets
# web/documentserver-example/csharp/assets
# web/documentserver-example/java-spring/src/main/resources/assets
# web/documentserver-example/java/src/main/resources/assets
# web/documentserver-example/nodejs/public/assets
# web/documentserver-example/php/assets
# web/documentserver-example/python/assets
# web/documentserver-example/ruby/public/assets
|
2022-02-09 10:05:10 +03:00 |
|
|
|
761e578faf
|
update submodule
|
2022-02-07 16:14:53 +03:00 |
|
|
|
6716d38a40
|
support xlsb
|
2022-02-06 11:15:20 +03:00 |
|
|
|
6d71a553be
|
С#: add absolute path support for document history
|
2022-02-01 17:03:16 +03:00 |
|
|
|
fed5598294
|
С#: remove unnecessary construction
|
2022-02-01 16:00:50 +03:00 |
|
|
|
d36fe2466a
|
C#: add time for unique key
|
2022-01-27 11:53:10 +03:00 |
|
|
|
17b5c6e4c9
|
C#: Add history creation for the first version of the file
|
2022-01-27 11:50:30 +03:00 |
|
|
|
29cbe66d09
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/jwtHistoryFiles
|
2022-01-18 18:16:53 +03:00 |
|
|
|
224d2bc570
|
С#: Merge jwt prev + diff
|
2022-01-18 16:25:13 +03:00 |
|
|
|
a900183056
|
Merge pull request #241 from ONLYOFFICE/feature/fileTypeInsteadParsing
Feature/file type instead parsing
|
2022-01-14 16:52:30 +03:00 |
|
|
|
67d34f4bfa
|
format
|
2022-01-14 16:52:12 +03:00 |
|
|
|
065f338a79
|
C#: fix code
|
2022-01-11 18:18:54 +03:00 |
|
|
|
064c0dcc35
|
C#: fix code
|
2022-01-11 16:42:26 +03:00 |
|
|
|
5caaf0b1c6
|
Merge branch 'develop' into feature/jwtHistoryFiles
|
2022-01-10 19:00:27 +03:00 |
|
|
|
1e78da4cfc
|
C#: fix[support old version] fileType instead parsing
|
2022-01-10 18:42:41 +03:00 |
|
|
|
f81ae23a64
|
Merge branch 'feature/jwtHistoryFiles' of github.com:ONLYOFFICE/document-server-integration into feature/jwtHistoryFiles
# Conflicts:
# web/documentserver-example/csharp-mvc/Models/FileModel.cs
# web/documentserver-example/csharp/DocEditor.aspx.cs
# web/documentserver-example/ruby/licenses/3rd-Party.license
|
2022-01-10 17:08:45 +03:00 |
|
|
|
bb28257a2d
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/fileType
# Conflicts:
# web/documentserver-example/php/doceditor.php
|
2022-01-10 16:03:18 +03:00 |
|
|
|
05ea165f77
|
format
|
2022-01-10 16:00:41 +03:00 |
|
|
|
ee674e6a57
|
jwt signature for prev.* files C# (via handler)
|
2022-01-10 12:57:22 +03:00 |
|
|
|
13b3eed5ed
|
fileType instead parsing url to save doc in C# (take fileType out of body)
|
2021-12-24 18:12:40 +03:00 |
|
|
|
425bd81f08
|
fix commit
|
2021-12-22 18:20:29 +03:00 |
|
|
|
096102fa59
|
Merge branch 'develop' into feature/jwtHistoryFiles
|
2021-12-22 17:13:10 +03:00 |
|
|
|
71e1b28f47
|
jwt signature for prev.* files C# (via handler)
|
2021-12-21 17:45:42 +03:00 |
|
|
|
8d194b78a1
|
Update samples
|
2021-12-20 11:29:02 +03:00 |
|
|
|
b8e726a7be
|
Update pptx sample
|
2021-12-20 11:02:24 +03:00 |
|
|
|
ec6ea72069
|
small fixes for readme files
|
2021-12-16 17:51:01 +03:00 |
|
|
|
c6e3af5d3b
|
Merge pull request #236 from ONLYOFFICE/feature/csharp-server-configuration
csharp and csharp-mvc readme
|
2021-12-13 16:59:39 +03:00 |
|
|
|
32ea01784c
|
Merge pull request #234 from ONLYOFFICE/bugfix/group-fix
replace group value null with empty string
|
2021-12-13 16:27:14 +03:00 |
|
|
|
71041fea9f
|
Merge pull request #233 from ONLYOFFICE/feature/pptx-xpath
Feature/pptx xpath
|
2021-12-13 16:16:54 +03:00 |
|
|
|
299a68e0bd
|
Merge pull request #229 from ONLYOFFICE/bugfix/layout-fixes
fix layout
|
2021-12-13 15:42:15 +03:00 |
|
