|
|
0bfb036be6
|
refactor(csharp-mvc): change formats retrieval method on frontend
|
2024-03-18 18:03:10 +05:00 |
|
|
|
423233e93f
|
update submodule
|
2024-03-05 16:42:41 +03:00 |
|
|
|
5f3eaa05f9
|
Merge remote-tracking branch 'remotes/origin/release/1.8.0' into develop
# Conflicts:
# web/documentserver-example/php/assets/js/jscript.js
|
2024-03-05 16:33:14 +03:00 |
|
|
|
e42f7fd271
|
fix(csharp-mvc): empty strings tolerant json deserialization. Fix bug 66688
|
2024-03-04 13:53:31 +07:00 |
|
|
|
3eac4912e1
|
Merge remote-tracking branch 'remotes/origin/release/1.8.0' into develop
|
2024-02-14 22:19:11 +03:00 |
|
|
|
283139450c
|
Form template rename as PDF form
|
2024-02-14 16:45:07 +03:00 |
|
|
|
9721187083
|
Merge remote-tracking branch 'remotes/origin/release/1.8.0' into develop
|
2024-02-09 12:21:37 +03:00 |
|
|
|
bce5e3760a
|
do not convert to oform
|
2024-02-09 12:21:24 +03:00 |
|
|
|
b3d3b81274
|
copyright 2024
|
2024-02-01 12:39:36 +03:00 |
|
|
|
dab4841c1d
|
inserting svg
|
2024-02-01 12:35:46 +03:00 |
|
|
|
a7cf7ae378
|
Merge branch 'release/1.8.0' into develop
# Conflicts:
# CHANGELOG.md
|
2024-01-30 18:12:51 +03:00 |
|
|
|
0bcd7088e6
|
1.8.0
|
2024-01-30 18:11:47 +03:00 |
|
|
|
3a2f30bfcd
|
Merge branch 'release/v8.0.0' into develop
# Conflicts:
# CHANGELOG.md
# web/documentserver-example/csharp-mvc/web.appsettings.config
# web/documentserver-example/csharp/settings.config
# web/documentserver-example/java-spring/src/main/resources/application.properties
# web/documentserver-example/java/src/main/resources/settings.properties
|
2024-01-19 12:27:44 +03:00 |
|
|
|
7423edd7d9
|
ar skin language
|
2024-01-18 17:06:52 +03:00 |
|
|
|
a2c8499622
|
update formats (add missed records)
|
2024-01-10 16:54:20 +03:00 |
|
|
|
1b0e8df99f
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/users-different-goback
# Conflicts:
# CHANGELOG.md
|
2024-01-09 11:01:08 +03:00 |
|
|
|
b90f333fdd
|
csharp-mvc: add goback Users.cs
|
2023-12-29 12:47:37 +07:00 |
|
|
|
8ba1d5e8d7
|
update formats (add missed records)
|
2023-12-26 12:32:27 +03:00 |
|
|
|
dc14a9aa90
|
csharp-mvc: remove historyClose and restore
|
2023-12-19 15:41:22 +07:00 |
|
|
|
69b266489f
|
csharp-mvc: add onRequestUsers and onRequestSendNotify in Editor.aspx
|
2023-12-15 20:03:15 +07:00 |
|
|
|
a9063af6e1
|
fix sr-Latn-RS
|
2023-12-06 12:56:12 +03:00 |
|
|
|
e65f6f27be
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/version-on-front
# Conflicts:
# CHANGELOG.md
|
2023-12-05 13:21:41 +03:00 |
|
|
|
f846197396
|
csharp: add version Index.aspx
|
2023-12-04 16:29:37 +07:00 |
|
|
|
7d8a1a8b6d
|
sr-Latn-CS skin language
|
2023-12-01 18:07:41 +03:00 |
|
|
|
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 |
|
