merge with hamid

serverfireteam · Jan 19, 2015 · 61aa74d · 61aa74d
2 parents ff01344 + ebe7bed
commit 61aa74d
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 58 deletions.
diff --git a/README.md b/README.md
@@ -31,7 +31,8 @@ pass: 12345
 ##RoadMap
 We are going to develope this package every days and new idea are wellcome .
 We have a [Trello](https://trello.com/b/RDZ6HdK9/framework) board for project , you can check it and send your feedback . 
-Fllow us [@serverfireteam](http://twitter.com/serverfireteam) .
+Fllow us in twitter [@serverfireteam](http://twitter.com/serverfireteam) .
+
 
 ##Installtions
 Note: if you  face any problem in steps you please report it at [github](https://github.com/serverfireteam/panel/issues/new)

diff --git a/nbproject/project.properties b/nbproject/project.properties
diff --git a/nbproject/project.xml b/nbproject/project.xml
diff --git a/public/css/styles.css b/public/css/styles.css
diff --git a/public/css/styles.less b/public/css/styles.less
@@ -14,7 +14,9 @@ and open the template in the editor.
 @import "plugins/timeline.css";
 @import "plugins/morris.css";
 @import "animate.css"; 
+
 @import "login.less";  
+
 @import "rapyd-styles.css";
 @import "sb-admin-2.css";
 @import "font-icon/icomoon/style.css";

diff --git a/public/img/Thumbs.db b/public/img/Thumbs.db
diff --git a/src/Serverfireteam/Panel/PanelServiceProvider.php b/src/Serverfireteam/Panel/PanelServiceProvider.php
@@ -21,7 +21,7 @@ public function boot()
         $this->package('serverfireteam/panel');
 
         $base_path = base_path();
-        $base_path .= "\\vendor\\serverfireteam\\panel\\src\\views";
+        $base_path .= "/vendor/serverfireteam/panel/src/views";
 
         \View::addLocation($base_path);
         \View::addNamespace('panelViews', $base_path);  

diff --git a/src/database/migrations/2014_11_20_093003_create_tester_table.php b/src/database/migrations/2014_11_20_093003_create_tester_table.php
diff --git a/src/routes.php b/src/routes.php
@@ -110,6 +110,7 @@
     $message = (Session::has('message') ? Session::get('message') : 'Please Sign In');
     $mesType = (Session::has('mesType') ? Session::get('mesType') : 'message');
     return View::make('panelViews::login')->with('message', $message)->with('mesType', $mesType);
+
 });