Merge branch 'develop'

nomadicjosh · Jun 29, 2016 · c63cedb · c63cedb
2 parents e5f9638 + e22df88
commit c63cedb
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 8 deletions.
diff --git a/app/functions/core-function.php b/app/functions/core-function.php
@@ -11,7 +11,7 @@
  * @author Joshua Parker <[email protected]>
  */
 define('CURRENT_RELEASE', '6.2.0');
-define('RELEASE_TAG', '6.2.8');
+define('RELEASE_TAG', '6.2.9');
 
 $app = \Liten\Liten::getInstance();
 use \League\Event\Event;

diff --git a/app/functions/hook-function.php b/app/functions/hook-function.php
@@ -1426,7 +1426,7 @@ function myet_wysiwyg_editor()
 {
     $app = \Liten\Liten::getInstance();
 
-    $editor = '<script src="//tinymce.cachefly.net/4.2/tinymce.min.js"></script>' . "\n";
+    $editor = '<script src="//cdn.tinymce.com/4/tinymce.min.js"></script>' . "\n";
     $editor .= '<script type="text/javascript">
     tinymce.init({
         selector: "textarea",

diff --git a/app/views/course/add.php b/app/views/course/add.php
@@ -18,7 +18,7 @@
 $screen = 'acrse';
 ?>
 
-<script src="//tinymce.cachefly.net/4.2/tinymce.min.js"></script>
+<script src="//cdn.tinymce.com/4/tinymce.min.js"></script>
 <script src="<?=get_base_url();?>static/assets/plugins/tinymce/plugin.js"></script>
 <script type="text/javascript">
 	tinymce.init({selector: "textarea",plugins: [ "placeholder" ]});

diff --git a/app/views/course/view.php b/app/views/course/view.php
@@ -16,7 +16,7 @@
 $screen = 'vcrse';
 ?>
 
-<script src="//tinymce.cachefly.net/4.2/tinymce.min.js"></script>
+<script src="//cdn.tinymce.com/4/tinymce.min.js"></script>
 <script src="<?=get_base_url();?>static/assets/plugins/tinymce/plugin.js"></script>
 <script type="text/javascript">
 	tinymce.init({selector: "textarea",plugins: [ "placeholder" ]});

diff --git a/app/views/dashboard/core-admin-bar.php b/app/views/dashboard/core-admin-bar.php
@@ -145,6 +145,7 @@
                                             <ul class="dropdown-menu submenu-show submenu-hide pull-right">
                                                 <li class=""><a href="<?= get_base_url(); ?>program/<?= bm(); ?>"><?= _t('(PROG) - Program'); ?></a></li>
                                                 <li<?= ae('add_acad_prog'); ?> class=""><a href="<?= get_base_url(); ?>program/add/<?= bm(); ?>"><?= _t('(APRG) - New Program'); ?></a></li>
+                                                <?= $app->hook->do_action('acad_prog_nav'); ?>
                                             </ul>
                                         </li>
 

diff --git a/app/views/index/index.php b/app/views/index/index.php
@@ -14,7 +14,7 @@
 $app->view->block('myet');
 ?>
 
-<script src="//tinymce.cachefly.net/4.1/tinymce.min.js"></script>
+<script src="//cdn.tinymce.com/4/tinymce.min.js"></script>
 <script type="text/javascript">
 tinymce.init({
 	selector: "textarea",

diff --git a/app/views/setting/templates.php b/app/views/setting/templates.php
@@ -16,7 +16,7 @@
 $screen = 'setting';
 ?>
 
-<script src="//tinymce.cachefly.net/4.2/tinymce.min.js"></script>
+<script src="//cdn.tinymce.com/4/tinymce.min.js"></script>
 <script type="text/javascript">
 tinymce.init({
 	selector: "textarea",

diff --git a/etsis.ini b/etsis.ini
@@ -3,7 +3,7 @@
 ;/
 
 [current_release]
-current_release_value = 6.2.8
+current_release_value = 6.2.9
 
 [6.2.5]
 date = "2016.03.15"

diff --git a/install.sh b/install.sh
@@ -75,7 +75,7 @@ sed -i "s|{product}|eduTrac SIS|g" config.php
 
 sed -i "s|{company}|7 Media Web Solutions, LLC|g" config.php
 
-sed -i "s|{version}|6.2.8|g" config.php
+sed -i "s|{version}|6.2.9|g" config.php
 
 sed -i "s|{datenow}|$TODAY $HOUR|g" config.php