Conversation
…level checks for duplicate functions
conflicts resolved using master part, so not working code now # Conflicts: # js/lib.js # js/quickAction.js # lib/TemplateUtility.php
# Conflicts: # modules/candidates/CandidatesUI.php
"Fixed #451 there was an issue with the installer, this was an…
* Resolved issue #444 - rss is not valid - Further analyzing the project source code for the use of getRSSDate(), it is confirmed that the call should be made statically, as CATSUtility::getAbsoluteURI() is done. - To resolve the issue we needed to correct the function’s signature declaration in OpenCATS/lib/DateUtility.php, as such: - Added the “static” property at the beginning of the function signature line 350, as such: - static public function getRSSDate($unixTime = false) * Resolve issue with missing class reference to JobOrderStatuses which is used on line 1028 of Search.php as JobOrderStatuses::getOpenStatusSQL().
minor change updates activity list for candidates to show most recent activity first. Previous behaviour shows oldest activity first.
Submitted on behalf of @dveos from https://forums.opencats.org/viewtopic.php?f=4&t=1509
* added table to candidate show page to display lists where candidate belongs * sending lists to template * added lib function to get list names and ids for given candidate id
…#465) * adding php version currently under active support Adding missing closing tag * bumping docker compose to , fixing php 7.4 decprecation warnings
* Resolved issue #444 - rss is not valid - Further analyzing the project source code for the use of getRSSDate(), it is confirmed that the call should be made statically, as CATSUtility::getAbsoluteURI() is done. - To resolve the issue we needed to correct the function’s signature declaration in OpenCATS/lib/DateUtility.php, as such: - Added the “static” property at the beginning of the function signature line 350, as such: - static public function getRSSDate($unixTime = false) * Resolve issue with missing class reference to JobOrderStatuses which is used on line 1028 of Search.php as JobOrderStatuses::getOpenStatusSQL(). * Resolved an issue with MySQL fetch command failing due to empty record set. Safeguarding MySQL function call. * Resolved an issue with SQL logic failing to safe keyword 'system'. Safeguarded by wrapping the keyword 'system' with backtick marks. * Resolved issue with limited character space for site source URL that may contain long query strings. * Updated OpenCATS version * Resolved outdated artichow library related functional issues. * Changed the organization's UI visible copyright statement to show OpenCAT.
* update travis.yml after yml validation - corrected syntax error * Update Mailer.php - corrected syntax error
The LEGACY_ROOT constant is defined in config.php but this file is not included in the careers/index.php so, there's an error, resulting on a blank page showed to the user. The inclusion of config.php in this file solves this problem
amend capitalisation to allow travis to run
Fix #356 by including the field id when replacing the placeholder code
remove the deprecated check_magic_quotes function from the codebase
anonymoususer72041
changed the title
Contributor
|
I did a thorough analysis of the develop → master delta and would recommend against a full merge. Here's why: develop has 127 commits not in master, but master has diverged significantly with 164 commits of its own. The merge-base shows that most of develop's changes were already incorporated into master via earlier merges (#493, #527). I rebased the 127 develop commits onto upstream/master as a test. After resolving all conflicts, only 14 files remained with actual diffs — and most of them are harmful:
Out of 683 changed files, only 2 genuinely valuable fixes are missing from master:
Suggestion: Instead of merging develop, cherry-pick or manually apply just these two one-line fixes. Then consider retiring the develop branch by resetting it to master to avoid future confusion. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
12 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.