Commit Graph
232 Commits
Author SHA1 Message Date
LI JIAHAO 3f097688c1 Merge branch 'dev' of https://github.com/iborvs/NEUP-FleaMarket into dev 2017-06-19 09:56:29 +08:00
iborvs 0e283a4f1d 每次改完东西都忘了自己改了啥 2017-06-18 18:59:02 +08:00
iborvs 1ceae955ee 界面优化,处理部分历史遗留 2017-06-18 18:42:35 +08:00
iborvs 771be0d155 修复筛选栏、det等锅 2017-06-18 18:03:25 +08:00
catsworld 55318da7ef Commit at 2017/06/18 17:23 2017-06-18 17:23:45 +08:00
iborvs ab98b91a28 merge 2017-06-18 14:26:54 +08:00
iborvs bc2dddee47 merge 2017-06-18 14:18:52 +08:00
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
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
catsworld a6d09e2c28 Merge branch 'dev' of https://github.com/NEUP-Net-Depart/NEUP-FleaMarket 2017-06-15 09:46:23 +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
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 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
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
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 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 e4a216fd40 Remove contact me on user's own goods. 2017-06-14 14:01:52 +08:00
LI JIAHAO 09cc202924 Merge branch 'master' into foundation 2017-06-14 13:59:05 +08:00