Commit Graph
316 Commits
Author SHA1 Message Date
catsworld 78a23be593 解决了罗列的所有三个大问题 2017-06-18 01:54:40 +08:00
catsworld 5abe5db4bd A general commit at 2017/06/18 00:30 2017-06-18 00:30:05 +08:00
LI JIAHAO 115dc25f3a Merge branch 'master' of https://github.com/catsworld/NEUP-FleaMarket into dev 2017-06-15 21:06:40 +08:00
catsworld dff0fcd2c6 去栅格化的开始 2017-06-15 20:33:27 +08:00
iborvs 72c0562910 小修改 2017-06-15 19:02:03 +08:00
iborvs a68427e67f 修复goodinfo被撑爆,美化userprofile 2017-06-15 17:44:37 +08:00
catsworld 8a875f75c0 Commit at 2017/06/15 17:14 2017-06-15 17:14:57 +08:00
iborvs e7b8f15019 changes 2017-06-15 16:40:17 +08:00
iborvs d0befe29c6 changes 2017-06-15 16:38:50 +08:00
iborvs 1af7000f0e Merge branch 'dev' of https://github.com/NEUP-Net-Depart/NEUP-FleaMarket into dev 2017-06-15 15:01:55 +08:00
iborvs ae82994c45 撤销错误pull 2017-06-15 14:47:11 +08:00
catsworld e39730e632 Commit at 2017/06/15 14:46 2017-06-15 14:46:20 +08:00
catsworld 640333457a Commit at 2017/06/15 14:45 2017-06-15 14:45:37 +08:00
LI JIAHAO 96b96ca4ee improve admin user 2017-06-15 14:19:10 +08:00
LI JIAHAO f9bde680f5 Merge branch 'dev' of https://github.com/iborvs/NEUP-FleaMarket into dev 2017-06-15 14:12:01 +08:00
LI JIAHAO 6255189e34 Merge branch 'master' of https://github.com/yukiyukiyu/NEUP-FleaMarket into dev 2017-06-15 14:11:39 +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
iborvs e756183053 历史评价改观 2017-06-15 13:56:06 +08:00
iborvs ec8ab42d80 美化商品显示 2017-06-15 13:27:50 +08:00
iborvs ab411aab0c 用户信息移动端小bug处理 2017-06-15 13:00:34 +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
LI JIAHAO 88503c4ffb transaction bugfix
Signed-off-by: LI JIAHAO <lijiahao99131@gmail.com>
2017-06-15 12:34:27 +08:00
catsworld a6d09e2c28 Merge branch 'dev' of https://github.com/NEUP-Net-Depart/NEUP-FleaMarket 2017-06-15 09:46:23 +08:00
Jianqiu Zhang fc85401bf3 Merge pull request #143 from NEUP-Net-Depart/dev-void
Implement WYSIWYG Editor
2017-06-15 09:45:58 +08:00
catsworld 78d3a7c257 Merge branch 'dev' of https://github.com/NEUP-Net-Depart/NEUP-FleaMarket 2017-06-15 09:37:15 +08:00
Jianqiu Zhang 3d1fa3af49 Implement WYSIWYG Editor 2017-06-15 01:57:20 +08:00
iborvs fe87e81749 www 2017-06-15 00:15:42 +08:00
yuki 59a5eb1576 添加了举报悬浮窗和用户列表 2017-06-14 22:36:00 +08:00
catsworld 036d58c0af header! header 2017-06-14 21:12:43 +08:00
catsworld 22fbb6706e header! header 2017-06-14 20:45:48 +08:00
LI JIAHAO 7348cff179 Merge branch 'dev' of https://github.com/zhouziqunzzq/NEUP-FleaMarket into dev 2017-06-14 20:34:08 +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
Harry Zhou b9037f3538 Fix Message frontend with bootstrap. 2017-06-14 20:21:45 +08:00
LI JIAHAO d55543a155 Merge branch 'master' of https://github.com/catsworld/NEUP-FleaMarket into dev 2017-06-14 19:45:22 +08:00
LI JIAHAO d6677029c3 Merge branch 'dev' of https://github.com/zhouziqunzzq/NEUP-FleaMarket into zhouziqunzzq-dev 2017-06-14 19:43:13 +08:00
LI JIAHAO 3fdd733110 Merge branch 'master' into dev 2017-06-14 19:41:55 +08:00
catsworld ecb7483af4 No! Bug! No! Life 2017-06-14 19:40:45 +08:00
Harry Zhou aa63ad6a5d Fix message hide problem. 2017-06-14 19:37:55 +08:00
Harry Zhou 8099b6c56f Fix message hide problem. 2017-06-14 19:37:34 +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
catsworld 7950e5a3db The bootstrap is working fine now. 2017-06-14 16:36:50 +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