Merge pull request #227 from orvice/dev

orvice · orvice · commit eacee9f1f0d4 · 2015-08-16T01:58:51.000+08:00
Dev
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .idea
 lib/config.php
 vendor
+composer.lock
diff --git a/code.php b/code.php
@@ -8,16 +8,15 @@
     <div class="container">
         <br><br>
         <div class="row center">
-            <h5  > 邀请码实时刷新</h5>
+            <h5>邀请码实时刷新</h5>
             <h5>如遇到无邀请码请找已经注册的用户获取。</h5>
         </div>
     </div>
 </div>
 
 
 <div class="container">
-    <div class="section">
-
+    <div class="section"> 
         <!--   Icon Section   -->
         <div class="row">
             <div class="row marketing">
@@ -48,11 +47,7 @@
             </div>
         </div>
     </div>
-    <br><br>
-
-    <div class="section">
-
-    </div>
+    <br>  
 </div>
 <?php  include_once 'ana.php';
 include_once 'footer.php';?>
diff --git a/composer.lock b/composer.lock
diff --git a/header.php b/header.php
@@ -3,8 +3,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0"/>
-    <title><?php echo $site_name; ?></title>
-
+    <title><?php echo $site_name; ?></title> 
     <!-- CSS  -->
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <link href="asset/materialize/css/materialize.min.css" type="text/css" rel="stylesheet" media="screen,projection"/>
diff --git a/lib/do.php b/lib/do.php
@@ -8,7 +8,7 @@
 $db_table['user'] = "user";
 
 //Version
-$version   ="2.4.4";
+$version   ="2.4.5";
 
 //set timezone
 date_default_timezone_set('PRC');
diff --git a/nav.php b/nav.php
diff --git a/sql/invite_code.sql b/sql/invite_code.sql
@@ -1,27 +1,6 @@
--- phpMyAdmin SQL Dump
--- version 4.2.5
--- http://www.phpmyadmin.net
---
--- Host: localhost
--- Generation Time: Nov 15, 2014 at 03:33 PM
--- Server version: 5.5.38
--- PHP Version: 5.5.14
-
 SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
 SET time_zone = "+00:00";
-
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-
---
--- Database: `shadow`
---
-
--- --------------------------------------------------------
-
+ 
 --
 -- Table structure for table `invite_code`
 --
@@ -58,7 +37,4 @@ ALTER TABLE `invite_code`
 -- AUTO_INCREMENT for table `invite_code`
 --
 ALTER TABLE `invite_code`
-MODIFY `id` int(32) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=3644;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+MODIFY `id` int(32) NOT NULL AUTO_INCREMENT,AUTO_INCREMENT=3644; 
diff --git a/sql/ss_node.sql b/sql/ss_node.sql
@@ -1,5 +1,3 @@
--- Adminer 4.1.0 MySQL dump
-
 SET NAMES utf8;
 SET time_zone = '+00:00';
 SET foreign_key_checks = 0;
diff --git a/sql/ss_reset_pwd.sql b/sql/ss_reset_pwd.sql
@@ -1,5 +1,3 @@
--- Adminer 4.1.0 MySQL dump
-
 SET NAMES utf8;
 SET time_zone = '+08:00';
 SET foreign_key_checks = 0;
diff --git a/sql/ss_user_admin.sql b/sql/ss_user_admin.sql
@@ -1,5 +1,3 @@
--- Adminer 4.1.0 MySQL dump
-
 SET NAMES utf8;
 SET time_zone = '+00:00';
 SET foreign_key_checks = 0;
diff --git a/sql/user.sql b/sql/user.sql
@@ -1,5 +1,3 @@
--- Adminer 4.1.0 MySQL dump
-
 SET NAMES utf8;
 SET time_zone = '+00:00';
 SET foreign_key_checks = 0;

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 .idea
 lib/config.php
 vendor
 +composer.lock
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`--- Adminer 4.1.0 MySQL dump`
`2`		`-`
`3`	`1`	`SET NAMES utf8;`
`4`	`2`	`SET time_zone = '+00:00';`
`5`	`3`	`SET foreign_key_checks = 0;`