Commit Graph
71 Commits
Author SHA1 Message Date
LI JIAHAO 1b5fdcea7e Test Email 2017-06-24 11:22:34 +08:00
LI JIAHAO b026f46b2c finalize reg complete 2017-06-20 12:09:13 +08:00
LI JIAHAO 714186dd32 email/wechat completion 2017-06-20 11:34:55 +08:00
LI JIAHAO a1273949d0 Merge branch 'master' into dev 2017-06-19 13:54:33 +08:00
catsworld 5abe5db4bd A general commit at 2017/06/18 00:30 2017-06-18 00:30:05 +08:00
LI JIAHAO 128c1c965c add wechat oauth 2017-06-17 21:21:57 +08:00
Harry Zhou 95c545816b Edit Message function.
1. Add close dialog
2. System message can be rendered in html format now
2017-06-14 13:33:10 +08:00
LI JIAHAO 727e72c932 Merge branch 'master' of https://github.com/yukiyukiyu/NEUP-FleaMarket 2017-06-13 20:39:57 +08:00
yuki d682a95c64 添加了对商品的封禁 2017-06-13 20:30:19 +08:00
LI JIAHAO 888c1435d4 change announcement route 2017-06-13 19:15:02 +08:00
yuki 21943d5d19 Merge branch 'master' of https://github.com/NEUP-Net-Depart/NEUP-FleaMarket 2017-06-13 18:06:35 +08:00
yuki 25a03d588c 添加了封禁功能 2017-06-13 17:57:04 +08:00
LI JIAHAO 3193ca1a17 fix #114 2017-06-13 15:20:12 +08:00
LI JIAHAO 483f8c99b5 Add SSO 2017-06-12 22:35:08 +08:00
LI JIAHAO 1c0ca4ca95 完成举报相关功能 2017-06-12 17:00:37 +08:00
yuki 24b72a027a rate and admin function 2017-06-12 14:55:46 +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
yuki 179f8f9105 完成了举报功能
添加了tickets, admin_events两张表
2017-06-10 17:40:58 +08:00
Harry Zhou e39dc79ea4 Imporve details and beautify message frontend. 2017-06-10 12:34:08 +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 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 63a249bd32 Add MessageContact
1.Add MessageContact Model
2.Edit MessageController
3.Elegentalize TransactionController
2017-06-10 00:43:18 +08:00
LI JIAHAO d3da0ae97e some transaction frontend 2017-06-07 12:23:58 +08:00
LI JIAHAO 5cc21cf472 fix routes bug 2017-06-02 12:25:17 +08:00
LI JIAHAO 805c37b53d user 2017-05-30 14:58:41 +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 86e7ce1cb1 Add editUserInfo 2017-05-28 23:39:55 +08:00
Haizs 029c79a0b4 Add editUserAccount 2017-05-27 13:38:11 +08:00
LI JIAHAO f1a77019c2 finish user transaction display front-end 2017-05-26 20:17:45 +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 ed6cb76687 finish basic message backend 2017-05-24 19:32:12 +08:00
LI JIAHAO 229959a398 test fav list 2017-05-14 21:22:11 +08:00
LI JIAHAO ca2da0d0eb fav_num and add, del fav test 2017-05-14 19:39:13 +08:00
whoisnian 6a325a8cf7 完善更改商品信息的测试,管理员权限分级 2017-05-14 17:08:17 +08:00
LI JIAHAO 8843a32c38 test avatar 2017-05-14 09:46:59 +08:00
LI JIAHAO 1073a6c69e update Good and Good Test 2017-05-14 09:31:00 +08:00
whoisnian e4bd32f901 更改了good_info表,good_tags表,以及相应controller 2017-05-13 16:56:16 +08:00
LI JIAHAO 37e9c73b22 bugfix
1. good id error due to wrong routes order
2. html error
2017-05-01 21:10:15 +08:00
LI JIAHAO 7ce00eac79 finish userinfo reg guide 2017-04-08 19:35:06 +08:00
LI JIAHAO 693a0cf423 improved view structure 2017-04-08 15:19:45 +08:00
LI JIAHAO d5622406ca add complete info page(register/2) 2017-04-07 11:11:13 +08:00
LI JIAHAO d58cd02acd Update auth backend:
1. separate auth from user
2. modified some name
3. update password and token generate method
2017-04-03 17:07:35 +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
Catsworld 72441822b0 Write a lot of frontend files and some backend files. 2017-02-01 21:02:21 +08:00
koooyf 4df1416d0c Add announcement function and fixs some bug 2017-01-25 09:34:33 +08:00
koooyf fe07f7ee13 Add system notification function 2016-12-15 11:09:56 +08:00
※黑猫<Kuro/Neko> 09f6ad9427 Make the header a better view. 2016-11-14 13:32:36 +08:00