c-my/NEUP-FleaMarket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
185 Commits 1 Branch 0 Tags
179f8f91056b963d874c6d2ac71424f2e6f70cd9
Commit Graph
185 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
yuki 179f8f9105 完成了举报功能 
添加了tickets, admin_events两张表
 2017-06-10 17:40:58 +08:00
LI JIAHAO 7a9d5674e2 add nav bar menu link 2017-06-09 17:33:45 +08:00
LI JIAHAO 11f24e663e Merge branch 'iborvs-master' 2017-06-09 16:41:56 +08:00
catsworld d0de18d163 完善了header与footer的内容 
修改了搜索框的宽度
添加了composer.lock
 2017-06-09 16:31:35 +08:00
iborvs de79cdce98 底边栏修改 2017-06-08 23:00:33 +08:00
iborvs d5449cb7b6 change 2017-06-08 22:18:40 +08:00
iborvs d7841bf1ae change 2017-06-08 22:16:55 +08:00
601ce520ac 更新Foundation版本至6.3.1 
非常完美地解决了header的各种问题，现在它正以非常良好的方式工作中。
简单地添加了手机header的侧边栏显示。
简单地添加了footer。
 2017-06-08 21:11:51 +08:00
iborvs a518345756 手机版界面小修改，详情动画改为淡入淡出 2017-06-08 12:38:10 +08:00
LI JIAHAO d3da0ae97e some transaction frontend 2017-06-07 12:23:58 +08:00
LI JIAHAO 75eb0a8602 Merge branch 'master' of https://github.com/RoyWinchester/NEUP-FleaMarket into master 2017-06-04 00:05:22 +08:00
LI JIAHAO d683f872ad Merge branch 'iborvs-master' 2017-06-04 00:01:21 +08:00
roywinchester df7b2b8f86 resources/views/admin/index.blade.php 2017-06-03 19:40:24 +08:00
iborvs ceaee7fa41 修改收藏夹详情响应式 2017-06-03 16:26:50 +08:00
iborvs 2efaf82383 修改市场页，收藏夹页响应式 2017-06-03 16:11:12 +08:00
roywinchester 6fbc16ab9a app/Http/Controllers/AdminController.php 2017-06-03 14:50:44 +08:00
roywinchester b95ce20749 resources/views/admin/index.blade.php 2017-06-03 14:43:28 +08:00
iborvs b8e2523a1b 调整市场界面 2017-06-02 21:54:10 +08:00
iborvs 632f32b855 一定是这两天忘性太大了，修复其他排序不显示的问题 2017-06-02 18:09:04 +08:00
iborvs 6ea2d4b86d 兼容搜索，显示排序方式 2017-06-02 15:13:01 +08:00
LI JIAHAO 5cc21cf472 fix routes bug 2017-06-02 12:25:17 +08:00
iborvs 9476eefdc3 筛序部分响应式 2017-05-30 20:24:00 +08:00
iborvs 2a90938af2 让筛选变得可保留 2017-05-30 19:01:04 +08:00
iborvs 58196c69d0 Merge branch 'master' of https://github.com/NEUP-Net-Depart/NEUP-FleaMarket 2017-05-30 18:24:59 +08:00
LI JIAHAO b14ec8cf61 forget password and add some test 2017-05-30 15:37:49 +08:00
LI JIAHAO 805c37b53d user 2017-05-30 14:58:41 +08:00
Haizs 7eb52ec32e Set stuid in editUserAccount 2017-05-30 02:36:50 +08:00
Haizs 0f04b6ecf1 Check user_id with session 2017-05-30 01:03:26 +08:00
vagrant 41056190b0 Merge remote-tracking branch 'upstream/master' 2017-05-29 16:02:43 +00:00
Haizs bd8a4ab610 Add test about editUser 2017-05-29 03:26:01 +08:00
Haizs 3f4c381be8 No change password when empty 2017-05-28 23:47:03 +08:00
Haizs 86e7ce1cb1 Add editUserInfo 2017-05-28 23:39:55 +08:00
Haizs 029c79a0b4 Add editUserAccount 2017-05-27 13:38:11 +08:00
iborvs 4093a9cd99 手机版收藏夹变松以及排序筛选变得能看一点 2017-05-26 23:31:18 +08:00
LI JIAHAO c53539afb2 bugfix 2017-05-26 21:18:37 +08:00
LI JIAHAO 2e7eae57b8 fix some validate problem 2017-05-26 21:02:53 +08:00
LI JIAHAO f1a77019c2 finish user transaction display front-end 2017-05-26 20:17:45 +08:00
LI JIAHAO 6a729f97f9 Merge branch 'net-dep' 2017-05-26 19:36:47 +08:00
iborvs 5f3527ee14 增加简易筛选排序前端，调整手机尺寸收藏夹 2017-05-26 16:03:23 +08:00
LI JIAHAO 0cf0f90fdf transactions display paginate 2017-05-25 21:24:10 +08:00
LI JIAHAO f895feac4d display transactions simply 2017-05-25 20:51:11 +08:00
LI JIAHAO c9f5db2d77 transaction backend 2017-05-25 20:26:29 +08:00
LI JIAHAO 87edb598b7 Merge branch 'iborvs-master' 2017-05-24 23:10:27 +08:00
LI JIAHAO bb950a815b try to remove the 市场 link 2017-05-24 23:10:20 +08:00
iborvs 22fa32ca62 修复元素把页面撑爆的问题，外加市场界面奇妙灰色 2017-05-24 21:47:39 +08:00
iborvs 76024c66c3 人老就是多忘事 2017-05-24 20:10:47 +08:00
iborvs 6dde93cd7f 小修改 2017-05-24 20:08:09 +08:00
iborvs 716c0e264d Merge branch 'master' of https://github.com/NEUP-Net-Depart/NEUP-FleaMarket 
lease enter a commit message to explain why this merge is necessary,
 Lines starting with '#' will be ignored, and an empty message aborts
i# the commit.
 2017-05-24 19:54:25 +08:00
iborvs 0fc878493f 修改收藏夹bug 2017-05-24 19:52:51 +08:00
LI JIAHAO ed6cb76687 finish basic message backend 2017-05-24 19:32:12 +08:00