Commit Graph
212 Commits
Author SHA1 Message Date
LI JIAHAO 98331544d0 sso guide and fix header menu bug 2017-06-12 16:08:04 +08:00
LI JIAHAO 64e87fafe0 Merge branch 'catsworld-master' 2017-06-12 15:31:49 +08:00
LI JIAHAO f37eacc132 fix ci test 2017-06-12 15:23:56 +08:00
yuki 24b72a027a rate and admin function 2017-06-12 14:55:46 +08:00
catsworld b93e241931 修改了一些细节方面的前端问题
添加了SSO引导入口
2017-06-12 14:41:03 +08:00
LI JIAHAO 978d693f83 fix message page and add fav bug 2017-06-10 19:16:00 +08:00
Harry Zhou 845f8e9450 Fix little bug on contact_id === 0. 2017-06-10 18:23:50 +08:00
Harry Zhou bef182b3b0 Add System Message whose contact_id is 0. 2017-06-10 18:23:50 +08:00
Harry Zhou 2137dddd2c Add autoscroll and animate to Message frontend. 2017-06-10 18:23:50 +08:00
LI JIAHAO 893a4def49 Merge branch 'master' of https://github.com/yukiyukiyu/NEUP-FleaMarket into yukiyukiyu-master 2017-06-10 17:55:13 +08:00
LI JIAHAO a0d4d38b95 formatted code 2017-06-10 17:47:19 +08:00
yuki 179f8f9105 完成了举报功能
添加了tickets, admin_events两张表
2017-06-10 17:40:58 +08:00
LI JIAHAO bf81dd78c7 fix iborvs bug 2017-06-10 16:59:51 +08:00
LI JIAHAO 2e9e893671 Merge branch 'iborvs-master' 2017-06-10 16:43:11 +08:00
Harry Zhou e39dc79ea4 Imporve details and beautify message frontend. 2017-06-10 12:34:08 +08:00
Harry Zhou 57e908cd93 Edit message test. 2017-06-10 08:39:24 +08:00
Harry Zhou 2459642c46 Add clock to poll. 2017-06-10 08:29:06 +08:00
Harry Zhou 5361c151e5 Elegantilize contact list
1. Split getContact into getHistoryContact and getNewContact
2. Now contacts with new messages will go on top of the list
2017-06-10 07:59:46 +08:00
Harry Zhou 0ea4fffb46 Add send message frontend.
1. Add send message frontend
2. Split getMessage into getHistoryMessage and getNewMessage
2017-06-10 06:51:29 +08:00
Harry Zhou 61d8e4bba4 Add paginator to message frontend. 2017-06-10 04:22:21 +08:00
Harry Zhou 8bb7879a5a Add message-dialog vue component. 2017-06-10 03:05:29 +08:00
Harry Zhou 45faff6dc1 Add getMessage ajax api.
1. Rename old getMessage to showMessageView
2. Add getMessage ajax api
3. Fix CheckSu Middleware
2017-06-10 02:27:20 +08:00
Harry Zhou 58d9ebd1a1 Add contact-list vue component. 2017-06-10 02:05:52 +08:00
Harry Zhou 63a249bd32 Add MessageContact
1.Add MessageContact Model
2.Edit MessageController
3.Elegentalize TransactionController
2017-06-10 00:43:18 +08:00
iborvs 544229ef94 这把该不是叉了? 2017-06-09 21:36:30 +08:00
iborvs 19e71211e9 修复管理员下边栏显示不正常 2017-06-09 20:55:05 +08:00
LI JIAHAO 2ba45f3599 fix trans good count update bug 2017-06-09 18:57:50 +08:00
iborvs c329c0ac7d 解决底边栏溢出,解决登录界面排版不正常,还原白色 2017-06-09 17:50:33 +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