0
0
Fork 0
mirror of https://github.com/salesagility/SuiteCRM.git synced 2025-03-12 20:46:54 +00:00
Commit graph

17 commits

Author SHA1 Message Date
j.dang
90c2bc94fa Fix activities and history queries
- Fix date_end/date_due aliasing for activities/history union queries.
- Cleanup files.
2019-10-09 15:31:03 +01:00
Horus68
34eb8562c6 Copyright notice update - Hotfix
Copyright notice update for hotfix branch
Changes: 
- Year 
- Double spaces
- Brand fix for SalesAgility Ltd. (was Salesagility Ltd)

Created from latest hotfix branch.
2018-08-01 20:14:25 +01:00
Dillon-Brown
6745e82ba0 indentation_type 2018-07-19 11:46:25 +01:00
Dillon-Brown
19cfb50dda single_blank_line_at_eof 2018-07-19 11:38:09 +01:00
Dillon-Brown
73d0b3c0fb no_trailing_whitespace_in_comment 2018-07-19 11:33:26 +01:00
Dillon-Brown
5d954f4d61 no_trailing_whitespace 2018-07-19 11:23:34 +01:00
Dillon-Brown
cf4b6aa9f3 no_spaces_after_function_name 2018-07-19 11:16:55 +01:00
Dillon-Brown
b772c8f942 indentation_type 2018-07-16 02:52:25 +01:00
Dillon-Brown
68f69400bc braces 2018-07-12 11:40:27 +01:00
Dillon Brown
5a6d9a9e32 Merge branch 'develop' into remove_closing_tags
# Conflicts:
#	include/TemplateHandler/TemplateHandler.php
#	include/ytree/Tree.php
#	install/language/en_us.lang.php
#	modules/ACL/ACLController.php
#	modules/ACL/language/en_us.lang.php
#	modules/ACLRoles/language/en_us.lang.php
#	modules/AOS_Contracts/language/en_us.lang.php
#	modules/AOS_Invoices/language/en_us.lang.php
#	modules/AOS_PDF_Templates/sendEmail.php
#	modules/AOS_Products/language/en_us.lang.php
#	modules/AOS_Products_Quotes/language/en_us.lang.php
#	modules/AOS_Quotes/language/en_us.lang.php
#	modules/AOS_Quotes/views/view.detail.php
#	modules/Accounts/language/en_us.lang.php
#	modules/Activities/OpenListView.php
#	modules/Administration/RebuildRelationship.php
#	modules/Bugs/language/en_us.lang.php
#	modules/Calendar/Dashlets/CalendarDashlet/CalendarDashlet.en_us.lang.php
#	modules/Calendar/Dashlets/CalendarDashlet/CalendarDashlet.es_es.lang.php
#	modules/Calendar/Dashlets/CalendarDashlet/CalendarDashlet.ru_ru.lang.php
#	modules/Calendar/language/en_us.lang.php
#	modules/CampaignTrackers/language/en_us.lang.php
#	modules/Campaigns/language/en_us.lang.php
#	modules/Charts/Dashlets/CampaignROIChartDashlet/CampaignROIChartDashlet.en_us.lang.php
#	modules/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.en_us.lang.php
#	modules/Charts/Dashlets/OpportunitiesByLeadSourceByOutcomeDashlet/OpportunitiesByLeadSourceByOutcomeDashlet.en_us.lang.php
#	modules/Charts/Dashlets/OpportunitiesByLeadSourceDashlet/OpportunitiesByLeadSourceDashlet.en_us.lang.php
#	modules/Charts/Dashlets/OutcomeByMonthDashlet/OutcomeByMonthDashlet.en_us.lang.php
#	modules/Charts/Dashlets/PipelineBySalesStageDashlet/PipelineBySalesStageDashlet.en_us.lang.php
#	modules/Configurator/language/en_us.lang.php
#	modules/Connectors/connectors/sources/ext/rest/facebook/language/en_us.lang.php
#	modules/Connectors/connectors/sources/ext/rest/twitter/language/en_us.lang.php
#	modules/Contacts/language/en_us.lang.php
#	modules/Contacts/metadata/subpanels/default.php
#	modules/Documents/language/en_us.lang.php
#	modules/DynamicFields/language/en_us.lang.php
#	modules/EmailTemplates/Menu.php
#	modules/Emails/DetailView.php
#	modules/Emails/Email.php
#	modules/Emails/ListViewGroup.php
#	modules/Emails/ListViewHome.php
#	modules/Emails/MassDelete.php
#	modules/Emails/Menu.php
#	modules/Emails/SubPanelViewRecipients.php
#	modules/Emails/views/view.modulelistmenu.php
#	modules/Home/Dashlets/ChartsDashlet/ChartsDashlet.en_us.lang.php
#	modules/Home/Dashlets/RSSDashlet/RSSDashlet.en_us.lang.php
#	modules/InboundEmail/language/en_us.lang.php
#	modules/Leads/language/en_us.lang.php
#	modules/MailMerge/language/en_us.lang.php
#	modules/Meetings/language/en_us.lang.php
#	modules/MergeRecords/language/en_us.lang.php
#	modules/ModuleBuilder/Module/StudioModule.php
#	modules/ModuleBuilder/Module/StudioModuleFactory.php
#	modules/ModuleBuilder/parsers/views/DashletMetaDataParser.php
#	modules/ModuleBuilder/parsers/views/PopupMetaDataParser.php
#	modules/Notes/Note.php
#	modules/ProjectTask/language/en_us.lang.php
#	modules/ProspectLists/language/en_us.lang.php
#	modules/ResourceCalendar/language/en_us.lang.php
#	modules/Schedulers/language/en_us.lang.php
#	modules/SugarFeed/language/en_us.lang.php
#	modules/Users/authentication/SugarAuthenticate/SugarAuthenticateUser.php
#	tests/tests/include/utils/LogicHookTest.php
#	tests/tests/modules/Employees/EmployeeTest.php
#	tests/tests/modules/Project/ProjectTest.php
#	tests/tests/modules/ProspectLists/ProspectListTest.php
2018-01-19 11:31:16 +00:00
Dillon-Brown
162c352b45 Merge remote-tracking branch 'upstream/hotfix-7.8.x' into remove_closing_tags
# Conflicts:
#	include/SugarFields/Parsers/MetaParser.php
#	install/UserDemoData.php
#	install/download_patches.php
#	install/installSystemCheck.php
#	install/systemOptions.php
#	modules/Audit/Popup_picker.php
#	modules/Emails/metadata/subpanels/ForUnlinkedEmailHistory.php
#	modules/Employees/EmployeeStatus.php
#	modules/Employees/metadata/editviewdefs.php
2018-01-14 08:07:56 +00:00
Dillon Brown
7a73308980 Merge branch 'hotfix-7.8.x' into 7.8.x_merge
# Conflicts:
#	install/language/en_us.lang.php
#	modules/AOS_PDF_Templates/generatePdf.php
#	modules/Calls/language/en_us.lang.php
#	modules/Emails/EmailUI.php
#	modules/Emails/language/en_us.lang.php
#	modules/Emails/metadata/SearchFields.php
#	modules/Emails/metadata/subpanels/ForUnlinkedEmailHistory.php
#	modules/Emails/vardefs.php
#	modules/ModuleBuilder/language/en_us.lang.php
#	modules/SugarFeed/language/en_us.lang.php
#	modules/UpgradeWizard/language/en_us.lang.php
2018-01-10 13:28:28 +00:00
Matt Lorimer
a6ef86f2f8 Fix - Collection sub-panel filter 2018-01-07 21:39:06 +00:00
Dillon-Brown
eba5ce7913 Removed PHP closing tag 2017-10-07 00:06:08 +00:00
Gyula Madarasz
8125fc7165 email category 2017-04-12 12:49:11 +01:00
Matthew
b533ad20e5 Updated Script header 2014-07-07 16:33:41 +01:00
Matthew
8e51b0e900 initial commit 2013-09-23 20:30:44 +01:00