|
|
b19abbcb36
|
csharp-mvc: convert after uploading only tagged formats
|
2023-11-27 10:44:17 +03:00 |
|
|
|
5ac60bace6
|
Merge pull request #492 from ONLYOFFICE/feature/submit-form
Feature/submit form
|
2023-11-22 11:49:19 +03:00 |
|
|
|
23d8315c37
|
Merge branch 'develop' into feature/csharp-mvc-matrix-formats
|
2023-11-21 15:56:31 +03:00 |
|
|
|
4d49e54129
|
csharp-mvc: added format caching
|
2023-11-21 15:19:24 +03:00 |
|
|
|
bf72a43605
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/submit-form
# Conflicts:
# web/documentserver-example/csharp-mvc/Helpers/Users.cs
# web/documentserver-example/csharp/Users.cs
# 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/src/helpers/ExampleUsers.php
# web/documentserver-example/python/src/utils/users.py
# web/documentserver-example/ruby/app/models/users.rb
|
2023-11-21 12:30:39 +03:00 |
|
|
|
9369b124da
|
csharp-mvc: saving formsdata
|
2023-11-13 15:26:17 +03:00 |
|
|
|
21e61a31af
|
csharp-mvc: link in referenceData
|
2023-11-10 13:54:01 +03:00 |
|
|
|
9e351e4190
|
csharp-mvc: replace the previous implementation of formats
|
2023-11-10 12:46:30 +03:00 |
|
|
|
9b9049a2fc
|
csharp-mvc: add format module
|
2023-11-10 12:32:38 +03:00 |
|
|
|
6350e33c64
|
csharp-mvc: add document-formats submodule
|
2023-11-10 11:10:06 +03:00 |
|
|
|
0057b81adc
|
csharp-mvc: moved the submodule to the assets/document-templates subfolder
|
2023-11-09 09:56:55 +03:00 |
|
|
|
c86c6bf17e
|
Merge branch 'develop' into feature/user-image
|
2023-11-07 11:25:40 +07:00 |
|
|
|
672a351402
|
csharp-mvc: user image
|
2023-11-06 10:54:39 +07:00 |
|
|
|
e1d8418055
|
Merge branch 'develop' into feature/region-protect
|
2023-11-01 11:12:26 +07:00 |
|
|
|
1620e8277d
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/referenceData-open
# Conflicts:
# CHANGELOG.md
# web/documentserver-example/python/src/views/actions.py
|
2023-10-31 14:25:00 +03:00 |
|
|
|
7666394f1d
|
csharp-mvc: setUsers for region protection
|
2023-10-30 15:28:45 +07:00 |
|
|
|
8b5a2aceb0
|
deleted comments that duplicate the context
|
2023-10-26 17:11:29 +03:00 |
|
|
|
5b17ba41c3
|
mvc: onRequestOpen for referenceData source file
|
2023-10-26 15:55:11 +03:00 |
|
|
|
1b1f276354
|
Merge branch 'feature/upload-name' of https://github.com/ONLYOFFICE/document-server-integration into feature/upload-name
|
2023-10-20 18:27:27 +07:00 |
|
|
|
3e9a98f0d8
|
max name length =50 and this value in constant var
|
2023-10-20 18:22:38 +07:00 |
|
|
|
49d220d673
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/upload-name
# Conflicts:
# CHANGELOG.md
|
2023-10-20 12:11:45 +03:00 |
|
|
|
c3b2f70cec
|
mvc: exclude script (12f5528d90)
|
2023-10-19 14:22:44 +03:00 |
|
|
|
73acfe8721
|
Merge remote-tracking branch 'remotes/origin/release/1.7.0' into develop
# Conflicts:
# CHANGELOG.md
|
2023-10-19 12:52:24 +03:00 |
|
|
|
0a8df9cb5d
|
1.7.0
|
2023-10-19 12:40:03 +03:00 |
|
|
|
c0051304d9
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/select-word
# Conflicts:
# CHANGELOG.md
# web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
# web/documentserver-example/csharp/DocEditor.aspx
# web/documentserver-example/csharp/DocEditor.aspx.cs
# web/documentserver-example/java-spring/src/main/resources/templates/editor.html
# web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
# web/documentserver-example/java/src/main/webapp/editor.jsp
# web/documentserver-example/php/src/views/DocEditorView.php
# web/documentserver-example/php/templates/docEditor.tpl
# web/documentserver-example/python/src/views/actions.py
# web/documentserver-example/python/templates/editor.html
# web/documentserver-example/ruby/app/views/home/editor.html.erb
|
2023-10-12 11:54:43 +03:00 |
|
|
|
2fe1619389
|
Merge branch 'develop' into feature/upload-name
|
2023-10-12 14:44:29 +07:00 |
|
|
|
80028ead64
|
Merge branch 'feature/upload-name' of https://github.com/ONLYOFFICE/document-server-integration into feature/upload-name
|
2023-10-12 14:40:00 +07:00 |
|
|
|
f57b430744
|
lint fix
|
2023-10-12 14:38:40 +07:00 |
|
|
|
73ef86edc9
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/select-cell
# Conflicts:
# CHANGELOG.md
|
2023-10-12 09:52:46 +03:00 |
|
|
|
d36c70b6f5
|
Merge branch 'develop' into feature/select-word
|
2023-10-11 13:49:39 +07:00 |
|
|
|
78cc152c93
|
Merge branch 'develop' into feature/select-word
|
2023-10-11 13:42:34 +07:00 |
|
|
|
583e162520
|
Merge branch 'develop' into feature/upload-name
|
2023-10-11 11:24:24 +07:00 |
|
|
|
6eb54c5386
|
csharp-mvc: trimming long name of uploading file
|
2023-10-11 11:10:28 +07:00 |
|
|
|
5f19bdcff0
|
Merge branch 'develop' into feature/select-cell
|
2023-10-10 10:47:06 +07:00 |
|
|
|
86ad08d2ca
|
csharp-mvc: added key in referenceData
|
2023-10-09 15:29:17 +07:00 |
|
|
|
eda8ab61e9
|
csharp-mvc: onRequestSelectDocument / setRequestedDocument
|
2023-10-03 11:51:00 +07:00 |
|
|
|
09c0f31fd6
|
csharp: onRequestSelectSpreadsheet/setRequestedSpreadsheet
|
2023-09-29 20:01:23 +07:00 |
|
|
|
e49372123b
|
update icons
|
2023-09-29 14:23:44 +03:00 |
|
|
|
33600df8a9
|
added paths to the config files
|
2023-09-11 18:57:19 +03:00 |
|
|
|
63461b3eb6
|
csharp-mvc: fixed urls for version data
|
2023-08-23 13:45:58 +03:00 |
|
|
|
bd20af2096
|
csharp-mvc: added version restore
|
2023-08-23 13:03:23 +03:00 |
|
|
|
2611fae25c
|
csharp-mvc: use ajax for display version history
|
2023-08-23 12:16:23 +03:00 |
|
|
|
ad94016a85
|
Merge remote-tracking branch 'remotes/origin/master' into develop
# Conflicts:
# CHANGELOG.md
# web/documentserver-example/php/functions.php
# web/documentserver-example/php/views/DocEditorView.php
|
2023-06-29 11:13:23 +05:00 |
|
|
|
50a4ddbd11
|
1.6.0
|
2023-06-29 11:00:42 +05:00 |
|
|
|
badf3c7d49
|
csharp-mvc: reload after click on edit or view in upload window
|
2023-06-27 12:08:35 +03:00 |
|
|
|
33363f6144
|
fixed: generating key
|
2023-06-26 13:01:03 +03:00 |
|
|
|
ab13745cf6
|
Merge pull request #399 from ONLYOFFICE/hotfix/referenceData
Hotfix/reference data
|
2023-06-26 14:23:09 +05:00 |
|
|
|
17536df8e5
|
csharp-mvc: fixed directUrl property
|
2023-06-26 10:08:44 +03:00 |
|
|
|
2e8a483a0c
|
csharp-mvc: fix error with convert response (d9a79e20d7)
|
2023-06-26 11:47:38 +05:00 |
|
|
|
75b22614cf
|
refresh licenses
|
2023-06-21 12:29:59 +05:00 |
|
