Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to the latest changes from release/v5.1.0 #56

Merged
merged 13 commits into from
Mar 7, 2018
Merged

Update to the latest changes from release/v5.1.0 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
998c7c7
Merge pull request #54 from ONLYOFFICE/feature/documentation-translat…
JuliaRadzhabova Feb 28, 2018
2280016
[SSE] Fix translations
JuliaRadzhabova Feb 28, 2018
7b4c521
[SSE] Fix context menu in the header of chart
JuliaRadzhabova Feb 28, 2018
46fdf9e
[DE] Fix preview for table of contents.
JuliaRadzhabova Feb 28, 2018
06da18b
Update copyright to 2018
ShockwaveNN Mar 1, 2018
af745d4
Merge pull request #55 from ONLYOFFICE/feature/update-copyright
agolybev Mar 1, 2018
c74517c
[DE] Scroll preview for table of contents.
JuliaRadzhabova Mar 1, 2018
d04a619
Show critical error with custom message.
JuliaRadzhabova Mar 1, 2018
1b75d20
[Common] Bug in rendering chat and header panel when user id contains…
JuliaRadzhabova Mar 2, 2018
33dac0e
[DE] Fix Bug 37078
JuliaRadzhabova Mar 5, 2018
dc9158b
[DE] Fix Bug 37059
JuliaRadzhabova Mar 5, 2018
bbc6417
Fix Bug 37106 (appeared due to Bug 35896).
JuliaRadzhabova Mar 5, 2018
d6bf38e
[mobile] Change application colors.
JuliaRadzhabova Mar 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion apps/common/Analytics.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2017
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
Expand Down
2 changes: 1 addition & 1 deletion apps/common/Gateway.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2017
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
Expand Down
2 changes: 1 addition & 1 deletion apps/common/IrregularStack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2017
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
Expand Down
2 changes: 1 addition & 1 deletion apps/common/embed/lib/controller/modals.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2017
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
Expand Down
2 changes: 1 addition & 1 deletion apps/common/embed/lib/util/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2017
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
Expand Down
2 changes: 1 addition & 1 deletion apps/common/embed/lib/view/modals.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2017
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
Expand Down
2 changes: 1 addition & 1 deletion apps/common/locale.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2017
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
Expand Down
4 changes: 2 additions & 2 deletions apps/common/main/lib/collection/ChatMessages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2017
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
Expand Down Expand Up @@ -36,7 +36,7 @@
* Collection
*
* Created by Maxim Kadushkin on 01 March 2014
* Copyright (c) 2014 Ascensio System SIA. All rights reserved.
* Copyright (c) 2018 Ascensio System SIA. All rights reserved.
*
*/

Expand Down
4 changes: 2 additions & 2 deletions apps/common/main/lib/collection/Comments.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2017
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
Expand Down Expand Up @@ -34,7 +34,7 @@
* Comments.js
*
* Created by Alexey Musinov on 17.01.14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved.
* Copyright (c) 2018 Ascensio System SIA. All rights reserved.
*
*/

Expand Down
4 changes: 2 additions & 2 deletions apps/common/main/lib/collection/Fonts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2017
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
Expand Down Expand Up @@ -34,7 +34,7 @@
* Fonts.js
*
* Created by Alexander Yuzhin on 2/11/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved.
* Copyright (c) 2018 Ascensio System SIA. All rights reserved.
*
*/

Expand Down
2 changes: 1 addition & 1 deletion apps/common/main/lib/collection/HistoryVersions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2017
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
Expand Down
2 changes: 1 addition & 1 deletion apps/common/main/lib/collection/Plugins.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2017
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
Expand Down
4 changes: 2 additions & 2 deletions apps/common/main/lib/collection/ReviewChanges.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2017
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
Expand Down Expand Up @@ -34,7 +34,7 @@
* ReviewChanges.js
*
* Created by Julia.Radzhabova on 05.08.15
* Copyright (c) 2014 Ascensio System SIA. All rights reserved.
* Copyright (c) 2018 Ascensio System SIA. All rights reserved.
*
*/

Expand Down
4 changes: 2 additions & 2 deletions apps/common/main/lib/collection/TextArt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2017
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
Expand Down Expand Up @@ -32,7 +32,7 @@
*/
/**
* Created by Julia.Radzhabova on 09.07.15
* Copyright (c) 2014 Ascensio System SIA. All rights reserved.
* Copyright (c) 2018 Ascensio System SIA. All rights reserved.
*/

if (Common === undefined)
Expand Down
4 changes: 2 additions & 2 deletions apps/common/main/lib/collection/Users.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2017
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
Expand Down Expand Up @@ -36,7 +36,7 @@
* Collection
*
* Created by Maxim Kadushkin on 27 February 2014
* Copyright (c) 2014 Ascensio System SIA. All rights reserved.
* Copyright (c) 2018 Ascensio System SIA. All rights reserved.
*
*/

Expand Down
4 changes: 2 additions & 2 deletions apps/common/main/lib/component/BaseView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2017
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
Expand Down Expand Up @@ -34,7 +34,7 @@
* BaseView.js
*
* Created by Alexander Yuzhin on 1/17/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved.
* Copyright (c) 2018 Ascensio System SIA. All rights reserved.
*
*/

Expand Down
4 changes: 2 additions & 2 deletions apps/common/main/lib/component/Button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2017
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
Expand Down Expand Up @@ -34,7 +34,7 @@
* Button.js
*
* Created by Alexander Yuzhin on 1/20/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved.
* Copyright (c) 2018 Ascensio System SIA. All rights reserved.
*
*/

Expand Down
4 changes: 2 additions & 2 deletions apps/common/main/lib/component/CheckBox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2017
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
Expand Down Expand Up @@ -34,7 +34,7 @@
* CheckBox.js
*
* Created by Julia Radzhabova on 1/24/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved.
* Copyright (c) 2018 Ascensio System SIA. All rights reserved.
*
*/

Expand Down
2 changes: 1 addition & 1 deletion apps/common/main/lib/component/ColorButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2017
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
Expand Down
4 changes: 2 additions & 2 deletions apps/common/main/lib/component/ColorPalette.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2017
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
Expand Down Expand Up @@ -34,7 +34,7 @@
* ColorPalette.js
*
* Created by Alexander Yuzhin on 2/20/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved.
* Copyright (c) 2018 Ascensio System SIA. All rights reserved.
*
*/

Expand Down
4 changes: 2 additions & 2 deletions apps/common/main/lib/component/ColorPaletteExt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2017
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
Expand Down Expand Up @@ -34,7 +34,7 @@
* ColorPaletteExt.js
*
* Created by Julia Radzhabova on 07/21/15
* Copyright (c) 2014 Ascensio System SIA. All rights reserved.
* Copyright (c) 2018 Ascensio System SIA. All rights reserved.
*
*/

Expand Down
4 changes: 2 additions & 2 deletions apps/common/main/lib/component/ComboBorderSize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2017
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
Expand Down Expand Up @@ -34,7 +34,7 @@
* ComboBorderSize.js
*
* Created by Julia Radzhabova on 2/10/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved.
* Copyright (c) 2018 Ascensio System SIA. All rights reserved.
*
*/

Expand Down
4 changes: 2 additions & 2 deletions apps/common/main/lib/component/ComboBox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2017
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
Expand Down Expand Up @@ -34,7 +34,7 @@
* ComboBox.js
*
* Created by Alexander Yuzhin on 1/22/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved.
* Copyright (c) 2018 Ascensio System SIA. All rights reserved.
*
*/

Expand Down
4 changes: 2 additions & 2 deletions apps/common/main/lib/component/ComboBoxFonts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2017
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
Expand Down Expand Up @@ -34,7 +34,7 @@
* ComboBoxFonts.js
*
* Created by Alexander Yuzhin on 2/11/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved.
* Copyright (c) 2018 Ascensio System SIA. All rights reserved.
*
*/

Expand Down
6 changes: 3 additions & 3 deletions apps/common/main/lib/component/ComboDataView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2017
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
Expand Down Expand Up @@ -34,7 +34,7 @@
* ComboDataView.js
*
* Created by Alexander Yuzhin on 2/13/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved.
* Copyright (c) 2018 Ascensio System SIA. All rights reserved.
*
*/

Expand Down Expand Up @@ -401,7 +401,7 @@ define([

fillComboView: function(record, forceSelect, forceFill) {
if (!_.isUndefined(record) && record instanceof Backbone.Model){
this.needFillComboView = false;
this.needFillComboView = !this.isVisible();

var me = this,
store = me.menuPicker.store,
Expand Down
4 changes: 2 additions & 2 deletions apps/common/main/lib/component/DataView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2017
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
Expand Down Expand Up @@ -36,7 +36,7 @@
* A mechanism for displaying data using custom layout templates and formatting.
*
* Created by Alexander Yuzhin on 1/24/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved.
* Copyright (c) 2018 Ascensio System SIA. All rights reserved.
*
*/

Expand Down
4 changes: 2 additions & 2 deletions apps/common/main/lib/component/DimensionPicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2017
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
Expand Down Expand Up @@ -34,7 +34,7 @@
* DimensionPicker.js
*
* Created by Alexander Yuzhin on 1/29/14
* Copyright (c) 2014 Ascensio System SIA. All rights reserved.
* Copyright (c) 2018 Ascensio System SIA. All rights reserved.
*
*/

Expand Down
2 changes: 1 addition & 1 deletion apps/common/main/lib/component/HSBColorPicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2017
* (c) Copyright Ascensio System Limited 2010-2018
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
Expand Down
Loading