Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull master into KDP_dev #40

Merged
merged 17 commits into from
Jul 23, 2021
Merged

Pull master into KDP_dev #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
38dac66
Merge pull request #771 from BioKIC/master
egbot Jul 14, 2021
54c0bd5
Merge pull request #772 from BioKIC/master
egbot Jul 15, 2021
4ce6276
Merge pull request #773 from BioKIC/master
egbot Jul 15, 2021
8366e70
Merge pull request #774 from BioKIC/master
egbot Jul 15, 2021
bc2e9c3
Merge pull request #775 from BioKIC/master
egbot Jul 18, 2021
8485d99
Merge pull request #776 from BioKIC/master
egbot Jul 18, 2021
12ccd02
Merge pull request #777 from BioKIC/master
egbot Jul 19, 2021
fb65507
Merge pull request #778 from BioKIC/master
egbot Jul 20, 2021
3f5f80a
Merge pull request #779 from BioKIC/master
egbot Jul 21, 2021
6f6683f
Merge pull request #780 from BioKIC/master
egbot Jul 22, 2021
5cb5e4b
Merge pull request #781 from BioKIC/master
egbot Jul 22, 2021
56914d3
Merge pull request #782 from BioKIC/master
egbot Jul 23, 2021
0dc1136
Merge pull request #783 from BioKIC/master
egbot Jul 23, 2021
7219cdf
Merge pull request #784 from BioKIC/master
egbot Jul 23, 2021
c064e4f
Merge pull request #39 from BioKIC/KDP_dev
egbot Jul 23, 2021
b4704f2
Merge branch 'master' into master
egbot Jul 23, 2021
eca7be1
Various minor bugs
egbot Jul 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion classes/ChecklistManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ public function getTaxaList($pageNumber = 1,$retLimit = 500){
$taxonTokens = $newArr;
}
if(!$retLimit || ($this->taxaCount >= (($pageNumber-1)*$retLimit) && $this->taxaCount <= ($pageNumber)*$retLimit)){
if($row->morphospecies) $sciName .= ' '.$row->morphospecies;
if(isset($row->morphospecies) && $row->morphospecies) $sciName .= ' '.$row->morphospecies;
elseif($row->rankid == 180) $sciName .= " sp.";
if($row->rankid > 220 && $this->clMetadata['type'] != 'rarespp' && !array_key_exists($row->parenttid, $this->taxaList)){
$this->taxaList[$row->parenttid]['taxongroup'] = '<i>'.$taxonGroup.'</i>';
Expand Down
2 changes: 1 addition & 1 deletion collections/harvestparams.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
</div>
</div>
<div style='float:right;margin:0px 10px;'>
<div><button type="submit" style="width:100%"><?php echo isset($LANG['BUTTON_NEXT_LIST']?$LANG['BUTTON_NEXT_LIST']:'List Display'); ?></button></div>
<div><button type="submit" style="width:100%"><?php echo isset($LANG['BUTTON_NEXT_LIST'])?$LANG['BUTTON_NEXT_LIST']:'List Display'; ?></button></div>
<div><button type="button" style="width:100%" onclick="displayTableView(this.form)"><?php echo isset($LANG['BUTTON_NEXT_TABLE'])?$LANG['BUTTON_NEXT_TABLE']:'Table Display'; ?></button></div>
<div><button type="reset" style="width:100%" onclick="resetHarvestParamsForm()"><?php echo isset($LANG['BUTTON_RESET'])?$LANG['BUTTON_RESET']:'Reset Form'; ?></button></div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion games/flashcards.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ function tellMe(){
echo $checklists_flashcardsCrumbs;
}
else{
echo '<a href="../checklists/checklist.php?clid='.$clid.'">';
echo '<a href="../checklists/checklist.php?clid='.$clid.'&dynclid='.$dynClid.'">';
echo $fcManager->getClName();
echo '</a> &gt;&gt; ';
}
Expand Down
2 changes: 1 addition & 1 deletion games/namegame.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ function wildCard(){
echo $games_namegameCrumbs;
}
else{
echo '<a href="../checklists/checklist.php?clid='.$clid.'">';
echo '<a href="../checklists/checklist.php?clid='.$clid.'&dynclid='.$dynClid.'">';
echo $clName;
echo '</a> &gt;&gt; ';
}
Expand Down