Commit Graph
54 Commits
Author SHA1 Message Date
Catsworld 94641db52a Add some plugins to add contents to the frontpage. 2017-01-24 10:45:03 +08:00
yukiyukiyu 97ed6d005e Merge pull request #41 from koooyf/master
Add system notification function
2016-12-29 12:44:36 +08:00
yukiyukiyu 8ddcccf5bd Merge pull request #40 from hudson6666/front-end-im
Responsive Layouts
2016-12-19 18:41:34 +08:00
koooyf fe07f7ee13 Add system notification function 2016-12-15 11:09:56 +08:00
LI JIAHAO 6e1a842c2d Responsive Layouts 2016-11-20 22:58:58 +08:00
LI JIAHAO b761b404e1 Responsive Layouts 2016-11-20 22:26:57 +08:00
yukiyukiyu b98cce8c9c Merge pull request #39 from koooyf/master
Add function about selecting number of goods for buyers
2016-11-20 11:44:09 +08:00
koooyf 375efc45f6 Fix some bug and add good sell number. 2016-11-17 20:16:22 +08:00
yukiyukiyu 2245ceebaf Merge pull request #37 from catsworld/master
Make header and goodlist look better and fix some bugs.
2016-11-14 22:20:37 +08:00
※黑猫<Kuro/Neko> 09f6ad9427 Make the header a better view. 2016-11-14 13:32:36 +08:00
yukiyukiyu 63847a0db1 Merge pull request #35 from yukiyukiyu/master
Complete the favlist function
2016-11-11 13:38:02 +08:00
Yuki 6bfd134af5 Complete the favlist function 2016-11-11 13:29:44 +08:00
yukiyukiyu f4c61da087 Merge pull request #34 from koooyf/master
Add information functions
2016-11-07 14:00:19 +08:00
koooyf a3676c18aa Add information functions 2016-11-07 10:53:23 +08:00
koooyf bb4e5f3ea9 Add information function. 2016-11-07 10:53:23 +08:00
yukiyukiyu 80a50ceb4d Merge pull request #29 from catsworld/master
Basicly make sure that the front would not have bugs.
2016-11-06 23:36:27 +08:00
※黑猫<Kuro/Neko> 5478c2129d Basicly make sure that the front would not have bugs. 2016-11-03 21:12:47 +08:00
root 35f0a47c1d Some changes of auth pges 2016-11-03 08:25:39 +00:00
yukiyukiyu 0eb97cab76 Merge pull request #28 from catsworld/master
Simply solved some conflicts.
2016-11-01 20:47:16 +08:00
※黑猫<Kuro/Neko> b33b88d341 Simply solved some conflicts. 2016-11-01 20:17:23 +08:00
D M K 9a97558a12 Update show.blade.php 2016-09-05 19:44:48 +08:00
D M K 693f7e4359 Update app.css 2016-09-05 19:44:46 +08:00
catsworld e9e090a50b Complete validations of register, change some names of routes. 2016-09-05 19:44:45 +08:00
Leo Liu 67fcb7003e add good page and good list page and my good page 2016-09-05 19:44:43 +08:00
catsworld 291c46570e Merge commit 'bda62ae'
Conflicts:
	app/Http/routes.php
	resources/views/good/goodInfo.blade.php
	resources/views/good/goodList.blade.php
2016-08-15 17:08:30 +08:00
catsworld bda62ae82b Solve conflicts. 2016-08-15 17:05:29 +08:00
catsworld d1c6d2b379 Fix some bugs, add a simple UI, complete email functions. 2016-08-15 16:57:10 +08:00
koooyf cfe6bd52a7 Add transaction function 2016-08-14 20:39:36 +08:00
catsworld 696b26c425 Complete the checkEmail function, fix some bugs, add files of Foundation to /public. 2016-08-14 20:39:36 +08:00
root 90a4150b33 Add Favorite list function 2016-08-14 12:53:20 +08:00
catsworld 4a700e8ac7 Complete the checkEmail function, fix some bugs, add files of Foundation to /public. 2016-08-10 17:16:49 +08:00
koooyf 7479de001a Add admin Middleware 2016-08-05 18:34:55 +08:00
koooyf 19a157b8d0 Add userinfomation page
Add userinformation editpage
Let password encrypted
Add Middleware
2016-08-05 07:12:38 +08:00
koooyf 04aac3d215 Add userinformation page
Add edit userinformation page
Add Middleware
Let password encrypted
2016-08-05 01:13:42 +08:00
※黑猫<Kuro/Neko> 739aefee48 Fixed some bug of quick access, add some functions of admin and add some
seeds.
2016-08-04 09:30:48 +08:00
root dbc4587fb8 Add quick access function 2016-07-03 23:13:27 +08:00
root 12b0c8fa0d Bug patch(correct some problems such as userid=_=) 2016-06-16 21:02:09 +08:00
root a945f2080b Two delete 2016-06-15 21:45:35 +08:00
root 1c651b4e17 Admin privilege add 2016-06-15 21:44:27 +08:00
root ac13ec9aaa add logs 2016-06-15 21:43:24 +08:00
onionwyl 6e3842cc67 Fix a Capital letter error 2016-06-15 18:32:46 +08:00
catsworld 5570adcd03 Edit to obey then comment. 2016-06-13 17:04:35 +08:00
catsworld 0829cd9198 Finish the good function of our first step.
Controllers/GoodController: Finish the good function of our first step.
Controllers/UserController: Make session to be run rightly.
app/Http/routes.php: Add middleware web to every route.
database/migrations: Change column names such as 'good_id' to 'id'.
views/User.register: Add csrf_field to the form.
views/User.show: Add csrf_field to the form.
views/good: Finish the good function of our first step.
2016-06-13 00:17:41 +08:00
koooyf 8748742324 Add User function.
Controllers/UserController: Add User function.
app/Http/routes.php: Add user routes.
app/User: Edit User Model.
views/User.register: Add register page.
views/User.show: Add login page.
2016-06-13 06:04:21 +08:00
catsworld 2a990cf256 Fix a wrong column name in create_good_info_table 2016-06-07 19:36:24 +08:00
catsworld b252545ebd Temporarily finish the migrations and models. 2016-06-07 18:07:50 +08:00
catsworld 25a87fe4e8 Temporarily finish the migrations and models so that our works on
controllers can be going on.
2016-06-07 00:27:10 +08:00
koooyf 225f92e1dc Add GoodCat and GoodInfo models 2016-04-16 10:53:32 +08:00
koooyf 6b31cd5345 Add good_cat and good_info tables 2016-04-16 10:53:31 +08:00
toy dd53f5cc82 Create 2016_03_28_222053_create_userinfo_table.php
the table of the userinfo
2016-04-16 10:53:29 +08:00