Commit Graph

111 Commits

Author SHA1 Message Date
5cc068db6c change license to 2017 2017-01-17 18:02:27 +03:00
bbe8dadd0d Merge tag 'v4.2.5' into develop
v4.2.5 v4.2.5
2017-01-16 15:01:18 +03:00
603ac92013 problem with connections are closed before full opening 2017-01-10 16:43:50 +03:00
b30fbdfca4 force save initiator notification 2016-12-27 18:56:49 +03:00
ae17a4ff97 forcesave button 2016-12-27 18:56:49 +03:00
de896c2c65 add SuccessLimit 2016-12-20 18:32:27 +03:00
c94b38886f Revert "delete limit"
This reverts commit c05137601d.
2016-11-30 12:35:02 +03:00
27cb02e66f add statsD statistic - connections count 2016-11-29 14:27:33 +03:00
c05137601d delete limit 2016-11-28 16:50:37 +03:00
2f30aed9da error isOpen 2016-11-25 20:18:25 +03:00
afcddd395d if close happen before auth end 2016-11-25 19:59:51 +03:00
c9acd8272a separate jwt open and session token;error in strict mode 2016-11-25 19:33:18 +03:00
3010de73f1 'use strict' for nodejs4 and 'let' keyword 2016-11-25 17:59:03 +03:00
0a165772a8 change config format 2016-11-25 17:51:24 +03:00
41c66d1232 extend input params by jwt in http request 2016-11-25 16:56:54 +03:00
99782514a3 change secret config, no fillJwtForRequest in imgurl 2016-11-24 20:50:58 +03:00
6294d04947 revert old view to send event on closeDocument 2016-11-18 20:28:45 +03:00
83a5402fbf fix bug 33430 2016-11-17 19:55:25 +03:00
baeb47a96a fix bug 33429 2016-11-17 12:02:48 +03:00
c87cac8d13 jwt token for http request 2016-11-16 18:06:29 +03:00
f40b843f90 error 2016-11-15 20:51:07 +03:00
119524c3bd jwt token on open 2016-11-15 20:40:15 +03:00
d03c4b60e2 Merge remote-tracking branch 'origin/hotfix/v4.1.8' into develop
# Conflicts:
#	DocService/sources/DocsCoServer.js
2016-11-02 19:02:08 +03:00
a700703fdf add read branding from license 2016-10-28 16:25:53 +03:00
9d961d56ee session idle timeout 2016-10-26 15:12:22 +03:00
7fd10b00a8 buildVersion from commondefines.js instead license.js 2016-10-20 16:28:08 +03:00
c170316c61 Merge tag 'ds-version' into develop
ds-version

Conflicts:
	DocService/sources/DocsCoServer.js
2016-10-20 15:54:10 +03:00
be093573ea session idle/absolute timeout 2016-10-19 20:25:33 +03:00
5779955389 Merge branch 'feature/build-version' into develop
# Conflicts:
#	DocService/sources/DocsCoServer.js
2016-10-19 17:58:08 +03:00
9ba3cced2c add singletone mode 2016-10-19 17:49:58 +03:00
c1c87a3660 add 'version' command Commandservice.ashx 2016-10-18 19:15:35 +03:00
d5a21444a5 session idle/absolute timeout 2016-10-13 13:30:20 +03:00
88ca230e1f send buildVersion with license info 2016-10-05 16:17:37 +03:00
0c0b938f69 Merge tag 'dnsrelover' into develop
v4.1.4
2016-10-04 19:42:04 +03:00
23b2c3e68c log 2016-09-30 16:24:09 +03:00
70e933cbf0 ipfilter dns lookup 2016-09-23 17:14:17 +03:00
090a6816ed Merge pull request #13 from ONLYOFFICE/hotfix/v4.1.2
Hotfix/v4.1.2
2016-09-20 15:41:32 +03:00
f697d5dad4 'meta' command CommandService.ashx 2016-09-20 12:11:31 +03:00
62c0294285 add trial (developer mode) 2016-09-19 16:44:08 +03:00
39c764f1e2 fix bug 33109 2016-09-14 17:36:59 +03:00
8e53081bb8 at close connection callback could mistakenly saved in database 2016-09-01 13:36:23 +03:00
bf22112924 connection with critical error can not save changes 2016-08-30 18:09:43 +03:00
6cd612fa7c restart if cron job stop 2016-08-30 15:28:07 +03:00
c212143443 add integration params 2016-08-30 13:16:46 +03:00
cb91e2a74b add ExpiredTrial 2016-08-29 11:42:31 +03:00
f74fdce0cc ipfilter 2016-08-18 16:26:30 +03:00
521da294c4 config the waiting time to document assembly when all out(not 0 in case of F5 in the browser) 2016-08-16 18:08:29 +03:00
d3c3c2f97e don't check db or locks if connection restore in view mode 2016-07-22 13:48:58 +03:00
abeaafb819 check whether the key in the database in Commandservice.ashx?c=info 2016-07-19 15:18:36 +03:00
4af6797b5a Merge pull request #7 from ONLYOFFICE/release/4.0.1
Release/4.0.1
2016-06-30 15:02:23 +03:00