57 changes: 34 additions & 23 deletions x2engine/compass/themes/x2engine/css/responsiveLayout.scss
57 changes: 34 additions & 23 deletions x2engine/compass/themes/x2engine/css/responsiveRecordView.scss
57 changes: 34 additions & 23 deletions x2engine/compass/themes/x2engine/css/responsiveUIElements.scss
57 changes: 34 additions & 23 deletions x2engine/compass/themes/x2engine/css/responsiveX2Forms.scss
57 changes: 34 additions & 23 deletions x2engine/compass/themes/x2engine/css/screen.scss
57 changes: 34 additions & 23 deletions x2engine/compass/themes/x2engine/css/sortableWidgets.scss
57 changes: 34 additions & 23 deletions x2engine/compass/themes/x2engine/css/twitter.scss
57 changes: 34 additions & 23 deletions x2engine/compass/themes/x2engine/css/ui-elements.scss
57 changes: 34 additions & 23 deletions x2engine/compass/themes/x2engine/css/viewChangelog.scss
57 changes: 34 additions & 23 deletions x2engine/compass/themes/x2engine/css/whatsNew.scss
57 changes: 34 additions & 23 deletions x2engine/compass/themes/x2engine/css/widgetListCombined.scss
57 changes: 34 additions & 23 deletions x2engine/compass/themes/x2engine/css/workflowFunnel.scss
57 changes: 34 additions & 23 deletions x2engine/compass/themes/x2engine/css/x2chart.scss
57 changes: 34 additions & 23 deletions x2engine/compass/themes/x2engine/css/x2forms.scss
57 changes: 34 additions & 23 deletions x2engine/css/lib/forms.css
6 changes: 1 addition & 5 deletions x2engine/install.php
2 changes: 1 addition & 1 deletion x2engine/js/X2GridView/NewListFromSelection.js
6 changes: 3 additions & 3 deletions x2engine/js/X2Tags/TagCreationContainer.js
1 change: 1 addition & 0 deletions x2engine/js/activityFeed.js
2 changes: 1 addition & 1 deletion x2engine/js/sortableWidgets/RecordViewWidgetManager.js
32 changes: 5 additions & 27 deletions x2engine/js/widgets.js
35 changes: 31 additions & 4 deletions x2engine/protected/components/EmailDeliveryBehavior.php
8 changes: 4 additions & 4 deletions x2engine/protected/components/ImportExportBehavior.php
1 change: 1 addition & 0 deletions x2engine/protected/components/InlineEmailAction.php
2 changes: 1 addition & 1 deletion x2engine/protected/components/RecordViewLayoutManager.php
79 changes: 53 additions & 26 deletions x2engine/protected/components/TagBehavior.php
16 changes: 12 additions & 4 deletions x2engine/protected/components/TranslationManager.php
17 changes: 11 additions & 6 deletions x2engine/protected/components/WebFormAction.php
52 changes: 47 additions & 5 deletions x2engine/protected/components/X2ClientScript.php
2 changes: 1 addition & 1 deletion x2engine/protected/components/X2GridView.php
52 changes: 38 additions & 14 deletions x2engine/protected/components/X2LinkableBehavior.php
2 changes: 1 addition & 1 deletion x2engine/protected/components/phpMailer/LICENSE
49 changes: 49 additions & 0 deletions x2engine/protected/components/phpMailer/PHPMailerAutoload.php
6,333 changes: 3,564 additions & 2,769 deletions x2engine/protected/components/phpMailer/class.phpmailer.php
755 changes: 367 additions & 388 deletions x2engine/protected/components/phpMailer/class.pop3.php
2,105 changes: 1,127 additions & 978 deletions x2engine/protected/components/phpMailer/class.smtp.php
107 changes: 107 additions & 0 deletions x2engine/protected/components/util/StringUtil.php
17 changes: 7 additions & 10 deletions x2engine/protected/components/views/mediaBox.php
102 changes: 23 additions & 79 deletions x2engine/protected/components/views/webForm.php
15 changes: 15 additions & 0 deletions x2engine/protected/components/x2flow/X2FlowItem.php
135 changes: 100 additions & 35 deletions x2engine/protected/components/x2flow/actions/X2FlowCreateEvent.php
19 changes: 16 additions & 3 deletions x2engine/protected/components/x2flow/actions/X2FlowEmail.php
12 changes: 10 additions & 2 deletions x2engine/protected/components/x2flow/triggers/BaseTagTrigger.php
4 changes: 2 additions & 2 deletions x2engine/protected/config/X2Config.php
92 changes: 74 additions & 18 deletions x2engine/protected/controllers/AdminController.php
20 changes: 17 additions & 3 deletions x2engine/protected/controllers/ProfileController.php
36 changes: 24 additions & 12 deletions x2engine/protected/controllers/SearchController.php
58 changes: 12 additions & 46 deletions x2engine/protected/controllers/SiteController.php
6 changes: 6 additions & 0 deletions x2engine/protected/data/RBAC.sql
38 changes: 0 additions & 38 deletions x2engine/protected/extensions/UniqueAttributesValidator.php

This file was deleted.

5 changes: 3 additions & 2 deletions x2engine/protected/messages/de/accounts.php
3 changes: 2 additions & 1 deletion x2engine/protected/messages/el/accounts.php
3 changes: 2 additions & 1 deletion x2engine/protected/messages/es/accounts.php
3 changes: 2 additions & 1 deletion x2engine/protected/messages/fa/accounts.php
3 changes: 2 additions & 1 deletion x2engine/protected/messages/fr/accounts.php
3 changes: 2 additions & 1 deletion x2engine/protected/messages/he/accounts.php
3 changes: 2 additions & 1 deletion x2engine/protected/messages/it/accounts.php
3 changes: 2 additions & 1 deletion x2engine/protected/messages/ja/accounts.php
3 changes: 2 additions & 1 deletion x2engine/protected/messages/ko/accounts.php
3 changes: 2 additions & 1 deletion x2engine/protected/messages/nl/accounts.php
3 changes: 2 additions & 1 deletion x2engine/protected/messages/pl/accounts.php
3 changes: 2 additions & 1 deletion x2engine/protected/messages/pt/accounts.php
79 changes: 5 additions & 74 deletions x2engine/protected/messages/ru/accounts.php
24 changes: 1 addition & 23 deletions x2engine/protected/messages/ru/install.php
1 change: 1 addition & 0 deletions x2engine/protected/messages/template/accounts.php
1 change: 1 addition & 0 deletions x2engine/protected/messages/zh_cn/accounts.php
7 changes: 7 additions & 0 deletions x2engine/protected/models/Admin.php
7 changes: 7 additions & 0 deletions x2engine/protected/models/Dropdowns.php
98 changes: 83 additions & 15 deletions x2engine/protected/models/Events.php
20 changes: 19 additions & 1 deletion x2engine/protected/models/Fields.php
14 changes: 12 additions & 2 deletions x2engine/protected/models/InlineEmail.php
10 changes: 8 additions & 2 deletions x2engine/protected/models/Modules.php
68 changes: 30 additions & 38 deletions x2engine/protected/models/Profile.php
3 changes: 2 additions & 1 deletion x2engine/protected/models/RelationshipsGridModel.php
44 changes: 29 additions & 15 deletions x2engine/protected/models/Tags.php
3 changes: 2 additions & 1 deletion x2engine/protected/models/X2Flow.php
46 changes: 26 additions & 20 deletions x2engine/protected/models/X2Model.php
18 changes: 17 additions & 1 deletion x2engine/protected/modules/actions/models/ActionText.php
2 changes: 1 addition & 1 deletion x2engine/protected/modules/calendar/models/X2Calendar.php
2 changes: 0 additions & 2 deletions x2engine/protected/modules/contacts/models/Contacts.php
4 changes: 2 additions & 2 deletions x2engine/protected/modules/contacts/models/X2List.php
17 changes: 6 additions & 11 deletions x2engine/protected/modules/docs/controllers/DocsController.php
4 changes: 3 additions & 1 deletion x2engine/protected/modules/docs/models/Docs.php
4 changes: 2 additions & 2 deletions x2engine/protected/modules/groups/models/Groups.php
14 changes: 13 additions & 1 deletion x2engine/protected/modules/marketing/models/Campaign.php
2 changes: 1 addition & 1 deletion x2engine/protected/modules/marketing/models/WebForm.php
23 changes: 19 additions & 4 deletions x2engine/protected/modules/media/controllers/MediaController.php
4 changes: 2 additions & 2 deletions x2engine/protected/modules/media/data/install.sql
8 changes: 2 additions & 6 deletions x2engine/protected/modules/media/models/Media.php
24 changes: 12 additions & 12 deletions x2engine/protected/modules/mobile/assets/css/main.css
122 changes: 72 additions & 50 deletions x2engine/protected/modules/mobile/assets/css/x2MobileTheme.css
2 changes: 1 addition & 1 deletion x2engine/protected/modules/mobile/views/site/activity.php
38 changes: 19 additions & 19 deletions x2engine/protected/modules/quotes/assets/css/inlineQuotes.css
14 changes: 7 additions & 7 deletions x2engine/protected/modules/quotes/assets/css/lineItemsMain.css
20 changes: 10 additions & 10 deletions x2engine/protected/modules/quotes/assets/css/lineItemsMini.css
42 changes: 21 additions & 21 deletions x2engine/protected/modules/quotes/assets/css/lineItemsRead.css
220 changes: 121 additions & 99 deletions x2engine/protected/modules/quotes/assets/css/lineItemsWrite.css
183 changes: 108 additions & 75 deletions x2engine/protected/modules/quotes/assets/css/productTable.css
20 changes: 13 additions & 7 deletions x2engine/protected/modules/quotes/models/Quote.php
1 change: 0 additions & 1 deletion x2engine/protected/modules/quotes/views/quotes/update.php
91 changes: 91 additions & 0 deletions x2engine/protected/modules/reports/assets/css/printChart.css
272 changes: 272 additions & 0 deletions x2engine/protected/modules/reports/assets/css/reports.css
7 changes: 0 additions & 7 deletions x2engine/protected/modules/services/views/services/create.php
7 changes: 0 additions & 7 deletions x2engine/protected/modules/services/views/services/update.php
2 changes: 1 addition & 1 deletion x2engine/protected/modules/users/models/User.php
100 changes: 50 additions & 50 deletions x2engine/protected/modules/workflow/assets/css/dragAndDrop.css
52 changes: 26 additions & 26 deletions x2engine/protected/modules/workflow/assets/css/view.css
2 changes: 1 addition & 1 deletion x2engine/protected/modules/workflow/models/Workflow.php
8 changes: 2 additions & 6 deletions x2engine/protected/tests/TestingAuxLib.php
7 changes: 7 additions & 0 deletions x2engine/protected/tests/X2DbTestCase.php
22 changes: 17 additions & 5 deletions x2engine/protected/tests/X2WebTestCase.php
16 changes: 13 additions & 3 deletions x2engine/protected/tests/api/APIModelTest.php
4 changes: 4 additions & 0 deletions x2engine/protected/tests/data/csvs/contacts-visibility.csv
2 changes: 1 addition & 1 deletion x2engine/protected/tests/data/csvs/contacts.csv
3 changes: 3 additions & 0 deletions x2engine/protected/tests/data/csvs/lineendings-contacts.csv
4 changes: 2 additions & 2 deletions x2engine/protected/tests/fixtures/x2_contacts.ImportTest.php
75 changes: 75 additions & 0 deletions x2engine/protected/tests/fixtures/x2_email_inboxes.php
28 changes: 28 additions & 0 deletions x2engine/protected/tests/fixtures/x2_events.GetEvents.php
205 changes: 137 additions & 68 deletions x2engine/protected/tests/functional/pageCrawlers/VisitAllPagesTest.php
2 changes: 1 addition & 1 deletion x2engine/protected/tests/testconstants.php
147 changes: 147 additions & 0 deletions x2engine/protected/tests/unit/components/TagBehaviorTest.php
94 changes: 94 additions & 0 deletions x2engine/protected/tests/unit/components/util/StringUtilTest.php
73 changes: 62 additions & 11 deletions x2engine/protected/tests/unit/models/EventsTest.php
147 changes: 146 additions & 1 deletion x2engine/protected/tests/unit/models/ProfileTest.php
136 changes: 136 additions & 0 deletions x2engine/protected/tests/unit/models/TagsTest.php
4 changes: 3 additions & 1 deletion x2engine/protected/views/admin/convertCustomModules.php
30 changes: 17 additions & 13 deletions x2engine/protected/views/admin/createUpdateField.php
3 changes: 2 additions & 1 deletion x2engine/protected/views/admin/exportModels.php
248 changes: 0 additions & 248 deletions x2engine/protected/views/admin/formEditor.php

This file was deleted.

4 changes: 3 additions & 1 deletion x2engine/protected/views/admin/manageDropDowns.php
11 changes: 9 additions & 2 deletions x2engine/protected/views/admin/manageTags.php
12 changes: 4 additions & 8 deletions x2engine/protected/views/admin/processModels.php
4 changes: 2 additions & 2 deletions x2engine/protected/views/admin/rollbackImport.php
3 changes: 2 additions & 1 deletion x2engine/protected/views/profile/_activityFeed.php
2 changes: 1 addition & 1 deletion x2engine/protected/views/profile/_feedFilters.php
4 changes: 2 additions & 2 deletions x2engine/protected/views/search/searchTags.php
175 changes: 0 additions & 175 deletions x2engine/protected/views/site/listener.php

This file was deleted.

38 changes: 19 additions & 19 deletions x2engine/themes/x2engine/css/about-page.css
774 changes: 420 additions & 354 deletions x2engine/themes/x2engine/css/activityFeed.css
4 changes: 2 additions & 2 deletions x2engine/themes/x2engine/css/androidLayout.css
6 changes: 3 additions & 3 deletions x2engine/themes/x2engine/css/auxlib.css
193 changes: 113 additions & 80 deletions x2engine/themes/x2engine/css/comboBox.css
199 changes: 116 additions & 83 deletions x2engine/themes/x2engine/css/components/clockWidget.css
79 changes: 45 additions & 34 deletions x2engine/themes/x2engine/css/components/leftWidgets/profileInfo.css
255 changes: 144 additions & 111 deletions x2engine/themes/x2engine/css/components/smallCalendar.css
264 changes: 154 additions & 110 deletions x2engine/themes/x2engine/css/components/views/layoutEditor.css
107 changes: 59 additions & 48 deletions x2engine/themes/x2engine/css/components/views/recordAliasesWidget.css
476 changes: 271 additions & 205 deletions x2engine/themes/x2engine/css/createWebForm.css
90 changes: 45 additions & 45 deletions x2engine/themes/x2engine/css/details.css
535 changes: 295 additions & 240 deletions x2engine/themes/x2engine/css/form.css
168 changes: 95 additions & 73 deletions x2engine/themes/x2engine/css/gridview/responsiveStyles.css
408 changes: 226 additions & 182 deletions x2engine/themes/x2engine/css/gridview/styles.css
278 changes: 278 additions & 0 deletions x2engine/themes/x2engine/css/importexport.css
46 changes: 23 additions & 23 deletions x2engine/themes/x2engine/css/install.css
4 changes: 2 additions & 2 deletions x2engine/themes/x2engine/css/ipadLayout.css
1,221 changes: 660 additions & 561 deletions x2engine/themes/x2engine/css/layout.css
16 changes: 8 additions & 8 deletions x2engine/themes/x2engine/css/listview/styles.css
341 changes: 187 additions & 154 deletions x2engine/themes/x2engine/css/login.css
932 changes: 510 additions & 422 deletions x2engine/themes/x2engine/css/main.css
270 changes: 157 additions & 113 deletions x2engine/themes/x2engine/css/printPage.css
223 changes: 128 additions & 95 deletions x2engine/themes/x2engine/css/printableRecord.css
353 changes: 198 additions & 155 deletions x2engine/themes/x2engine/css/profile.css
93 changes: 52 additions & 41 deletions x2engine/themes/x2engine/css/profile/themeSelector.css
1,295 changes: 713 additions & 582 deletions x2engine/themes/x2engine/css/profileCombined.css
263 changes: 148 additions & 115 deletions x2engine/themes/x2engine/css/publisher.css
2 changes: 1 addition & 1 deletion x2engine/themes/x2engine/css/recordEdit.css
32 changes: 16 additions & 16 deletions x2engine/themes/x2engine/css/recordView.css
10 changes: 5 additions & 5 deletions x2engine/themes/x2engine/css/responsiveActivityFeed.css
285 changes: 159 additions & 126 deletions x2engine/themes/x2engine/css/responsiveCombined.css
106 changes: 53 additions & 53 deletions x2engine/themes/x2engine/css/responsiveLayout.css
14 changes: 7 additions & 7 deletions x2engine/themes/x2engine/css/responsiveRecordView.css
4 changes: 2 additions & 2 deletions x2engine/themes/x2engine/css/responsiveUIElements.css
4 changes: 2 additions & 2 deletions x2engine/themes/x2engine/css/responsiveX2Forms.css
613 changes: 323 additions & 290 deletions x2engine/themes/x2engine/css/screen.css
99 changes: 55 additions & 44 deletions x2engine/themes/x2engine/css/sortableWidgets.css
12 changes: 6 additions & 6 deletions x2engine/themes/x2engine/css/twitter.css
934 changes: 489 additions & 445 deletions x2engine/themes/x2engine/css/ui-elements.css
61 changes: 36 additions & 25 deletions x2engine/themes/x2engine/css/viewChangelog.css
62 changes: 31 additions & 31 deletions x2engine/themes/x2engine/css/whatsNew.css
28 changes: 14 additions & 14 deletions x2engine/themes/x2engine/css/workflowFunnel.css
100 changes: 50 additions & 50 deletions x2engine/themes/x2engine/css/x2chart.css
410 changes: 216 additions & 194 deletions x2engine/themes/x2engine/css/x2forms.css