Commit graph

17 commits

Author SHA1 Message Date
Jack Anderson
158dca7ede [Legacy] Add max listview configuration for record modal 2023-04-24 11:54:07 +01:00
Jack Anderson
1db9b18906 [Legacy] Listview pagination configuration 2023-04-24 11:54:07 +01:00
Jack Anderson
58e622d577 Add system configs for subpanel load more 2023-04-24 11:54:07 +01:00
Jack Anderson
caf6df3b43 Merge next into suite 8 2023-02-28 14:12:02 +00:00
Jack Anderson
10efe5a340 Merge next into suite 8 2023-01-24 10:56:09 +00:00
Clemente Raposo
123e5a9f26 Merge commit '9d484f189a' into release/8.2.2
# Conflicts:
#	public/legacy/files.md5
#	public/legacy/modules/InboundEmail/EditView.html
#	public/legacy/modules/Users/tpls/EditViewFooter.tpl
#	public/legacy/suitecrm_version.php
2022-12-21 11:49:42 +00:00
Jack Anderson
20d69ea188 [Legacy] Add system name to config 2022-10-04 13:13:19 +01:00
Jack Anderson
696388d662 Merge next into suite 8
Merge commit '3fb6e4bb8e' into release/8.1.3

# Conflicts:
#	public/legacy/files.md5
#	public/legacy/suitecrm_version.php
2022-08-11 14:03:24 +01:00
Clemente Raposo
b9e45ecc54 Merge next into suite 8 2022-05-17 19:03:14 +01:00
Clemente Raposo
5d69939637 Merge next into suite 8
Merge commit '588534d022' into release/8.0.2

# Conflicts:
#	public/legacy/include/Services/NormalizeRecords/NormalizeRecordsSchedulerJob.php
#	public/legacy/modules/Administration/templates/RepairUtfEncoding.tpl
#	public/legacy/modules/Administration/templates/RepairUtfEncodingStatus.tpl
#	public/legacy/modules/Administration/templates/RepairUtfEncodingSyncStatus.tpl
#	public/legacy/suitecrm_version.php
#	public/legacy/themes/suite8/css/Dawn/style.scss
#	public/legacy/themes/suite8/css/suitep-base/admin-backup.scss
#	public/legacy/themes/suite8/css/suitep-base/editview.scss
#	public/legacy/themes/suite8/css/suitep-base/meetings.scss
#	public/legacy/themes/suite8/css/suitep-base/scheduler.scss
2022-01-26 12:16:09 +00:00
Clemente Raposo
efb6114313 Merge next into suite 8 2021-11-22 10:25:29 +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
Clemente Raposo
150716799c [Legacy] Add utility method to retrieve install languages 2021-08-27 11:46:53 +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
561d2f71a6 Merge commit '2473298dc6' into beta2
# Conflicts:
#	public/legacy/composer.json
#	public/legacy/composer.lock
#	public/legacy/modules/AOD_Index/AOD_Index.php
#	public/legacy/modules/AOD_Index/AOD_Index_sugar.php
#	public/legacy/modules/AOD_Index/AOD_LogicHooks.php
#	public/legacy/modules/AOD_Index/LuceneUtils.php
#	public/legacy/modules/AOD_Index/PdfParser.php
#	public/legacy/modules/AOD_Index/controller.php
#	public/legacy/modules/AOD_Index/views/view.indexdata.php
#	public/legacy/modules/AOD_IndexEvent/AOD_IndexEvent_sugar.php
#	public/legacy/modules/SavedSearch/metadata/SearchFields.php
#	public/legacy/modules/Schedulers/_AddJobsHere.php
2021-05-20 11:55:03 +01:00
Dillon-Brown
11be803da2 Merge commit '8e4cc94994' as 'public/legacy' 2021-03-31 15:37:32 +01:00