|
|
90c4d54460
|
csharp: new comments
|
2021-08-24 12:40:41 +03:00 |
|
|
|
c3fa000cea
|
csharp: added the ability to Create New from templates for user "John Smith"
|
2021-06-16 16:46:28 +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 |
|
|
|
0392ffbc9a
|
csharp: add mentions
|
2021-05-20 10:53:43 +03:00 |
|
|
|
0997d2fef5
|
csharp: added comments
|
2021-04-20 17:33:48 +03:00 |
|
|
|
714b514f66
|
Copyright 2021
|
2021-03-15 11:54:47 +03:00 |
|
|
|
2cb91eb8d5
|
csharp: added dynamic favicon
|
2021-02-17 20:18:15 +03:00 |
|
|
|
9759839cd0
|
Merge pull request #114 from ONLYOFFICE/feature/fix-history
Feature/fix history
|
2021-02-02 13:09:41 +03:00 |
|
|
|
8b9a2d2481
|
csharp: fix merge
|
2021-02-01 23:02:15 +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 |
|
|
|
e845cc498b
|
csharp: moved functions
|
2021-01-28 17:34:45 +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 |
|
|
|
b94704adf8
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/insert-image
# 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-27 17:13:14 +03:00 |
|
|
|
d624cdf0f6
|
csharp: fix-history
|
2021-01-25 00:50:04 +03:00 |
|
|
|
022f1bb16d
|
csharp: setFavorite
|
2021-01-24 15:41:45 +03:00 |
|
|
|
aa5f1e3df4
|
csharp: compare-file
|
2020-12-05 12:22:35 +03:00 |
|
|
|
18a4dc20eb
|
csharp: insert-image
|
2020-12-04 19:03:02 +03:00 |
|
|
|
d5a6c1e605
|
csharp: fix mail-merge
|
2020-12-04 12:33:22 +03:00 |
|
|
|
301775aafd
|
csharp: mail-merge
|
2020-12-02 19:01:55 +03:00 |
|
|
|
ddb31bd4e8
|
fixed license comment 8050ec572a
|
2020-11-10 17:10:43 +03:00 |
|
|
|
5e852e024d
|
Merge branch 'hotfix/apache' into develop
# Conflicts:
# 3rd-Party.txt
# licences/3rd-Party.txt
# web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
# web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
# web/documentserver-example/java/src/main/webapp/editor.jsp
# web/documentserver-example/java/src/main/webapp/index.jsp
# web/documentserver-example/js/LICENSE.txt
# web/documentserver-example/js/OnlineEditorsExampleJS.html
# web/documentserver-example/nodejs/licenses/formidable.license
# web/documentserver-example/nodejs/licenses/jsonwebtoken.license
# web/documentserver-example/nodejs/licenses/mime.license
# web/documentserver-example/nodejs/licenses/urllib.license
# web/documentserver-example/php/LICENSE.txt
# web/documentserver-example/php/doceditor.php
# web/documentserver-example/php/functions.php
# web/documentserver-example/php/index.php
# web/documentserver-example/php/webeditor-ajax.php
# web/documentserver-example/ruby/LICENSE.txt
# web/documentserver-example/ruby/app/assets/javascripts/jscript.js
# web/documentserver-example/ruby/app/assets/stylesheets/editor.scss
# web/documentserver-example/ruby/app/assets/stylesheets/stylesheet.scss
# web/welcome/index.html
|
2020-09-04 09:59:10 +03:00 |
|
|
|
8050ec572a
|
apache
|
2020-09-02 12:06:52 +03:00 |
|
|
|
0cf0171721
|
fixed an issue when creating a second action link
|
2020-06-18 11:44:21 +03:00 |
|
|
|
220516c930
|
csharp: get link to bookmark
|
2020-05-18 16:31:16 +03:00 |
|
|
|
3be28877ab
|
fixed header name
|
2020-05-18 16:30:56 +03:00 |
|
|
|
710d4f4059
|
Fixed displaying mobile version cb5324381e
|
2019-12-13 13:20:39 +03:00 |
|
|
|
f639971861
|
object.assign is not available on IE
|
2019-09-26 15:21:09 +03:00 |
|
|
|
1f022f12a1
|
csharp: version history
|
2019-09-09 15:28:32 +03:00 |
|
|
|
097a99b947
|
csharp: jwt support
|
2019-08-28 15:57:09 +03:00 |
|
|
|
9fb0289af4
|
onAppReady (Fixed #54)
|
2019-01-22 09:23:29 +03:00 |
|
|
|
b1352bd897
|
remove unusing code
|
2018-03-29 11:52:01 +03:00 |
|
|
|
63cea1cecb
|
Fix Bug 33279 - add onOutdatedVersion event
|
2017-02-09 18:58:45 +03:00 |
|
|
|
c319be9751
|
firstname & lastname replaced by name
|
2016-12-06 16:48:20 +03:00 |
|
|
|
615e4b78bb
|
hide ™
|
2016-12-05 17:23:06 +03:00 |
|
|
|
8c5cff604a
|
Document Service Integration
|
2016-03-23 12:55:12 +03:00 |
|
