|
|
9759839cd0
|
Merge pull request #114 from ONLYOFFICE/feature/fix-history
Feature/fix history
|
2021-02-02 13:09:41 +03:00 |
|
|
|
e6ee57e09b
|
php: fix tabulation
|
2021-02-02 12:53:56 +03:00 |
|
|
|
4dd5f9d9f6
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/add-jwt
# Conflicts:
# web/documentserver-example/python/src/utils/historyManager.py
|
2021-02-02 11:02:53 +03:00 |
|
|
|
a5929897ad
|
php: fix merge
|
2021-02-01 22:59:17 +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 |
|
|
|
bb19ea1a6f
|
рhp: fix serverPath
|
2021-01-29 14:41:02 +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 |
|
|
|
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 |
|
|
|
1a7fbe656b
|
php: added templates submodule
|
2021-01-16 20:36:14 +03:00 |
|
|
|
b197f4c258
|
php: setFavorite
|
2020-12-24 22:50:28 +03:00 |
|
|
|
51c180726c
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/mail-merge
|
2020-11-29 13:29:01 +03:00 |
|
|
|
6250902a55
|
php: jwt for compare-file
|
2020-11-27 11:00:16 +03:00 |
|
|
|
7b017c15f8
|
php: compare-file
|
2020-11-27 10:57:50 +03:00 |
|
|
|
62060d2538
|
php: jwt for insert-image
|
2020-11-26 17:20:57 +03:00 |
|
|
|
2368354c6d
|
php: insert-image
|
2020-11-26 16:10:09 +03:00 |
|
|
|
48fa83b850
|
php: jwt for mailmerge
|
2020-11-26 01:16:33 +03:00 |
|
|
|
ca5ba06506
|
php: jwt for historyData
|
2020-11-25 18:47:12 +03:00 |
|
|
|
c0b520e440
|
php: config-refactor
|
2020-11-23 11:00:57 +03:00 |
|
|
|
9b7d54fdfb
|
php: mailmerge
|
2020-11-16 15:45:28 +03:00 |
|
|
|
ee077978b9
|
php: fix-history
|
2020-11-13 14:32:14 +03:00 |
|
|
|
cf4dd454f6
|
php: reviewPermission
|
2020-11-13 11:43:10 +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 |
|
|
|
b3a96f15ab
|
php: get link to bookmark
|
2020-05-18 14:19:25 +03:00 |
|
|
|
cb91ba1620
|
bump 2020
|
2020-03-03 14:39:29 +03:00 |
|
|
|
1bde1f66d3
|
change name
|
2020-03-03 11:55:24 +03:00 |
|
|
|
710d4f4059
|
Fixed displaying mobile version cb5324381e
|
2019-12-13 13:20:39 +03:00 |
|
|
|
7ab292bc13
|
php: blockcontent mode
|
2019-11-07 16:41:16 +03:00 |
|
|
|
f639971861
|
object.assign is not available on IE
|
2019-09-26 15:21:09 +03:00 |
|
|
|
a60e7b9b6b
|
php: comment, fillforms, filter modes
|
2019-09-25 15:17:33 +03:00 |
|
|
|
95a15661d0
|
php: lang selector
|
2019-09-19 17:30:44 +03:00 |
|
|
|
ca17dd1128
|
php: jwt support
|
2019-09-19 17:24:41 +03:00 |
|
|
|
a58c1483b3
|
php: version history
|
2019-09-19 14:14:57 +03:00 |
|
|
|
16473b4e06
|
2019
|
2019-01-22 18:17:07 +03:00 |
|
|
|
30d26df97d
|
Merge remote-tracking branch 'remotes/origin/hotfix/v5.2.8' into develop
|
2019-01-22 09:28:29 +03:00 |
|
|
|
9fb0289af4
|
onAppReady (Fixed #54)
|
2019-01-22 09:23:29 +03:00 |
|
|
|
fa8e2cf975
|
[[copyright] Update Copyright
2018 -> 2019. Limited -> SIA
|
2019-01-17 17:32:01 +03:00 |
|
|
|
b1352bd897
|
remove unusing code
|
2018-03-29 11:52:01 +03:00 |
|
|
|
20412f0c80
|
Update copyright and footer info to 2018 year
|
2018-03-01 12:41:44 +03:00 |
|
|
|
f3ee251088
|
php: create folder with logs
|
2018-02-13 17:21:22 +03:00 |
|
|
|
ba1358c116
|
Copyright
|
2017-06-26 16:29:01 +03:00 |
|
|
|
dac9003e58
|
Fix Bug 33954 - open mobile editor by user agent
|
2017-02-15 16:47:30 +03:00 |
|
|
|
680670294b
|
fileName is not the last parameter
|
2017-02-15 11:59:42 +03:00 |
|
|
|
63cea1cecb
|
Fix Bug 33279 - add onOutdatedVersion event
|
2017-02-09 18:58:45 +03:00 |
|
|
|
2e6e8ccfd1
|
php: replace domain for DocumentServer from config
|
2017-02-09 17:45:43 +03:00 |
|
|
|
7e26d068a5
|
php: review mode
|
2017-01-31 18:01:19 +03:00 |
|
|
|
4f21721901
|
change license to 2017
|
2017-01-18 10:46:50 +03:00 |
|
