 LI JIAHAO
|
cce8b4bc68
|
Merge branch 'yukiyukiyu-master'
|
2017-06-17 21:47:01 +08:00 |
|
|
LI JIAHAO
|
128c1c965c
|
add wechat oauth
|
2017-06-17 21:21:57 +08:00 |
|
|
yuki
|
780eb1b828
|
修复了滚动栏的bug，消息未解决
|
2017-06-17 12:14:51 +08:00 |
|
|
yuki
|
20ebce97f4
|
完善了管理员界面的功能，添加了首页的滚动公示牌
|
2017-06-17 02:05:23 +08:00 |
|
|
LI JIAHAO
|
f05876d7e0
|
bugfix
|
2017-06-16 23:25:13 +08:00 |
|
|
LI JIAHAO
|
94929b2d5d
|
fix email unique problem
|
2017-06-16 19:06:06 +08:00 |
|
|
yuki
|
d75e6f3162
|
添加了邮件功能后端
|
2017-06-16 12:52:49 +08:00 |
|
|
LI JIAHAO
|
27b8f9f20f
|
Merge branch 'master' of https://github.com/zhouziqunzzq/NEUP-FleaMarket
|
2017-06-15 13:06:32 +08:00 |
|
|
LI JIAHAO
|
9b31e0e1b9
|
add purifier
|
2017-06-15 13:01:00 +08:00 |
|
|
Harry Zhou
|
5e3f9a7558
|
Merge branch 'master' of https://github.com/NEUP-Net-Depart/NEUP-FleaMarket
|
2017-06-15 12:36:57 +08:00 |
|
|
LI JIAHAO
|
c86b7394ef
|
transaction bugfix
|
2017-06-15 12:27:45 +08:00 |
|
|
Harry Zhou
|
0f9213d0cd
|
Modify good list.
Now good list search params won't be cleared while going through
different pages.
|
2017-06-15 00:08:56 +08:00 |
|
|
LI JIAHAO
|
9ebd92830e
|
improve userinfo with adding good
|
2017-06-14 20:32:19 +08:00 |
|
|
LI JIAHAO
|
f44752d578
|
improve mainpage and mygood page
|
2017-06-14 19:33:41 +08:00 |
|
|
LI JIAHAO
|
ec7c7d276d
|
add message admin sign
|
2017-06-14 17:11:40 +08:00 |
|
|
LI JIAHAO
|
d766cff45c
|
system message link
|
2017-06-14 16:59:15 +08:00 |
|
|
LI JIAHAO
|
06cd9fc37d
|
Merge branch 'foundation' of https://github.com/zhouziqunzzq/NEUP-FleaMarket into zhouziqunzzq-foundation
|
2017-06-14 16:24:57 +08:00 |
|
|
LI JIAHAO
|
42656b63f4
|
Merge branch 'master' into foundation
|
2017-06-14 16:13:33 +08:00 |
|
|
LI JIAHAO
|
0255e79ae7
|
add default titlepic
|
2017-06-14 16:13:00 +08:00 |
|
|
LI JIAHAO
|
931dc35d92
|
Merge branch 'master' into foundation
|
2017-06-14 15:01:46 +08:00 |
|
|
LI JIAHAO
|
59e27611d5
|
fix stock minus
|
2017-06-14 14:59:53 +08:00 |
|
|
LI JIAHAO
|
a7072e62b3
|
Merge branch 'master' into foundation
|
2017-06-14 14:37:38 +08:00 |
|
|
LI JIAHAO
|
eb3451a26a
|
fix user trans fatal bug
|
2017-06-14 14:33:56 +08:00 |
|
|
Harry Zhou
|
7ffca8b222
|
Merge branch 'master' into foundation
|
2017-06-14 13:34:54 +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
|
1614b68434
|
Merge SSO realname from branch 'master'
|
2017-06-14 01:33:38 +08:00 |
|
|
LI JIAHAO
|
722cba14c0
|
sso realname
|
2017-06-14 01:30:58 +08:00 |
|
|
LI JIAHAO
|
bcedf2967b
|
frontend amendment
|
2017-06-13 21:31:33 +08:00 |
|
|
LI JIAHAO
|
bd5ac5c236
|
bugfix
|
2017-06-13 21:31:33 +08:00 |
|
|
LI JIAHAO
|
fe5bba7f37
|
fix homepage
|
2017-06-13 21:31:04 +08:00 |
|
|
LI JIAHAO
|
828f222aac
|
Merge branch 'master' of https://github.com/zhouziqunzzq/NEUP-FleaMarket
|
2017-06-13 21:02:55 +08:00 |
|
|
LI JIAHAO
|
dae95e84de
|
bugfix
|
2017-06-13 20:58:19 +08:00 |
|
|
Harry Zhou
|
7c6fe183d4
|
Modify Message function.
1. Add historical message tag.
2. Add baned info after user's nickname
3. Add time info for every message.
4. Stop the loop when error occurs.
|
2017-06-13 20:53:09 +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
|
75a96f91ca
|
userinfo requirements
|
2017-06-13 16:12:10 +08:00 |
|
|
LI JIAHAO
|
3193ca1a17
|
fix #114
|
2017-06-13 15:20:12 +08:00 |
|
|
LI JIAHAO
|
c293d5c8b8
|
fix sso login
|
2017-06-13 12:42:57 +08:00 |
|
|
LI JIAHAO
|
483f8c99b5
|
Add SSO
|
2017-06-12 22:35:08 +08:00 |
|
|
LI JIAHAO
|
62e5774c78
|
bugfix
|
2017-06-12 17:50:11 +08:00 |
|
|
LI JIAHAO
|
208fb3abac
|
举报和评价的显示
|
2017-06-12 17:14:39 +08:00 |
|
|
LI JIAHAO
|
1c0ca4ca95
|
完成举报相关功能
|
2017-06-12 17:00:37 +08:00 |
|
|
LI JIAHAO
|
64e87fafe0
|
Merge branch 'catsworld-master'
|
2017-06-12 15:31:49 +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 |
|
|
Harry Zhou
|
bef182b3b0
|
Add System Message whose contact_id is 0.
|
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 |
|