Skip to content

bugzilla
bugzilla
Commit 6a1618da authored by System Administrator's avatar System Administrator
Browse files
Options

[etersoft] Cherry-pick 67fa8cb7

parent b73a04ca
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 0 deletions
template/en/default/bug/create/create.html.tmpl
View file @ 6a1618da
...@@ -374,6 +374,11 @@ TUI_hide_default('attachment_text_field'); ...@@ -374,6 +374,11 @@ TUI_hide_default('attachment_text_field');
%] %]
<td colspan="2"> <td colspan="2">
<input name="estimated_time" size="6" maxlength="6" value="[% estimated_time FILTER html %]"> <input name="estimated_time" size="6" maxlength="6" value="[% estimated_time FILTER html %]">
<<<<<<< HEAD
=======
<input name="work_time" id="work_time" value="0" hidden>
<input name="productive_time" id="productive_time" value="0" hidden>
>>>>>>> 67fa8cb7d (Update date and fix bug creation in English version)
</td> </td>
</tr> </tr>
<tr> <tr>
......
template/en/default/etersoft/timersplash.html.tmpl
View file @ 6a1618da
...@@ -57,6 +57,7 @@ ...@@ -57,6 +57,7 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?23_04_2021"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?23_04_2021"></script>
======= =======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?22_04_2021"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?22_04_2021"></script>
...@@ -91,3 +92,6 @@ ...@@ -91,3 +92,6 @@
======= =======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?10_09_2020"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?10_09_2020"></script>
>>>>>>> 222af2032 (Update timer.js: add listener for #commit_top button) >>>>>>> 222af2032 (Update timer.js: add listener for #commit_top button)
=======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?15_04_2020"></script>
>>>>>>> 67fa8cb7d (Update date and fix bug creation in English version)
template/ru/default/etersoft/timersplash.html.tmpl
View file @ 6a1618da
...@@ -57,6 +57,7 @@ ...@@ -57,6 +57,7 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?23_04_2021"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?23_04_2021"></script>
======= =======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?22_04_2021"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?22_04_2021"></script>
...@@ -91,3 +92,6 @@ ...@@ -91,3 +92,6 @@
======= =======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?10_09_2020"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?10_09_2020"></script>
>>>>>>> 222af2032 (Update timer.js: add listener for #commit_top button) >>>>>>> 222af2032 (Update timer.js: add listener for #commit_top button)
=======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?15_04_2020"></script>
>>>>>>> 67fa8cb7d (Update date and fix bug creation in English version)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment