pengjunjie/document-server-integration
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/document-server-integration.git synced 2026-04-07 14:06:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,299 Commits 28 Branches 8,560 Tags
e3c6bfdd1c83bf76996229f902be61d0acfd8a69
Commit Graph

1299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sergey Linnik
e3c6bfdd1c Merge pull request #201 from ONLYOFFICE/bugfix/emails 
rename email.com to example.com
v99.99.99.2634 v99.99.99.2635 v99.99.99.2636 		2021-10-01 12:56:37 +03:00
Oleg Sinizin
1b6d08e9bb rename email.com to example.com 2021-10-01 12:41:12 +03:00
Sergey Linnik
6168691469 spring to zip v99.99.99.2633 2021-10-01 11:20:51 +03:00
Sergey Linnik
c464064837 Merge pull request #176 from ONLYOFFICE/feature/java-spring 
Feature/java spring
 2021-10-01 11:10:03 +03:00
Sergey Linnik
35f6b2bdfa Merge pull request #200 from ONLYOFFICE/bugfix/mail-rename 
rename mails
 2021-10-01 11:08:39 +03:00
Oleg Sinizin
a1f26cb828 rename emails 2021-09-30 18:57:10 +03:00
Oleg Sinizin
bb9411a82c rename mails 2021-09-30 18:55:22 +03:00
Sergey Linnik
e2a04ffb89 Merge pull request #193 from ONLYOFFICE/bugfix/users-tooltip-layout 
fix users tooltip size
v99.99.99.2630 v99.99.99.2631 v99.99.99.2632 		2021-09-29 11:19:54 +03:00
Oleg Sinizin
1463e88024 csharp-mvc: user tooltip layout 2021-09-29 10:57:14 +03:00
Oleg Sinizin
b965ec08aa csharp: user tooltip layout 2021-09-29 10:56:56 +03:00
Oleg Sinizin
347dc710ea java: user tooltip layout 2021-09-29 10:56:33 +03:00
Oleg Sinizin
418a7a2712 ruby: user tooltip layout 2021-09-29 10:56:13 +03:00
Oleg Sinizin
f40d8a4a64 php: user tooltip layout 2021-09-29 10:55:52 +03:00
Oleg Sinizin
bee5e4724b python: user tooltip layout 2021-09-29 10:55:27 +03:00
Oleg Sinizin
e1753a154d nodejs: users tooltip layout 2021-09-29 10:54:55 +03:00
Oleg Sinizin
7327c4bfc2 java-spring: user tooltip layout 2021-09-28 23:12:40 +03:00
Sergey Linnik
45afbe3f56 Merge pull request #196 from ONLYOFFICE/feature/server-url-to-links 
add serverUrl to links
 2021-09-28 12:35:20 +03:00
Sergey Linnik
83efab84ad Merge remote-tracking branch 'remotes/origin/master' into develop 2021-09-28 12:30:33 +03:00
papacarlo
8da151ff7c Merge branch hotfix/v6.4.1 into master v6.5.0.46 v6.5.0.57 v6.5.0.43 v6.5.0.44 v6.5.0.52 v6.5.0.53 v6.5.0.54 v6.5.0.55 v6.5.0.56 2021-09-28 08:03:23 +00:00
Sergey Linnik
7fbcdb1d7f Merge pull request #197 from ONLYOFFICE/bugfix/cors-regexp 
cors, fix regexp, fix manifest
 2021-09-27 12:33:45 +03:00
Oleg Sinizin
ce18f76698 cors, fix regexp, fix manifest 2021-09-23 21:56:08 +03:00
Oleg Sinizin
f542048aeb add serverUrl to links 2021-09-23 21:45:13 +03:00
Oleg Sinizin
222749da15 fix path to templates, set username as "", if anonymous 2021-09-23 11:46:18 +03:00
Oleg Sinizin
d64a2b3a47 users tooltip layout 2021-09-21 23:33:29 +03:00
Dmitrii Vershinin
110dc6808b java-spring: docserver url 2021-09-21 18:05:06 +05:00
Dmitrii Vershinin
75329fa198 java-spring: cleanup 2021-09-21 18:01:19 +05:00
Sergey Linnik
7083e8f973 Merge pull request #194 from ONLYOFFICE/bugfix/python-example-fix 
python: remade detecting document type
v99.99.99.2620 v99.99.99.2621 v99.99.99.2622 v99.99.99.2624 v99.99.99.2625 		2021-09-20 17:13:06 +03:00
Sergey Linnik
c196360933 Merge pull request #195 from ONLYOFFICE/feature/readme-ruby 
Ruby version
 2021-09-20 16:40:47 +03:00
Oleg Sinizin
8abd7e69a9 misprint 2021-09-20 12:33:46 +03:00
Natalia
7e06add085 ruby: changed the command 2021-09-17 18:01:51 +03:00
Natalia
9193cf1d4b ruby: specified the Ruby version 2021-09-17 17:08:03 +03:00
Oleg Sinizin
d6bddd86f3 python: remade detecting document type 2021-09-16 16:33:44 +03:00
Oleg Sinizin
5a95fb26d4 java-spring: fix user tooltip size 2021-09-14 12:28:11 +03:00
Oleg Sinizin
3ab0f5fc7a java-spring: add .oxps 2021-09-14 10:17:17 +03:00
Sergey Linnik
42859d7a28 Merge remote-tracking branch 'remotes/origin/hotfix/v6.4.1' into develop v99.99.99.2614 v99.99.99.2615 v99.99.99.2616 v99.99.99.2617 v99.99.99.2618 v99.99.99.2619 2021-09-14 09:29:48 +03:00
Sergey Linnik
d3581658b7 update templates v6.4.1.38 v6.4.1.35 v6.4.1.45 v6.4.1.46 v6.4.1.47 v6.4.1.48 v6.4.1.49 v6.4.1.50 v6.4.1.43 v6.4.1.42 v6.4.1.41 v6.4.1.40 v6.4.1.39 v6.4.1.37 v6.4.1.36 v6.4.1.44 v6.4.1.29 v6.4.1.28 2021-09-14 09:29:20 +03:00
Sergey Linnik
7027970b65 support oxps 2021-09-14 09:29:19 +03:00
Sergey Linnik
8774286d8e Merge pull request #191 from ONLYOFFICE/feature/update-readme-link 
Update Readme.md
 2021-09-14 08:41:46 +03:00
svetlana maleeva
f0087361b6 Update Readme.md 2021-09-10 17:14:35 +03:00
Sergey Linnik
4f07072824 Merge pull request #190 from ONLYOFFICE/feature/wopi-fix 
fix wopi url context, fix layout
v99.99.99.2613 v99.99.99.2611 v99.99.99.2610 v99.99.99.2609 v99.99.99.2608 		2021-09-08 11:41:18 +03:00
Oleg Sinizin
ce0231f5f2 fix wopi url context, fix layout 2021-09-07 17:59:35 +03:00
Oleg Sinizin
774a9fd209 fix path to diff.zip 2021-09-06 18:50:42 +03:00
Oleg Sinizin
24d138fdb5 fix misprint 2021-09-03 17:00:09 +03:00
Oleg Sinizin
53357938d2 fix creating history folder 2021-09-03 15:42:53 +03:00
Oleg Sinizin
09628fc5e9 fix deleting file folder when deleting file 2021-09-03 15:31:20 +03:00
Sergey Linnik
62bc35de61 Merge pull request #189 from ONLYOFFICE/feature/layout-fix 
layout fix
v99.99.99.2607 v99.99.99.2606 v99.99.99.2604 v99.99.99.2603 		2021-09-03 09:51:38 +03:00
Oleg Sinizin
9fce208ce3 layout fix 2021-09-02 13:44:57 +03:00
Oleg Sinizin
2942324696 layout fix 2021-09-02 13:41:14 +03:00
Sergey Linnik
07fda35106 Merge remote-tracking branch 'remotes/origin/hotfix/v6.4.1' into develop v99.99.99.2598 v99.99.99.2599 2021-08-30 18:57:43 +03:00
Oleg Sinizin
d8e229df2c replace set filepass null v6.4.1.24 v6.4.1.20 v6.4.1.18 v6.4.1.16 v6.4.1.15 v6.4.1.14 v6.4.1.13 v6.4.1.10 v6.4.1.5 v6.4.1.6 v6.4.1.7 v6.4.1.19 v6.4.1.21 v6.4.1.22 v6.4.1.23 v6.4.1.25 v6.4.1.26 v6.4.1.27 v6.4.1.8 2021-08-30 18:56:18 +03:00