master #127
Merged
master #127
Conversation
This file contains 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
… и поле автора. Теперь не обязательно.
…и локального хранилища
…re2 with conflicts.
# Conflicts: # conf.ini
� Conflicts: � mod/billing/v1.8.0 � mod/profile/v2.0.0
easterism
reviewed
Jun 18, 2020
| "belhard/xajax": "dev-master", | ||
| "belhard/floatthead": "dev-master", |
html/default/index2.tpl
Outdated
| <script type="text/javascript" language="javascript" src="core2/js/eTip.js"></script> | ||
| <script type="text/javascript" language="javascript" src="core2/js/js.js?_=6"></script> | ||
| <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> | ||
| <meta name="author" content="easter.by@gmail.com" /> | ||
| <!--[if IE]> | ||
| <link rel="shortcut icon" type="image/x-icon" href="favicon.ico"> | ||
| <link rel="shortcut icon" type="image/x-icon" href="[FAVICON_ICO]"/> |
html/default/index2.tpl
Outdated
| <![endif]--> | ||
| <link rel="icon" type="image/png" href="favicon.png"> | ||
| <link rel="icon" type="image/png" href="[FAVICON_PNG]"/> |
| <script type="text/javascript" language="javascript" src="core2/js/eTip.js"></script> | ||
| <script type="text/javascript" language="javascript" src="core2/js/js.js"></script> | ||
| <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> | ||
| <meta name="author" content="easter.by@gmail.com"/> | ||
| <link rel="icon" type="image/png" href="favicon.png" /> | ||
| <link rel="icon" type="image/png" href="[FAVICON_PNG]"/> |
| @@ -8,7 +8,7 @@ | |||
| <script type="text/javascript" src="core2/js/md5.js"></script> | |||
| <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> | |||
| <meta name="author" content="easter.by@gmail.com" /> | |||
| <link rel="icon" type="image/png" href="favicon.png"/> | |||
| <link rel="icon" type="image/png" href="[FAVICON_PNG]"/> | |||
html/light/login/index.html
Outdated
| <![endif]--> | ||
| <link rel="icon" type="image/png" href="favicon.png"/> | ||
| <link rel="icon" type="image/png" href="[FAVICON_PNG]"/> |
| @@ -15,9 +15,9 @@ | |||
| <title>{system_name}</title> | |||
|
|
|||
| <!--[if IE]> | |||
| <link rel="shortcut icon" href="favicon.ico"/> | |||
| <link rel="shortcut icon" href="[FAVICON_ICO]"/> | |||
| <![endif]--> | ||
| <link rel="icon" type="image/png" href="favicon.png"/> | ||
| <link rel="icon" type="image/png" href="[FAVICON_PNG]"/> |
| @@ -9,7 +9,7 @@ | |||
| </button> | |||
| <!-- END clear --> | |||
| <input type="button" class="modal-control-button btn btn-default last" value="Выбрать" | |||
| onclick="edit.modal2.load('[THEME_DIR]', '[KEY]', '[URL]')"> | |||
| onclick="edit.modal2.load('[THEME_DIR]', '[KEY]', [URL])"> | |||
| <![endif]--> | ||
| <link rel="icon" type="image/png" href="favicon.png"> | ||
| <script type="text/javascript" language="javascript" src="core2/html/material/js/main.js?_=7"></script> | ||
| <link rel="icon" type="image/png" href="[FAVICON_PNG]"/> |
easterism
reviewed
Jun 20, 2020
easterism
approved these changes
Jun 23, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.