Skip to content

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

[etersoft] Cherry-pick f5887e7c

parent f7391cb6
Expand all Show whitespace changes
Inline Side-by-side
Showing with 287 additions and 0 deletions
template/en/default/etersoft/timersplash.html.tmpl
View file @ 75503835
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,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>
...@@ -75,3 +76,6 @@ ...@@ -75,3 +76,6 @@
======= =======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?07_10_2020"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?07_10_2020"></script>
>>>>>>> 2e393ba09 (Fix on enter keyup event form submitting. Update BZ_ROOT_DIR) >>>>>>> 2e393ba09 (Fix on enter keyup event form submitting. Update BZ_ROOT_DIR)
=======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?11_09_2020__"></script>
>>>>>>> f5887e7c4 (Add rule checking productiveTime === workTime, if productiveTime is not seted)
template/ru/default/etersoft/timersplash.html.tmpl
View file @ 75503835
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,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>
...@@ -75,3 +76,6 @@ ...@@ -75,3 +76,6 @@
======= =======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?07_10_2020"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?07_10_2020"></script>
>>>>>>> 2e393ba09 (Fix on enter keyup event form submitting. Update BZ_ROOT_DIR) >>>>>>> 2e393ba09 (Fix on enter keyup event form submitting. Update BZ_ROOT_DIR)
=======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?11_09_2020__"></script>
>>>>>>> f5887e7c4 (Add rule checking productiveTime === workTime, if productiveTime is not seted)
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