|
|
57ca15153f
|
Merge pull request #551 from ONLYOFFICE/feature/fetching-formats
Feature/fetching formats
|
2024-04-03 12:31:53 +03:00 |
|
|
|
6d28e3f8d8
|
Merge branch 'release/v8.1.0' into develop
# Conflicts:
# CHANGELOG.md
|
2024-03-21 14:23:41 +03:00 |
|
|
|
0414319893
|
nodejs: fill permission in embedded mode
|
2024-03-21 14:05:31 +03:00 |
|
|
|
0a61708f67
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/delete-all-files
# Conflicts:
# CHANGELOG.md
|
2024-03-20 10:58:41 +03:00 |
|
|
|
426b15b8f1
|
Merge remote-tracking branch 'origin/develop' into feature/fetching-formats
|
2024-03-19 13:01:48 +05:00 |
|
|
|
80291baa40
|
goback: change state for users (408d80fff6)
|
2024-03-18 14:21:12 +03:00 |
|
|
|
b9113f93f6
|
fix: linter offenses
|
2024-03-18 16:03:00 +05:00 |
|
|
|
47f4f022aa
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/delete-all-files
# Conflicts:
# CHANGELOG.md
|
2024-03-15 16:48:58 +03:00 |
|
|
|
1abcf78b85
|
refactor(php): change formats retrieval method on frontend
|
2024-03-14 19:08:12 +05:00 |
|
|
|
cc62ff8a61
|
Merge pull request #531 from ONLYOFFICE/feature/php-forced-conversion
Feature/php forced conversion
|
2024-03-07 15:59:54 +03:00 |
|
|
|
81ad7f7a64
|
feat(php): implement delete all files method
|
2024-03-06 13:42:41 +05:00 |
|
|
|
23ba4ff5b3
|
Merge pull request #541 from ONLYOFFICE/feature/fix-domain
Feature/fix domain
|
2024-03-06 09:32:36 +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 |
|
|
|
bf3df5c89d
|
php: change document-server to documentserver
|
2024-03-05 16:24:04 +03:00 |
|
|
|
09031033aa
|
fix(php): checking user in editor request. fix bug 66716
|
2024-03-05 13:30:34 +07:00 |
|
|
|
e57ad73d4f
|
feat(php): allow to explicitly select output file type when getting auto-conversion error(-9)
|
2024-03-01 13:03:59 +05:00 |
|
|
|
19a38df423
|
Merge remote-tracking branch 'remotes/origin/release/1.8.0' into develop
# Conflicts:
# web/documentserver-example/nodejs/app.js
|
2024-02-26 12:39:33 +03:00 |
|
|
|
a9f0068600
|
fix(php): fix bug 66518
|
2024-02-21 16:53:19 +07:00 |
|
|
|
9f2a72aafa
|
Merge remote-tracking branch 'remotes/origin/release/1.8.0' into develop
# Conflicts:
# web/documentserver-example/php/templates/docEditor.tpl
|
2024-02-20 15:04:31 +03:00 |
|
|
|
a83c22e537
|
fix(php): nginx headers, correct serverPath and forgotten comma
|
2024-02-20 14:41:29 +07:00 |
|
|
|
f154ffc981
|
Merge remote-tracking branch 'remotes/origin/release/1.8.0' into develop
# Conflicts:
# web/documentserver-example/php/src/helpers/Users.php
|
2024-02-16 18:50:23 +03:00 |
|
|
|
39a6581292
|
fix(php): add image to users class
Fix Bug 66516
|
2024-02-16 18:48:38 +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 |
|
|
|
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 |
|
|
|
1b0e8df99f
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/users-different-goback
# Conflicts:
# CHANGELOG.md
|
2024-01-09 11:01:08 +03:00 |
|
|
|
6563a26d2d
|
php: add goback users.php
|
2023-12-22 15:14:49 +03:00 |
|
|
|
83535632bb
|
php: add changes after pr #501
|
2023-12-18 10:09:40 +03:00 |
|
|
|
7b91694107
|
Merge branch 'develop' into feature/remove-history-close-restore
|
2023-12-15 18:16:04 +03:00 |
|
|
|
a36f270829
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/fix-editros-files
# Conflicts:
# web/documentserver-example/php/templates/docEditor.tpl
|
2023-12-15 17:54:25 +03:00 |
|
|
|
91f32c1387
|
php: remove history methods for anonymous users (39820cec0a)
old commit:
39820cec0a
|
2023-12-12 10:30:42 +03:00 |
|
|
|
d97291719a
|
php: add onRequestUsers and onRequestSendNotify in docEditor.tpl
|
2023-12-11 12:41:40 +03:00 |
|
|
|
3b9bad4a26
|
Merge branch 'develop' into feature/remove-history-close-restore
|
2023-12-07 11:34:27 +03:00 |
|
|
|
435b8013f6
|
style: updates to styling
|
2023-12-07 10:58:41 +03:00 |
|
|
|
a9063af6e1
|
fix sr-Latn-RS
|
2023-12-06 12:56:12 +03:00 |
|
|
|
3243a04a1b
|
php: remove historyClose and restore
|
2023-12-05 15:25:20 +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 |
|
|
|
7d8a1a8b6d
|
sr-Latn-CS skin language
|
2023-12-01 18:07:41 +03:00 |
|
|
|
11075304a5
|
php: add version index.tpl
|
2023-12-01 10:51:59 +03:00 |
|
|
|
ce58acbca9
|
Merge pull request #493 from ONLYOFFICE/fix/open-history-without-changes
Fix/open history without changes
|
2023-11-29 10:21:28 +03:00 |
|
|
|
dac1cdcdc1
|
format
|
2023-11-28 10:08:01 +03:00 |
|
|
|
248beed471
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/restore-history
# Conflicts:
# CHANGELOG.md
|
2023-11-28 10:05:46 +03:00 |
|
|
|
6578d414ea
|
php: fix opening history without changes
|
2023-11-24 13:28:44 +03:00 |
|
|
|
7ca8a2122f
|
Merge branch 'develop' into feature/restore-history
|
2023-11-22 11:29:31 +07: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 |
|
|
|
86c2842198
|
Merge pull request #489 from ONLYOFFICE/fix/php-get-stored-files
fix/php-get-stored-files
|
2023-11-21 11:59:46 +03:00 |
|
