Commit Graph
291 Commits
Author SHA1 Message Date
LI JIAHAO 94929b2d5d fix email unique problem 2017-06-16 19:06:06 +08:00
LI JIAHAO 43523eac86 fix wysiwyg 2017-06-16 18:46:30 +08:00
LI JIAHAO 186ece7a94 fix good num display 2017-06-16 16:15:55 +08:00
LI JIAHAO 950da64046 remove header left bar 2017-06-16 13:46:11 +08:00
LI JIAHAO af237dc64c upputting new goods 2017-06-16 13:32:36 +08:00
LI JIAHAO 2cfd23abeb msg tip bugfix 2017-06-16 13:31:55 +08:00
yuki d75e6f3162 添加了邮件功能后端 2017-06-16 12:52:49 +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
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 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 6122a0efab Merge pull request #146 from NEUP-Net-Depart/master-void
fa support & Editor
2017-06-15 10:40:37 +08:00
Jianqiu Zhang 1bf7966dc4 Add fa support 2017-06-15 10:38:06 +08:00
Jianqiu Zhang 22c221d247 Improve WYSIWYG appearance 2017-06-15 10:33:37 +08:00
Jianqiu Zhang e197791897 Merge pull request #145 from NEUP-Net-Depart/master-void
Improve the editor appearence
2017-06-15 10:08:32 +08:00
Jianqiu Zhang b00e4308cf Improve the editor appearence 2017-06-15 10:07:07 +08:00
Jianqiu Zhang ad7d8b5391 Merge pull request #144 from NEUP-Net-Depart/master-void
Implement WYSIWYG for foundation
2017-06-15 09:44:52 +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 9ebd92830e improve userinfo with adding good 2017-06-14 20:32:19 +08:00
Harry Zhou aa63ad6a5d Fix message hide problem. 2017-06-14 19:37:55 +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 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