Commit graph

6 commits

Author SHA1 Message Date
Clemente Raposo
b9e45ecc54 Merge next into suite 8 2022-05-17 19:03:14 +01:00
Clemente Raposo
5f36d50943 [Legacy] Remove deprecated spots module 2021-11-20 15:01:51 +00:00
Dillon-Brown
4fa237958d Merge commit '75ea167930' into suite7merge
Signed-off-by: Dillon-Brown <dillon.brown@salesagility.com>

# Conflicts:
#	public/legacy/suitecrm_version.php
2021-11-05 15:19:26 +00:00
Dillon-Brown
33fc2ee307 Merge commit '114b895b6d' into merge_develop
Signed-off-by: Dillon-Brown <dillon.brown@salesagility.com>

# Conflicts:
#	public/legacy/include/CleanCSV.php
#	public/legacy/suitecrm_version.php
#	public/legacy/tests/unit/phpunit/includes/CleanCSVTest.php
2021-08-30 10:18:23 +01:00
Dillon-Brown
35ada7898d Merge commit '9c71e8c884' into fix/legacy_update
Signed-off-by: Dillon-Brown <dillon.brown@salesagility.com>

# Conflicts:
#	public/legacy/.gitignore
#	public/legacy/composer.json
#	public/legacy/composer.lock
#	public/legacy/include/language/en_us.lang.php
#	public/legacy/modules/Administration/Search/View.php
#	public/legacy/modules/Administration/metadata/adminpaneldefs.php
#	public/legacy/modules/Home/UnifiedSearch.php
#	public/legacy/modules/Home/UnifiedSearchAdvanced.php
#	public/legacy/tests/unit/phpunit/include/utils/fileUtilsTest.php
#	public/legacy/tests/unit/phpunit/modules/AOD_Index/AOD_IndexTest.php
#	public/legacy/tests/unit/phpunit/modules/AOD_IndexEvent/AOD_IndexEventTest.php
2021-07-29 16:53:55 +01:00
Dillon-Brown
11be803da2 Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00