c-my/NEUP-FleaMarket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
403 Commits 1 Branch 0 Tags
master
Commit Graph
180 Commits
Author SHA1 Message Date
catsworld d2de4fad2d Merge branch 'master' of https://github.com/NEUP-Net-Depart/NEUP-FleaMarket 2017-07-22 11:11:25 +00:00
LI JIAHAO 33e8426759 add tos 2017-07-21 00:29:33 +08:00
catsworld 8514f266c0 修改header和admin 2017-07-18 14:33:29 +08:00
LI JIAHAO ef719e62aa use email-daemon as mail service 2017-06-24 12:19:36 +08:00
LI JIAHAO e8e23b1188 one more test 2017-06-24 11:44:08 +08:00
LI JIAHAO 1b5fdcea7e Test Email 2017-06-24 11:22:34 +08:00
Harry Zhou 80f922e635 Edit Message function. 
1. Fix balloon tip position
2. Enable html for all message and purify html tag in SendMessageHandler
3. Remove "没有更多了"
 2017-06-21 22:52:11 +08:00
LI JIAHAO 827c72908f ua new 2017-06-20 21:10:32 +08:00
LI JIAHAO 80142c2640 ua to wx 2017-06-20 20:48:54 +08:00
LI JIAHAO d103d97b55 bugfix 2017-06-20 19:43:51 +08:00
LI JIAHAO fab933a87b fix reg 2017-06-20 19:21:56 +08:00
LI JIAHAO 0bcbf536b7 improve wechat 2017-06-20 18:46:51 +08:00
LI JIAHAO 98fdb6e7b2 abstract 2017-06-20 18:03:10 +08:00
LI JIAHAO efdc7b744e reg complete fin 2017-06-20 13:58:17 +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
Harry Zhou 4dcbf55cf1 Remove old curl api for email-deamon. 2017-06-18 03:52:27 +08:00
catsworld 5abe5db4bd A general commit at 2017/06/18 00:30 2017-06-18 00:30:05 +08:00
Harry Zhou bed1cb3169 Merge branch 'master' of https://github.com/NEUP-Net-Depart/NEUP-FleaMarket 2017-06-17 23:56:27 +08:00
LI JIAHAO b3b0606d95 bugfix 2017-06-17 23:55:56 +08:00
LI JIAHAO af4dc71e83 text ammendment 2017-06-17 22:32:59 +08:00
LI JIAHAO c47d805a3f add welcome trans limit 2017-06-17 22:23:50 +08:00
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
catsworld dff0fcd2c6 去栅格化的开始 2017-06-15 20:33:27 +08:00
LI JIAHAO 6f74183efc Merge branch 'dev' of https://github.com/zhouziqunzzq/NEUP-FleaMarket into dev 2017-06-15 14:10:29 +08:00
LI JIAHAO a331f6f39b add purifier 
Signed-off-by: LI JIAHAO <lijiahao99131@gmail.com>
 2017-06-15 14:06:51 +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
LI JIAHAO ce50c661f4 goodinfo nickname bugfix 
Modify good list.

Now good list search params won't be cleared while going through
different pages.
 2017-06-15 12:49:19 +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 88503c4ffb transaction bugfix 
Signed-off-by: LI JIAHAO <lijiahao99131@gmail.com>
 2017-06-15 12:34:27 +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 03132b8307 Merge branch 'master' into dev 2017-06-14 20:33:31 +08:00
LI JIAHAO 9ebd92830e improve userinfo with adding good 2017-06-14 20:32:19 +08:00
LI JIAHAO 3fdd733110 Merge branch 'master' into dev 2017-06-14 19:41:55 +08:00
LI JIAHAO f44752d578 improve mainpage and mygood page 2017-06-14 19:33:41 +08:00
LI JIAHAO ec92361fbc Merge branch 'master' into bootstrap 2017-06-14 18:02:40 +08:00
LI JIAHAO 0a9d472ebf Merge branch 'master' into bootstrap 2017-06-14 17:51:21 +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