Skip to content

4.1.3 #230

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

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

4.1.3 #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d917091
Changes to about page
Jul 8, 2019
47ca2ea
Small changes to custom message box, hides input fields when not needed
Jul 8, 2019
d36c31b
version changes
Jul 8, 2019
6fcf5f6
changed wording on dev box color settings
Jul 22, 2019
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
15 changes: 2 additions & 13 deletions about.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,23 +35,12 @@
<b>About</b>
</div>
<div class="devBoxContent">
gitStatus
<br><br>
<h3>gitStatus</h3>
A Simple Git Status Monitor
<br><br>
Version <?php echo $configStatic['version']; ?>
</div>
</div>
</div>
<div class="firstBoxDev">
<div class="innerFirstDevBox" >
<div class="devBoxTitle">
<b>Github:</b>
</div>
<div class="devBoxContent">
<a style="color: black;" href="https://github.com/mreishman/gitStatus">Github link</a>
<br><br>
<a style="color: black;" href="https://github.com/mreishman/gitStatus/issues">Issues</a>
<a style="color: black;" href="https://github.com/mreishman/gitStatus">View on Github</a>
</div>
</div>
</div>
Expand Down
21 changes: 21 additions & 0 deletions core/html/changelog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,25 @@
<ul>
<li>
Version 4.1.3
<ul>
<li>
Features
<ul>
<li>
...
</li>
</ul>
</li>
<li>
Bug Fixes
<ul>
<li>
Small changes to about / settings pages
</li>
</ul>
</li>
</ul>
</li>
<li>
Version 4.1.2
<ul>
Expand Down
2 changes: 1 addition & 1 deletion core/php/configStatic.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?php

$configStatic = array(
'version' => '4.1.2',
'version' => '4.1.3',
'lastCheck' => '12-14-2018',
'newestVersion' => '3.3.4',
'versionList' => array(
Expand Down
2 changes: 1 addition & 1 deletion core/php/templateFiles/colorBG.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<input id="newRowLocationForFilterBranchName<?php echo $counfOfFiltersForbranchName;?>" type="text" value="<?php echo $key?>" name="newRowLocationForFilterBranchName<?php echo $counfOfFiltersForbranchName;?>">
&nbsp;
<select name="newRowLocationForFilterBranchSelect<?php echo $counfOfFiltersForbranchName;?>" >
<option <?php if($value['type']=="default"){echo "selected";}?> value="default" >Default(=)</option>
<option <?php if($value['type']=="default"){echo "selected";}?> value="default" >Equals</option>
<option <?php if($value['type']=="includes"){echo "selected";}?> value="includes" >Includes</option>
</select>
<a class="mainLinkClass" onclick="deleteRowFunction(<?php echo $counfOfFiltersForbranchName;?>, true)">Remove Filter</a>
Expand Down
39 changes: 32 additions & 7 deletions core/php/templateFiles/customMessage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@
Set Message:
</td>
<td>
<select name="messageTextEnabled">
<select onchange="toggleMessageText();" name="messageTextEnabled" id="messageTextEnabled">
<option <?php if($messageTextEnabled == 'true'){echo "selected";} ?> value="true">True</option>
<option <?php if($messageTextEnabled == 'false'){echo "selected";} ?> value="false">False</option>
</select>
</td>
</tr>
<tr>
<tr class="messageTextTr" <?php if($messageTextEnabled != 'true'){echo "style='display: none'";} ?> >
<td colspan="2">
Message Text:
</td>
</tr>
<tr>
<tr class="messageTextTr" <?php if($messageTextEnabled != 'true'){echo "style='display: none'";} ?> >
<td colspan="2">
<input type="text" name="messageText" value='<?php echo $messageText;?>'>
</td>
Expand All @@ -32,7 +32,7 @@
Disable:
</td>
<td>
<select name="enableBlockUntilDate">
<select onchange="toggleDateBlockText();" name="enableBlockUntilDate" id="enableBlockUntilDate">
<option <?php if($enableBlockUntilDate == 'true'){echo "selected";} ?> value="true">True</option>
<option <?php if($enableBlockUntilDate == 'false'){echo "selected";} ?> value="false">False</option>
</select>
Expand All @@ -43,17 +43,42 @@
<p class="description" >Disable other git-status severs from getting info from this server untill specified date</p>
</td>
</tr>
<tr>
<tr class="blockDateTr" <?php if($enableBlockUntilDate != 'true'){echo "style='display: none'";} ?> >
<td colspan="2">
Specified Date:
</td>
</tr>
<tr>
<tr class="blockDateTr" <?php if($enableBlockUntilDate != 'true'){echo "style='display: none'";} ?> >
<td colspan="2">
<input type="text" id="datepicker" name='datePicker' value='<?php echo $datePicker;?>'>
</td>
</tr>
</table>
</div>
</div>
</form>
</form>
<script type="text/javascript">
function toggleMessageText()
{
if(document.getElementById("messageTextEnabled").value == "true")
{
$(".messageTextTr").show();
}
else
{
$(".messageTextTr").hide();
}
}

function toggleDateBlockText()
{
if(document.getElementById("enableBlockUntilDate").value == "true")
{
$(".blockDateTr").show();
}
else
{
$(".blockDateTr").hide();
}
}
</script>