c-my/NEUP-FleaMarket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
73 Commits 1 Branch 0 Tags
d35e1eebb6a4d2ba598917e1d02286b0854e02de
Commit Graph
73 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LI JIAHAO d35e1eebb6 Add ci and coverage test 2017-03-20 14:10:37 +08:00
LI JIAHAO ab3f6f20bc Merge branch 'catsworld-master' 2017-03-10 12:28:27 +08:00
catsworld fb2cd0eee7 A huge develop update to commit. 
Upgrade the Laravel to version 5.4.
Optimize the directory structure.
Add a avatar function.
Add the validate for addGood form.
Adjust the frontend pages.
Other changes.
 2017-03-10 10:49:08 +08:00
LI JIAHAO ee592d9dfa bugfix #51 2017-02-02 16:55:23 +08:00
LI JIAHAO 114ee1bb0c Merge pull request #3 from NEUP-Net-Depart/master 
Merge from origin master
 2017-02-01 21:14:48 +08:00
LI JIAHAO 5c8779f267 Merge pull request #50 from catsworld/master 
Write a lot of frontend files and some backend files.
 2017-02-01 21:12:42 +08:00
Catsworld 72441822b0 Write a lot of frontend files and some backend files. 2017-02-01 21:02:21 +08:00
LI JIAHAO 61f1fbb6c0 Merge pull request #49 from hudson6666/master 
frontend crop interface with backend
 2017-02-01 20:38:51 +08:00
LI JIAHAO 44a916d9ff frontend crop interface with backend 2017-02-01 20:37:18 +08:00
LI JIAHAO 56fe7e3a55 Merge pull request #48 from hudson6666/master 
Update Readme
 2017-02-01 00:34:31 +08:00
LI JIAHAO cb3cc918df Update Readme 2017-02-01 00:33:04 +08:00
LI JIAHAO 27a7e28293 Merge pull request #47 from hudson6666/master 
Add Cropper for Image Upload
 2017-02-01 00:28:19 +08:00
LI JIAHAO b96744d2b8 frontend check file type 2017-01-31 23:53:01 +08:00
LI JIAHAO 8c61777680 cropper 2017-01-31 23:05:37 +08:00
LI JIAHAO 76501899ea Merge pull request #2 from NEUP-Net-Depart/master 
Merge from master
 2017-01-26 13:46:51 +08:00
yukiyukiyu 78049dd359 Merge pull request #44 from koooyf/master 
Add announcement function and fix some bugs
 2017-01-25 10:56:39 +08:00
koooyf 4df1416d0c Add announcement function and fixs some bug 2017-01-25 09:34:33 +08:00
LI JIAHAO 5758a9ca02 Merge pull request #43 from catsworld/master 
Add some plugins to add contents to the frontpage.
 2017-01-24 20:25:00 +08:00
Catsworld 94641db52a Add some plugins to add contents to the frontpage. 2017-01-24 10:45:03 +08:00
LI JIAHAO 3e824d80aa Merge pull request #1 from NEUP-Net-Depart/master 
Merge from Master
 2017-01-18 18:57:51 +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