 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 |
|
|
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 |
|
|
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 |
|
|
catsworld
|
ebdb499cd4
|
Bootstrap v4
|
2017-06-14 13:05:53 +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
|
6f343b9792
|
Merge branch 'master' into catsworld-master
|
2017-06-13 21:33:14 +08:00 |
|
|
LI JIAHAO
|
d54e706564
|
bump version
|
2017-06-13 21:31:34 +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 |
|