0
0
Fork 0
mirror of https://github.com/salesagility/SuiteCRM.git synced 2025-03-15 05:44:49 +00:00
Commit graph

65 commits

Author SHA1 Message Date
Clemente Raposo
b8ab041050 PHP 8.2 - Fix sugar_button tpl calls 2023-07-18 15:54:18 +01:00
Jack Anderson
aefadada27 Run rector on modules folder 2023-07-18 15:53:48 +01:00
Clemente Raposo
9aff7071bb Run rector on modules folder 2023-07-18 15:53:09 +01:00
Dillon-Brown
56a8c296b4 Close - Use a maintained library to minify JS
Signed-off-by: Dillon-Brown <dillon.brown@salesagility.com>
2021-03-26 21:50:24 +00:00
Dillon-Brown
a2afe23dec Merge remote-tracking branch 'upstream/hotfix-7.10.x' into hotfix_merge_10
# Conflicts:
#	.travis.yml
#	README.md
#	composer.json
#	composer.lock
#	include/Smarty/plugins/function.sugar_button.php
#	modules/Users/reassignUserRecords.php
#	service/v4_1/SugarWebServiceUtilv4_1.php
#	suitecrm_version.php
#	tests/unit/phpunit/data/SugarBeanTest.php
2019-04-29 02:59:57 +01:00
Jose C. Massón
2f082cb5f7 FIX - Remove redundant require_once 2019-04-15 16:51:14 -03:00
Dillon-Brown
1cee25025f switch_case_semicolon_to_colon + switch_case_space + visibility_required 2019-01-25 14:28:56 +00:00
Dillon-Brown
84a5b32f19 single_blank_line_at_eof + single_class_element_per_statement + single_import_per_statement + single_line_after_imports 2019-01-25 14:26:18 +00:00
Dillon-Brown
a11f2aea67 no_trailing_whitespace + no_trailing_whitespace_in_comment 2019-01-25 14:24:15 +00:00
Dillon-Brown
2d243d3c9f no_spaces_after_function_name + no_spaces_inside_parenthesis 2019-01-25 14:22:15 +00:00
Dillon-Brown
26fc406b5e method_argument_space 2019-01-25 14:14:52 +00:00
Dillon-Brown
91ec023b10 indentation_type 2019-01-25 14:07:05 +00:00
Dillon-Brown
3f39d9f153 braces 2019-01-25 13:51:46 +00:00
Dillon-Brown
10d772c15f Merge remote-tracking branch 'upstream/hotfix' into develop_merge_2
# Conflicts:
#	include/generic/SugarWidgets/SugarWidgetSubPanelEditSecurityGroupUserButton.php
#	modules/Emails/include/ListView/ListViewDataEmails.php
2019-01-04 11:03:30 +00:00
Dillon-Brown
8f7fcdc842 Copyright revision 2018-12-31 14:25:24 +00:00
Gyula Madarasz
f5a310e859 Merge branch 'hotfix' of https://github.com/salesagility/SuiteCRM into develop_merge_hotfix 2018-10-30 18:04:30 +00:00
Dillon-Brown
221631707f Style.css + JS 2018-09-10 09:43:12 +01:00
Horus68
c1e486d675 fix part 1
fixing typos
2018-08-02 18:33:00 +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
acf296012d Revert "Merge branch 'hotfix' into develop"
This reverts commit d08f74643d, reversing
changes made to b137595f91.
2018-07-31 15:24:44 +01:00
Dillon-Brown
c35f5bc49c @PSR2 2018-07-24 15:42:24 +01:00
Dillon-Brown
ae82881c3d no_useless_else 2018-07-20 22:00:34 +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
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
32ca35db09 method_argument_space 2018-07-16 16:17:49 +01:00
Dillon-Brown
b772c8f942 indentation_type 2018-07-16 02:52:25 +01:00
Dillon-Brown
840ad0f5c0 visibility_required 2018-07-13 06:54:51 +01:00
Dillon-Brown
6caa071e62 no_spaces_inside_parenthesis 2018-07-12 15:44:45 +01:00
Dillon-Brown
68f69400bc braces 2018-07-12 11:40:27 +01:00
Dillon-Brown
4775b14953 function_declaration 2018-07-12 11:20:31 +01:00
Daniel Samson
3dcd0c8b42
Merge pull request from Dillon-Brown/psr-2-2
PSR2 - elseif
2018-07-10 11:42:15 +01:00
Daniel Samson
66df835d5e
Merge pull request from Dillon-Brown/psr-2-1
PSR2 - class definition
2018-07-10 11:41:28 +01:00
Dillon-Brown
510c4549ff PSR2 - elseif 2018-06-21 21:22:45 +01:00
Dillon-Brown
835a46058a PSR2 - class_definition 2018-06-21 21:05:18 +01:00
Dillon-Brown
c48f8c7f18 PSR-1 2018-06-21 11:21:03 +01:00
Gyula Madarasz
da53b0b112 fixing php errors 2018-04-03 17:02:37 +01:00
Gyula Madarasz
4787ef7daf Using db-manager instead of super globals 2018-04-03 16:25:21 +01:00
Dillon Brown
8f2ad588d9 Merge branch 'hotfix' into develop
# Conflicts:
#	data/SugarBean.php
#	include/ListView/ListView.php
#	include/ListView/ListViewSmarty.php
#	include/SugarPHPMailer.php
#	install/install_utils.php
#	modules/Administration/PasswordManager.php
#	modules/Administration/UpgradeAccess.php
#	modules/Contacts/Contact.php
#	modules/SecurityGroups/SecurityGroup.php
#	themes/Suite7/css/colourSelector.php
#	themes/Suite7/css/style.css
#	themes/SuiteP/css/listview.scss
#	themes/SuiteR/css/style.css
2018-02-14 17:43:21 +00:00
horus68
0f37758c30 Fixed - Updating language copyright date on language files
Fixed  - Updating language copyright date on language files to 2018
2018-02-07 17:00:44 +00: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
bc336f0fd9 Update JS + Style.css 2017-12-13 12:04:16 +00:00
Dillon Brown
4cae21c4f2 Update JS + Style.css 2017-12-13 12:00:31 +00:00
Dillon-Brown
eba5ce7913 Removed PHP closing tag 2017-10-07 00:06:08 +00:00
Dillon Brown
af3f8a8b7e Fixed - Language files - PR for code re-format only 2017-08-28 13:18:10 +01:00
Dillon-Brown
338fb35999 Fixed - Unused language strings - Part 2 (EAPM) 2017-07-23 21:07:32 +00:00
Dillon Brown
2c0c899e0a Merge remote-tracking branch 'upstream/hotfix' into combined_language_file_update_2
# Conflicts:
#	modules/Administration/language/en_us.lang.php
#	modules/Calendar/language/en_us.lang.php
#	modules/Configurator/language/en_us.lang.php
#	modules/Studio/language/en_us.Portal.html
2017-07-14 10:38:05 +01:00
Dillon Brown
4f2d180837 Fixed - Unused language strings (EAPM) 2017-05-12 12:51:54 +01:00