Skip to content

Commit

Permalink
Merge pull request #173 from X2Engine/revert-170-revert-169-pczupil-7.1
Browse files Browse the repository at this point in the history 
Revert "Revert "Pczupil 7.1 Open source into development""
  • Loading branch information
@pczupil
pczupil authored Aug 6, 2019
2 parents e1526f9 + 556f9f9 commit 8718c36
Show file tree
Hide file tree
Showing 2,495 changed files with 58,885 additions and 13,832 deletions.
65 changes: 62 additions & 3 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,70 @@
# 7.1 #

1/3/2019
* General Changelog / Developer Notes
* X2CRM is now compatible with PHP 7.1+

* Miscellaneous bug fixes
* Fixed issue with emailing where mail servers which are not configured to use VERP can still send email
* Removed list option from the reporting module
* A/B campaigns now work with dynamic lists
* Fixed issue where 'do not email' settings would get incorrectly set
* Fixed issue where a 500 error would occur if the 'maxFileSize' attribute was not created correctly
* Fixed issue where X2Flow would incorrectly reference a workflow ID
* Fixed issue where logging time on a record would incorrectly calculate time spent
* Fixed front-end with the complete stage action in X2Workflow where the note textarea was covering the stage selection dropdown

# 7.0 #
10/19/2018

* General Changelog / Developer Notes
* Accounts, Leads and Opportunities are now listable
* Contacts can now be converted to leads
* Campaigns
* A/B testing for campaigns added
* Account, Lead and Opportunity lists can now all be used in campaigns
* Miscellaneous bug fixes

# 6.9.3 #
1/3/2018
* Fixed unrecognized field lastModifies bug

# 6.9.2 #
12/29/2017
* Fixed email bug

# 6.9.1 #
11/20/2017
* General Changelog / Developer Notes
* New Enterprise UI
* New Paper-White UI default theme
* Revamped Landing Page Designer
* Top Menu Dropdowns
* New X2HubServices integrations
* Contact Twitter feed
* LinkedIn user information autofill
* Dropbox integration
* Docusign Integration
* Miscellaneous bug fixes
* Workflow tag bug fix
* Calendar empty tables bug fix

# 6.9 #
08/22/2017
* General Changelog / Developer Notes
* Miscellaneous UI enhancements
* Green login logo
* New Green login logo
* New Enterprise edition released
* The enterprise edition of X2CRM is developed with enterprise users in mind
* New colorful icons for actions (these can be seen in the activity feed)
* New Native Code Editor
* The code editor allows the modification of the application code through the app itself. This allows power users to customize the app like never before! The code editor can be accessed via the X2Studio tools in the admin section of the app
* X2Workflows
* New stock X2Workflow rules added to the workflow system
* Restricted non-compatible actions from being attached to triggers, this is introduced in order to prevent users from making broken workflows.
* Miscellaneous bug fixes
* Login token bug fix
* UI bug fixes
* Fixed an issue with login where users would get immediately get logged out
* Fixed a UI bug where some smaller screens would prevent parts of the app from showing.

# 6.6 #
5/17/2017
Expand Down
9 changes: 0 additions & 9 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,6 @@ THIS IS DUE TO THE REMOVAL OF MCRYPT IN PHP 7.2. FOR MORE INFO, PLEASE CONTACT c
* Account, Lead and Opportunity lists can now all be used in campaigns
* Miscellaneous bug fixes

# 6.9 #
08/22/2017
* General Changelog / Developer Notes
* Miscellaneous UI enhancements
* Green login logo
* Miscellaneous bug fixes
* Login token bug fix
* UI bug fixes

# Introduction #
Welcome to X2CRM!
X2CRM is a next-generation, open source social sales application for small and
Expand Down
419 changes: 419 additions & 0 deletions RELEASE-NOTES.md
View file

Large diffs are not rendered by default.

638 changes: 21 additions & 617 deletions x2engine/LICENSE.txt
View file

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions 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
* X2 Engine, Inc. Copyright (C) 2011-2017 X2 Engine Inc.
* X2 Engine, Inc. Copyright (C) 2011-2019 X2 Engine 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 @@ -34,12 +34,15 @@
**********************************************************************************/





/***********************************************************************
* Grays
***********************************************************************/
$darkGray: #f5f5f5; // whitesmoke
$lightestGray: #F9F9F9;
$lightGray: #D9D9D9;
$lightGray: #E9E9E9;
$gray: #c5c5c5; // borders
$grayText: darken(#c5c5c5,27%);
$nearBlack: #454545;
Expand All @@ -60,6 +63,7 @@ $darkBlue: #004baf; // Blue found in links in screen.css
$metallicBlue: #384F6E; // Blue from the login Screen

$babyBlue: #C5EBFD;
$lightBabyBlue: #f4f7f9;
$darkBabyBlue: darken($babyBlue, 10%);

/***********************************************************************
Expand All @@ -79,7 +83,7 @@ $selectionGreen: mix(white, $highlightGreen, 52%);
* This section is made to correspond with the theme keys in ThemeGenerator
***********************************************************************/

$background: $lightestGray;
$background: white;
$content: white;
$text: $nearBlack;
$link: $darkBlue;
Expand Down
5 changes: 4 additions & 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
* X2 Engine, Inc. Copyright (C) 2011-2017 X2 Engine Inc.
* X2 Engine, Inc. Copyright (C) 2011-2019 X2 Engine 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 @@ -33,6 +33,9 @@
* "Powered by X2 Engine".
**********************************************************************************/




/************************************************
* This File is a pseudo-class translation of all
* the font-awesome classes. This way, these classes
Expand Down
5 changes: 4 additions & 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
* X2 Engine, Inc. Copyright (C) 2011-2017 X2 Engine Inc.
* X2 Engine, Inc. Copyright (C) 2011-2019 X2 Engine 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 @@ -33,6 +33,9 @@
* "Powered by X2 Engine".
**********************************************************************************/




/***************************************************
* This file is where new fonts should be included,
* with a mixin to include special fonts on a per-font
Expand Down
33 changes: 32 additions & 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
* X2 Engine, Inc. Copyright (C) 2011-2017 X2 Engine Inc.
* X2 Engine, Inc. Copyright (C) 2011-2019 X2 Engine 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 @@ -33,6 +33,9 @@
* "Powered by X2 Engine".
**********************************************************************************/




/************************************************
* This file mantains several important mixins for
* Font Icons. The two sources of font icons are
Expand Down Expand Up @@ -99,6 +102,7 @@
.stacked-icon {
display: inline-block;
@include fa-icon($icon);
visibility: hidden;
}

.stacked-icon:before {
Expand Down Expand Up @@ -176,3 +180,30 @@ $icon-list-x2: (
("contacts" "contact")
);

$icon-list-fa: (
("emailInboxes" "envelope")
("profile" "user")
//("actions" "play-circle")
//("accounts" "building")
//("opportunities" "bullseye")
//("marketing" "bullhorn")
("x2flow" "sitemap, %fa-rotate-270")
//("x2Leads" "star")
//("docs" "file-text")
//("groups" "users")
//("media" "music")
("users" "users")
("charts" "bar-chart")
("topics" "comments")
("bugReports" "bug")
//("reports" "file-o" "bar-chart")
("custom-module" "folder")
);
$icon-list-x2: (
("x2Activity" "activity")
("quotes" "quotes")
("services" "service")
//("workflow" "funnel")
//("products" "package")
("contacts" "contact")
);
9 changes: 6 additions & 3 deletions 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
* X2 Engine, Inc. Copyright (C) 2011-2017 X2 Engine Inc.
* X2 Engine, Inc. Copyright (C) 2011-2019 X2 Engine 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 @@ -33,6 +33,9 @@
* "Powered by X2 Engine".
**********************************************************************************/




@import "colors";

$loginText: #444343;
Expand All @@ -49,10 +52,10 @@ $defaultBgColor: $lightestGray;
@include linear-gradient(lighten($defaultBgColor, 8%), darken($defaultBgColor, 0%));
border-color: #203079;
&:hover {
@include box-shadow (inset 0 1px 1px rgba(0, 0, 0, 0.25));
background: darken($defaultBgColor, 10%);
}
&:active {
@include box-shadow (inset 0 1px 1px rgba(0, 0, 0, 0.45));
background: darken($defaultBgColor, 10%);
}
}

5 changes: 4 additions & 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
* X2 Engine, Inc. Copyright (C) 2011-2017 X2 Engine Inc.
* X2 Engine, Inc. Copyright (C) 2011-2019 X2 Engine 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 @@ -33,6 +33,9 @@
* "Powered by X2 Engine".
**********************************************************************************/




/***************************************
* This file is responsible for mantaining
* general purpose mixins and classes.
Expand Down
10 changes: 9 additions & 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
* X2 Engine, Inc. Copyright (C) 2011-2017 X2 Engine Inc.
* X2 Engine, Inc. Copyright (C) 2011-2019 X2 Engine 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 @@ -33,6 +33,9 @@
* "Powered by X2 Engine".
**********************************************************************************/




/*
Icon Font: x2-icons
*/
Expand Down Expand Up @@ -100,3 +103,8 @@
.icon-x2-logo:before { content: "\f117"; }
.icon-x2-logo-square:before { content: "\f116"; }

/* override with a blank content with fa-fw properties to fill in the space */
.icon-activity:before { content: ""; width: 1.28571429em; text-align: center; }
.icon-contact:before { content: ""; width: 1.28571429em; text-align: center;}
.icon-quotes:before { content: ""; width: 1.28571429em; text-align: center;}
.icon-service:before { content: ""; width: 1.28571429em; text-align: center;}
5 changes: 4 additions & 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
* X2 Engine, Inc. Copyright (C) 2011-2017 X2 Engine Inc.
* X2 Engine, Inc. Copyright (C) 2011-2019 X2 Engine 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 @@ -33,6 +33,9 @@
* "Powered by X2 Engine".
**********************************************************************************/




@mixin dark-label {
font-weight: bold;
font-size: 8pt;
Expand Down
5 changes: 4 additions & 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
* X2 Engine, Inc. Copyright (C) 2011-2017 X2 Engine Inc.
* X2 Engine, Inc. Copyright (C) 2011-2019 X2 Engine 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 @@ -33,6 +33,9 @@
* "Powered by X2 Engine".
**********************************************************************************/




form.action-subtype-form {
*:not(.action-duration-display) {
box-sizing: border-box;
Expand Down
5 changes: 4 additions & 1 deletion x2engine/compass/protected/modules/actions/assets/css/actionTimersForm.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
* X2 Engine, Inc. Copyright (C) 2011-2017 X2 Engine Inc.
* X2 Engine, Inc. Copyright (C) 2011-2019 X2 Engine 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 @@ -33,6 +33,9 @@
* "Powered by X2 Engine".
**********************************************************************************/




/* line 25, ../../../../../compass/sass/protected/modules/actions/assets/css/actionTimersForm.scss */
/* line 25, ../../../../../compass/sass/protected/modules/actions/assets/css/actionTimersForm.scss */

Expand Down
9 changes: 6 additions & 3 deletions 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
* X2 Engine, Inc. Copyright (C) 2011-2017 X2 Engine Inc.
* X2 Engine, Inc. Copyright (C) 2011-2019 X2 Engine 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 @@ -33,6 +33,9 @@
* "Powered by X2 Engine".
**********************************************************************************/




@import "standards";
@import "colors";

Expand All @@ -44,7 +47,6 @@ table.page-title {

/* @theme background: highlight1 */

border-bottom: none !important;
display: block;
height: 19px;
box-sizing: border-box;
Expand Down Expand Up @@ -73,7 +75,8 @@ table.page-title {


#calendar {
margin-bottom: 5px;
margin-right: 20px;

.fc-event {
color: $eventTextColor;
border: 1px solid rgb(34, 34, 255) !important;
Expand Down
Loading

0 comments on commit 8718c36

Please sign in to comment.