c-my/NEUP-FleaMarket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
286 Commits 1 Branch 0 Tags
20ebce97f4a873c98e46f715d2c8b564b8a20414
Commit Graph
197 Commits
Author SHA1 Message Date
yuki 20ebce97f4 完善了管理员界面的功能，添加了首页的滚动公示牌 2017-06-17 02:05:23 +08:00
LI JIAHAO 6122bf0c5b polling msg num 2017-06-15 21:03:48 +08:00
catsworld 55eb50652b 消息气泡 
Signed-off-by: LI JIAHAO <lijiahao99131@gmail.com>
 2017-06-15 21:03:47 +08:00
NightSiesta 2f2fd15077 hack the $99 license 
We have gotten $99!!!!

Signed-off-by: LI JIAHAO <lijiahao99131@gmail.com>
 2017-06-15 21:01:56 +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 057165f01c hack the wysiwyg license 2017-06-15 13:02:22 +08:00
Harry Zhou 91d96ddd02 Merge branch 'master' of https://github.com/NEUP-Net-Depart/NEUP-FleaMarket 2017-06-15 12:27:11 +08:00
Jianqiu Zhang 293f4c4bdd Continue fixing WYSIWYG 2017-06-15 11:37:11 +08:00
Jianqiu Zhang 9aaebf0e94 Fix WYSIWYG bug on phone and tablets 2017-06-15 11:20:05 +08:00
Jianqiu Zhang 6b1c60edf1 Fix bugs 2017-06-15 10:47:36 +08:00
Jianqiu Zhang 22c221d247 Improve WYSIWYG appearance 2017-06-15 10:33:37 +08:00
Jianqiu Zhang b00e4308cf Improve the editor appearence 2017-06-15 10:07:07 +08:00
Jianqiu Zhang ec3bb2ad4a Implement WYSIWYG for foundation 2017-06-15 08:24:43 +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 fd349675f0 goodinfo nickname bugfix 2017-06-14 21:29:20 +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 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
LI JIAHAO f2be5eca47 modified show version 2017-06-14 13:58:07 +08:00
LI JIAHAO 4d7e3fab37 fix query bug 2017-06-14 13:46:15 +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 f71ecb7551 fix some confusing expression 2017-06-14 13:13:55 +08:00
LI JIAHAO 41b29c8678 add badge 2017-06-14 02:29:30 +08:00
LI JIAHAO 1614b68434 Merge SSO realname from branch 'master' 2017-06-14 01:33:38 +08:00
LI JIAHAO 7095c8f0e1 fix fav bug 2017-06-14 01:33:32 +08:00
LI JIAHAO 722cba14c0 sso realname 2017-06-14 01:30:58 +08:00
LI JIAHAO fd5e495732 add baned label and ban good button 2017-06-13 21:31:34 +08:00
LI JIAHAO 72634ff398 commented some unimplemented function 2017-06-13 21:31:34 +08:00
LI JIAHAO 3c5f6138fc add ban user button 2017-06-13 21:31:33 +08:00
LI JIAHAO aacb8b1e14 frontend amendment 2017-06-13 21:31:33 +08:00
LI JIAHAO 62e485135c 简单地完善了一些前端的功能历史问题 2017-06-13 21:31:33 +08:00
LI JIAHAO 96ca752ed7 fix good adding page front-end 2017-06-13 21:31:33 +08:00
LI JIAHAO bcedf2967b frontend amendment 2017-06-13 21:31:33 +08:00
LI JIAHAO 828f222aac Merge branch 'master' of https://github.com/zhouziqunzzq/NEUP-FleaMarket 2017-06-13 21:02:55 +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 86b849e31d transaction page 2017-06-13 15:58:36 +08:00
LI JIAHAO c293d5c8b8 fix sso login 2017-06-13 12:42:57 +08:00