|
|
95e7aff092
|
Merge remote-tracking branch 'remotes/origin/release/v8.1.0' into develop
# Conflicts:
# CHANGELOG.md
# web/documentserver-example/java-spring/src/main/resources/application.properties
# web/documentserver-example/nodejs/app.js
# web/documentserver-example/nodejs/views/wopiIndex.ejs
|
2024-06-07 08:49:20 +03:00 |
|
|
|
844e723387
|
save as for pdf
|
2024-04-19 12:29:47 +03:00 |
|
|
|
fa303e9bf2
|
switching from filling to editing
|
2024-04-15 16:32:44 +03:00 |
|
|
|
c4980c19e7
|
Revert "docxf and oform since v7.0"
This reverts commit beb9885b03.
# Conflicts:
# web/documentserver-example/php/doceditor.php
|
2024-03-18 18:24:47 +03:00 |
|
|
|
9721187083
|
Merge remote-tracking branch 'remotes/origin/release/1.8.0' into develop
|
2024-02-09 12:21:37 +03:00 |
|
|
|
b3d3b81274
|
copyright 2024
|
2024-02-01 12:39:36 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
52706402a2
|
csharp-mvc: hide edit icon on view screen for anonymous
|
2023-03-14 15:42:12 +05:00 |
|
|
|
593ad9559f
|
csharp-mvc: add close history button
|
2023-03-13 13:39:13 +05:00 |
|
|
|
75046b80c6
|
csharp-mvc: referenceData
|
2023-02-14 15:42:36 +03:00 |
|
|
|
3181c7449d
|
Copyright 2023
|
2023-01-20 15:27:03 +05:00 |
|
|
|
e041baeef7
|
Merge branch 'feature/extension-on-rename' into develop
|
2022-08-02 14:18:22 +03:00 |
|
|
|
54bb5b0a24
|
format
|
2022-03-28 13:26:17 +03:00 |
|
|
|
4b0ad1a192
|
csharp + csharp-mvc
|
2022-03-23 16:56:41 +03:00 |
|
|
|
416b1fde8c
|
Merge pull request #270 from ONLYOFFICE/feature/hide-history-for-anonymous
Feature/hide history for anonymous
|
2022-03-22 11:54:12 +03:00 |
|
|
|
cf01b5e0ae
|
csharp: csharp-mvc: version history button was hidden
|
2022-03-21 09:38:48 +03:00 |
|
|
|
3a4cf5e6e6
|
csharp-mvc: removed rename action for anonymous
|
2022-03-18 15:06:46 +03:00 |
|
|
|
4ba708631e
|
Merge pull request #266 from ONLYOFFICE/feature/renaming-files
Feature/renaming files
|
2022-03-18 10:31:19 +03:00 |
|
|
|
9bf3973215
|
csharp-mvc: meta command
|
2022-03-14 14:00:05 +03:00 |
|
|
|
935377a941
|
all: fix link in mentions
|
2022-03-02 17:42:12 +03:00 |
|
|
|
beb9885b03
|
docxf and oform since v7.0
|
2021-12-08 14:00:04 +03:00 |
|
|
|
873267a784
|
csharp-mvc: add Copy File as...
|
2021-11-15 17:08:24 +03:00 |
|
|
|
9bab8edc3c
|
using innerAlert in onRequestSendNotify
|
2021-11-15 11:48:17 +03:00 |
|
|
|
ece446d191
|
csharp-mvc: new comments
|
2021-08-24 13:13:35 +03:00 |
|
|
|
07d11f0bae
|
fixed the no ability to add mentions for anonymous users
|
2021-05-28 15:10:06 +03:00 |
|
|
|
60992ecb38
|
variable users renamed to usersForMentions
|
2021-05-26 17:01:47 +03:00 |
|
|
|
b6b980de92
|
mvc: mentions
|
2021-05-20 10:53:31 +03:00 |
|
|
|
f2714cb554
|
csharp-mvs: added comments
|
2021-04-20 17:33:49 +03:00 |
|
|
|
f22c698cb6
|
csharp-mvc: fix onRequestEditRights
|
2021-04-11 19:45:26 +03:00 |
|
|
|
714b514f66
|
Copyright 2021
|
2021-03-15 11:54:47 +03:00 |
|
|
|
8442def83c
|
csharp-mvc: added dynamic favicon
|
2021-02-17 20:18:43 +03:00 |
|
|
|
9759839cd0
|
Merge pull request #114 from ONLYOFFICE/feature/fix-history
Feature/fix history
|
2021-02-02 13:09:41 +03:00 |
|
|
|
c0f459132e
|
csharp-mvc: fix merge
|
2021-02-01 21:07:49 +03:00 |
|
|
|
361b8bd0f4
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/mail-merge
# Conflicts:
# web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
# web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
# web/documentserver-example/csharp/DocEditor.aspx
# web/documentserver-example/csharp/DocEditor.aspx.cs
# web/documentserver-example/csharp/WebEditor.ashx.cs
# web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
# web/documentserver-example/java/src/main/java/controllers/IndexServlet.java
# web/documentserver-example/java/src/main/webapp/editor.jsp
# web/documentserver-example/nodejs/app.js
# web/documentserver-example/nodejs/views/editor.ejs
# web/documentserver-example/php/doceditor.php
# web/documentserver-example/php/webeditor-ajax.php
# web/documentserver-example/python/src/views/actions.py
# web/documentserver-example/python/templates/editor.html
# web/documentserver-example/ruby/app/models/file_model.rb
# web/documentserver-example/ruby/app/views/home/editor.html.erb
|
2021-02-01 16:57:59 +03:00 |
|
|
|
dae246e8a2
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/config-refactor
# Conflicts:
# web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
# web/documentserver-example/python/src/views/actions.py
# web/documentserver-example/ruby/config/application.rb
|
2021-01-29 12:49:30 +03:00 |
|
|
|
ac36df16d1
|
csharp-mvc: moved functions
|
2021-01-28 17:35:34 +03:00 |
|
|
|
6e81fa8996
|
Merge branch 'develop' into feature/insert-image
# Conflicts:
# 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/src/main/java/controllers/EditorServlet.java
# web/documentserver-example/java/src/main/webapp/editor.jsp
# web/documentserver-example/nodejs/app.js
# web/documentserver-example/nodejs/views/editor.ejs
# web/documentserver-example/php/doceditor.php
# web/documentserver-example/python/src/views/actions.py
# web/documentserver-example/python/templates/editor.html
# web/documentserver-example/ruby/app/models/file_model.rb
# web/documentserver-example/ruby/app/views/home/editor.html.erb
|
2021-01-28 15:12:36 +03:00 |
|
|
|
54c6025bc5
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/compare-file
# Conflicts:
# web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
# web/documentserver-example/csharp/DocEditor.aspx
# web/documentserver-example/java/src/main/webapp/editor.jsp
# web/documentserver-example/nodejs/views/editor.ejs
# web/documentserver-example/php/doceditor.php
# web/documentserver-example/python/templates/editor.html
# web/documentserver-example/ruby/app/views/home/editor.html.erb
|
2021-01-28 13:38:00 +03:00 |
|
