Skip to content

Commit

Permalink
Release v5.4.2; see CHANGELOG for details.
Browse files Browse the repository at this point in the history
  • Loading branch information
Derek Mueller committed Jan 7, 2016
1 parent 72e2088 commit b6aac5e
Show file tree
Hide file tree
Showing 1,683 changed files with 7,023 additions and 2,635 deletions.
24 changes: 24 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,27 @@
# 5.4.2 #
1/7/2016
* General Changelog / Developer Notes
* X2Touch changes:
* Added support for the Topics module
* Module form layouts can now be customized from the new "Mobile App Form Editor" admin page
* Improved error handling of automated email logging
* Action History "Email From" filter now includes logged inbound emails
* New option on the "Email Settings" admin page to enable List-Unsubscribe email header
* Updated module delete functionality to clean up associated custom module summary widgets
* Updated Process module to allow for financial information on any module type
* Tracked Bug Fixes:
* [3189](http://x2software.com/index.php/bugReports/3189): CDbCommand failed to execute the SQL statement: SQLSTATE[42S22]: Column not found: 1054 Unknown column 't.createDate' in 'having clause'
* [3283](http://x2software.com/index.php/bugReports/3283): file_exists(): open_basedir restriction in effect. File is not within the allowed path(s)
* [3296](http://x2software.com/index.php/bugReports/3296): CDbCommand failed to execute the SQL statement: SQLSTATE[23000]: Integrity constraint violation: 1062 Duplicate entry 'Admin' for key 'PRIMARY'
* [3300](http://x2software.com/index.php/bugReports/3300): array_flip(): Can only flip STRING and INTEGER values!
* [3302](http://x2software.com/index.php/bugReports/3302): CDbCommand failed to execute the SQL statement: SQLSTATE[HY000]: General error: 1366 Incorrect integer value: '' for column 'active' at row 1
* [3303](http://x2software.com/index.php/bugReports/3303): CDbCommand failed to execute the SQL statement: SQLSTATE[42S22]: Column not found: 1054 Unknown column 'tags' in 'where clause'
* [3310](http://x2software.com/index.php/bugReports/3310): X2MergeableBehavior and its behaviors do not have a method or closure named "setMergedField".
* [3312](http://x2software.com/index.php/bugReports/3312): The system is unable to find the requested action "id".
* [3323](http://x2software.com/index.php/bugReports/3323): Trying to get property of non-object
* [3324](http://x2software.com/index.php/bugReports/3324): Eigenschaft "Contacts.Array ist nicht definiert."
* [3330](http://x2software.com/index.php/bugReports/3330): Relationships labelling bug

# 5.4.1 #
12/18/2015
* General Changelog / Developer Notes
Expand Down
30 changes: 23 additions & 7 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,27 @@
# 5.4.1 #
12/18/2015
# 5.4.2 #
1/7/2016
* General Changelog / Developer Notes
* Fixed opened email display in action history
* Fixed mass action menu displaying when scrolling up
* Fixed 404 error caused by clicking on a user profile from the activity feed
* Fixed avatars not displaying correctly
* Fixes and improvements to X2Touch
* X2Touch changes:
* Added support for the Topics module
* Module form layouts can now be customized from the new "Mobile App Form Editor" admin page
* Improved error handling of automated email logging
* Action History "Email From" filter now includes logged inbound emails
* New option on the "Email Settings" admin page to enable List-Unsubscribe email header
* Updated module delete functionality to clean up associated custom module summary widgets
* Updated Process module to allow for financial information on any module type
* Tracked Bug Fixes:
* [3189](http://x2software.com/index.php/bugReports/3189): CDbCommand failed to execute the SQL statement: SQLSTATE[42S22]: Column not found: 1054 Unknown column 't.createDate' in 'having clause'
* [3283](http://x2software.com/index.php/bugReports/3283): file_exists(): open_basedir restriction in effect. File is not within the allowed path(s)
* [3296](http://x2software.com/index.php/bugReports/3296): CDbCommand failed to execute the SQL statement: SQLSTATE[23000]: Integrity constraint violation: 1062 Duplicate entry 'Admin' for key 'PRIMARY'
* [3300](http://x2software.com/index.php/bugReports/3300): array_flip(): Can only flip STRING and INTEGER values!
* [3302](http://x2software.com/index.php/bugReports/3302): CDbCommand failed to execute the SQL statement: SQLSTATE[HY000]: General error: 1366 Incorrect integer value: '' for column 'active' at row 1
* [3303](http://x2software.com/index.php/bugReports/3303): CDbCommand failed to execute the SQL statement: SQLSTATE[42S22]: Column not found: 1054 Unknown column 'tags' in 'where clause'
* [3310](http://x2software.com/index.php/bugReports/3310): X2MergeableBehavior and its behaviors do not have a method or closure named "setMergedField".
* [3312](http://x2software.com/index.php/bugReports/3312): The system is unable to find the requested action "id".
* [3323](http://x2software.com/index.php/bugReports/3323): Trying to get property of non-object
* [3324](http://x2software.com/index.php/bugReports/3324): Eigenschaft "Contacts.Array ist nicht definiert."
* [3330](http://x2software.com/index.php/bugReports/3330): Relationships labelling bug


# Introduction #
Welcome to X2CRM!
Expand Down
2 changes: 1 addition & 1 deletion x2engine/compass/css/lib/_colors.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*****************************************************************************************
* X2Engine Open Source Edition is a customer relationship management program developed by
* X2Engine, Inc. Copyright (C) 2011-2015 X2Engine Inc.
* X2Engine, Inc. Copyright (C) 2011-2016 X2Engine Inc.
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU Affero General Public License version 3 as published by the
Expand Down
2 changes: 1 addition & 1 deletion x2engine/compass/css/lib/_font-awesome.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*****************************************************************************************
* X2Engine Open Source Edition is a customer relationship management program developed by
* X2Engine, Inc. Copyright (C) 2011-2015 X2Engine Inc.
* X2Engine, Inc. Copyright (C) 2011-2016 X2Engine Inc.
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU Affero General Public License version 3 as published by the
Expand Down
2 changes: 1 addition & 1 deletion x2engine/compass/css/lib/_fonts.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*****************************************************************************************
* X2Engine Open Source Edition is a customer relationship management program developed by
* X2Engine, Inc. Copyright (C) 2011-2015 X2Engine Inc.
* X2Engine, Inc. Copyright (C) 2011-2016 X2Engine Inc.
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU Affero General Public License version 3 as published by the
Expand Down
2 changes: 1 addition & 1 deletion x2engine/compass/css/lib/_icons.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*****************************************************************************************
* X2Engine Open Source Edition is a customer relationship management program developed by
* X2Engine, Inc. Copyright (C) 2011-2015 X2Engine Inc.
* X2Engine, Inc. Copyright (C) 2011-2016 X2Engine Inc.
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU Affero General Public License version 3 as published by the
Expand Down
2 changes: 1 addition & 1 deletion x2engine/compass/css/lib/_login-shared.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*****************************************************************************************
* X2Engine Open Source Edition is a customer relationship management program developed by
* X2Engine, Inc. Copyright (C) 2011-2015 X2Engine Inc.
* X2Engine, Inc. Copyright (C) 2011-2016 X2Engine Inc.
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU Affero General Public License version 3 as published by the
Expand Down
2 changes: 1 addition & 1 deletion x2engine/compass/css/lib/_standards.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*****************************************************************************************
* X2Engine Open Source Edition is a customer relationship management program developed by
* X2Engine, Inc. Copyright (C) 2011-2015 X2Engine Inc.
* X2Engine, Inc. Copyright (C) 2011-2016 X2Engine Inc.
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU Affero General Public License version 3 as published by the
Expand Down
2 changes: 1 addition & 1 deletion x2engine/compass/css/lib/_x2-icons.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*****************************************************************************************
* X2Engine Open Source Edition is a customer relationship management program developed by
* X2Engine, Inc. Copyright (C) 2011-2015 X2Engine Inc.
* X2Engine, Inc. Copyright (C) 2011-2016 X2Engine Inc.
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU Affero General Public License version 3 as published by the
Expand Down
2 changes: 1 addition & 1 deletion x2engine/compass/css/lib/forms.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*****************************************************************************************
* X2Engine Open Source Edition is a customer relationship management program developed by
* X2Engine, Inc. Copyright (C) 2011-2015 X2Engine Inc.
* X2Engine, Inc. Copyright (C) 2011-2016 X2Engine Inc.
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU Affero General Public License version 3 as published by the
Expand Down
2 changes: 1 addition & 1 deletion x2engine/compass/protected/modules/actions/assets/css/actionForms.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!***************************************************************************************
* X2Engine Open Source Edition is a customer relationship management program developed by
* X2Engine, Inc. Copyright (C) 2011-2015 X2Engine Inc.
* X2Engine, Inc. Copyright (C) 2011-2016 X2Engine Inc.
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU Affero General Public License version 3 as published by the
Expand Down
2 changes: 1 addition & 1 deletion x2engine/compass/protected/modules/calendar/assets/css/calendarLayout.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!***************************************************************************************
* X2Engine Open Source Edition is a customer relationship management program developed by
* X2Engine, Inc. Copyright (C) 2011-2015 X2Engine Inc.
* X2Engine, Inc. Copyright (C) 2011-2016 X2Engine Inc.
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU Affero General Public License version 3 as published by the
Expand Down
2 changes: 1 addition & 1 deletion x2engine/compass/protected/modules/docs/assets/css/index.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!***************************************************************************************
* X2Engine Open Source Edition is a customer relationship management program developed by
* X2Engine, Inc. Copyright (C) 2011-2015 X2Engine Inc.
* X2Engine, Inc. Copyright (C) 2011-2016 X2Engine Inc.
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU Affero General Public License version 3 as published by the
Expand Down
2 changes: 1 addition & 1 deletion x2engine/compass/protected/modules/marketing/assets/css/campaignForm.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!***************************************************************************************
* X2Engine Open Source Edition is a customer relationship management program developed by
* X2Engine, Inc. Copyright (C) 2011-2015 X2Engine Inc.
* X2Engine, Inc. Copyright (C) 2011-2016 X2Engine Inc.
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU Affero General Public License version 3 as published by the
Expand Down
2 changes: 1 addition & 1 deletion x2engine/compass/protected/modules/marketing/assets/css/campaignView.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!***************************************************************************************
* X2Engine Open Source Edition is a customer relationship management program developed by
* X2Engine, Inc. Copyright (C) 2011-2015 X2Engine Inc.
* X2Engine, Inc. Copyright (C) 2011-2016 X2Engine Inc.
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU Affero General Public License version 3 as published by the
Expand Down
2 changes: 1 addition & 1 deletion x2engine/compass/protected/modules/marketing/assets/css/emailProgressControl.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!***************************************************************************************
* X2Engine Open Source Edition is a customer relationship management program developed by
* X2Engine, Inc. Copyright (C) 2011-2015 X2Engine Inc.
* X2Engine, Inc. Copyright (C) 2011-2016 X2Engine Inc.
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU Affero General Public License version 3 as published by the
Expand Down
2 changes: 1 addition & 1 deletion x2engine/compass/protected/modules/media/assets/css/media.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!***************************************************************************************
* X2Engine Open Source Edition is a customer relationship management program developed by
* X2Engine, Inc. Copyright (C) 2011-2015 X2Engine Inc.
* X2Engine, Inc. Copyright (C) 2011-2016 X2Engine Inc.
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU Affero General Public License version 3 as published by the
Expand Down
2 changes: 1 addition & 1 deletion x2engine/compass/protected/modules/media/assets/css/update.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!***************************************************************************************
* X2Engine Open Source Edition is a customer relationship management program developed by
* X2Engine, Inc. Copyright (C) 2011-2015 X2Engine Inc.
* X2Engine, Inc. Copyright (C) 2011-2016 X2Engine Inc.
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU Affero General Public License version 3 as published by the
Expand Down
2 changes: 1 addition & 1 deletion x2engine/compass/protected/modules/media/assets/css/view.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!***************************************************************************************
* X2Engine Open Source Edition is a customer relationship management program developed by
* X2Engine, Inc. Copyright (C) 2011-2015 X2Engine Inc.
* X2Engine, Inc. Copyright (C) 2011-2016 X2Engine Inc.
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU Affero General Public License version 3 as published by the
Expand Down
3 changes: 2 additions & 1 deletion x2engine/compass/protected/modules/mobile/assets/css/_mobileColors.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*****************************************************************************************
* X2Engine Open Source Edition is a customer relationship management program developed by
* X2Engine, Inc. Copyright (C) 2011-2015 X2Engine Inc.
* X2Engine, Inc. Copyright (C) 2011-2016 X2Engine Inc.
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU Affero General Public License version 3 as published by the
Expand Down Expand Up @@ -37,6 +37,7 @@
@import "colors";

// general
$borderColor: darken($lightGray, 2%);
$greenHighlight: #13A513;
$backgroundColor: white;
$text: lighten(black, 5%);
Expand Down
103 changes: 102 additions & 1 deletion x2engine/compass/protected/modules/mobile/assets/css/_mobileStandards.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*****************************************************************************************
* X2Engine Open Source Edition is a customer relationship management program developed by
* X2Engine, Inc. Copyright (C) 2011-2015 X2Engine Inc.
* X2Engine, Inc. Copyright (C) 2011-2016 X2Engine Inc.
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU Affero General Public License version 3 as published by the
Expand Down Expand Up @@ -40,6 +40,32 @@
@include box-shadow(0 3px 11px 0px gray);
}

@mixin btn-states($opacity: 0.1) {
&:hover {
background: rgba(0,0,0, $opacity);
}
&:active {
background: rgba(0,0,0, $opacity);
//background: rgba(0,0,0,0.15);
}
}

@mixin popup-menu {
ul {
background: $menuBackgroundColor;
color: $menuText;
.ui-popup {
border: none;
}
a {
color: $menuText;
border: none;
text-decoration: none;
}
box-shadow: 0px 3px 11px #2D2D2D;
}
}

/*
header
*/
Expand Down Expand Up @@ -79,6 +105,30 @@ $itemHeight: 61px;
margin-bottom: 5px;
}

@mixin rich-record-index {
.record-list-item {
background: white;
padding: 15px 0;
cursor: default;
overflow-y: hidden;
height: auto;
margin-bottom: 10px;
border-top: 1px solid $lightGray;
@include box-shadow(0px 1px 2px lighten($borderColor, 3%));
}
}

@mixin photo-attachment {
.photo-attachment-container {
img {
max-width: 100%;
@media (min-width: 500px) {
max-width: 500px;
}
}
}
}

/*
panel
*/
Expand Down Expand Up @@ -107,3 +157,54 @@ forms
*/

$inputHeight: 46px;

@mixin text-input {
.ui-input-text {
border: 1px solid $lightGray;
border-radius: 3px;
height: $inputHeight;
input {
height: $inputHeight;
padding-top: 0;
padding-bottom: 0;
}
@include box-shadow(inset 0px 1px 3px $itemBorderColor);
.x2-autocomplete-results {
position: absolute;
left: 0;
right: 0;
width: 100%;
background: white;
z-index: 1000;
}
&.error {
border-color: $inputErrorBorder;
@include box-shadow(inset 0px 1px 3px lighten($inputErrorBorder,15%));
background: lighten($inputErrorBorder, 30%);
input.error {
}
}
}
}

/*
users
*/

@mixin avatar($dimension:45px) {
.avatar {
.avatar-image {
border: 1px solid $borderColor;
border-radius: 50%;
width: $dimension;
height: $dimension;
line-height: $dimension;
text-align: center;
overflow: hidden;
&.default-avatar {
background: $lightGray;
color: darken($lightGray, 17%);
}
}
}
}
2 changes: 1 addition & 1 deletion x2engine/compass/protected/modules/mobile/assets/css/about.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*****************************************************************************************
* X2Engine Open Source Edition is a customer relationship management program developed by
* X2Engine, Inc. Copyright (C) 2011-2015 X2Engine Inc.
* X2Engine, Inc. Copyright (C) 2011-2016 X2Engine Inc.
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU Affero General Public License version 3 as published by the
Expand Down
Loading

0 comments on commit b6aac5e

Please sign in to comment.