c-my/NEUP-FleaMarket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
403 Commits 1 Branch 0 Tags
master
Commit Graph
107 Commits
Author SHA1 Message Date
catsworld d2de4fad2d Merge branch 'master' of https://github.com/NEUP-Net-Depart/NEUP-FleaMarket 2017-07-22 11:11:25 +00:00
catsworld 8514f266c0 修改header和admin 2017-07-18 14:33:29 +08:00
LI JIAHAO d46bdcbe9b force refresh js 2017-06-22 00:44:37 +08:00
Harry Zhou c5135249d0 Edit Message function. 
1. Change vue to vue.min.js
2. Show error if Vue.js is not loaded
 2017-06-21 23:23:02 +08:00
Harry Zhou 80f922e635 Edit Message function. 
1. Fix balloon tip position
2. Enable html for all message and purify html tag in SendMessageHandler
3. Remove "没有更多了"
 2017-06-21 22:52:11 +08:00
LI JIAHAO 562efc2105 bugfix 2017-06-20 14:36:47 +08:00
LI JIAHAO 70a4eed0f9 fix some front-end 2017-06-20 14:15:07 +08:00
whoisnian 21576cd7d0 fix tests 2017-06-19 20:46:40 +08:00
LI JIAHAO a1273949d0 Merge branch 'master' into dev 2017-06-19 13:54:33 +08:00
LI JIAHAO 3f097688c1 Merge branch 'dev' of https://github.com/iborvs/NEUP-FleaMarket into dev 2017-06-19 09:56:29 +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
catsworld 5abe5db4bd A general commit at 2017/06/18 00:30 2017-06-18 00:30:05 +08:00
Harry Zhou bed1cb3169 Merge branch 'master' of https://github.com/NEUP-Net-Depart/NEUP-FleaMarket 2017-06-17 23:56:27 +08:00
LI JIAHAO b3b0606d95 bugfix 2017-06-17 23:55:56 +08:00
LI JIAHAO 128c1c965c add wechat oauth 2017-06-17 21:21:57 +08:00
LI JIAHAO f05876d7e0 bugfix 2017-06-16 23:25:13 +08:00
LI JIAHAO 6122bf0c5b polling msg num 2017-06-15 21:03:48 +08:00
catsworld dff0fcd2c6 去栅格化的开始 2017-06-15 20:33:27 +08:00
catsworld e39730e632 Commit at 2017/06/15 14:46 2017-06-15 14:46:20 +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
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 1bf7966dc4 Add fa support 2017-06-15 10:38:06 +08:00
Jianqiu Zhang ec3bb2ad4a Implement WYSIWYG for foundation 2017-06-15 08:24:43 +08:00
Jianqiu Zhang 3d1fa3af49 Implement WYSIWYG Editor 2017-06-15 01:57:20 +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
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
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 0a9d472ebf Merge branch 'master' into bootstrap 2017-06-14 17:51:21 +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
catsworld ebdb499cd4 Bootstrap v4 2017-06-14 13:05:53 +08:00
LI JIAHAO bcedf2967b frontend amendment 2017-06-13 21:31:33 +08:00
LI JIAHAO 92bfb8e7eb favlist frontend bugfix 2017-06-13 21:31:33 +08:00
LI JIAHAO d93722c1ab Merge branch 'master' into catsworld-master 2017-06-13 21:22:10 +08:00
catsworld 88a6e8d9d2 继续完善各方面细节 2017-06-13 21:00:14 +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
catsworld ce718d8e23 前端：改正了一些细节bug。另外现在手机端的catlist已经可以横向滚动了 2017-06-13 19:38:50 +08:00
catsworld e8a864978d Fixed bugs at 2017/06/13 13:21 2017-06-13 14:13:27 +08:00
catsworld 60094d3004 Commit at 2017/06/13 09:34 2017-06-13 11:53:29 +08:00
catsworld 047694f2ad 更换Foundation为bootstrap，相应修改了不少前端顺便优化了代码 2017-06-12 23:09:26 +08:00
Harry Zhou bef182b3b0 Add System Message whose contact_id is 0. 2017-06-10 18:23:50 +08:00
Harry Zhou 2137dddd2c Add autoscroll and animate to Message frontend. 2017-06-10 18:23:50 +08:00
LI JIAHAO 2e9e893671 Merge branch 'iborvs-master' 2017-06-10 16:43:11 +08:00