c-my/NEUP-FleaMarket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
370 Commits 1 Branch 0 Tags
b026f46b2c90def95927a7f6e7a51df3c7d33a95
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LI JIAHAO b026f46b2c finalize reg complete 2017-06-20 12:09:13 +08:00
LI JIAHAO 714186dd32 email/wechat completion 2017-06-20 11:34:55 +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
LI JIAHAO e4f0c28fd3 Merge branch 'zhouziqunzzq-master' 2017-06-18 00:09:29 +08:00
LI JIAHAO d9b1d1eba8 fix test 2017-06-18 00:07:43 +08:00
LI JIAHAO b3b0606d95 bugfix 2017-06-17 23:55:56 +08:00
LI JIAHAO af4dc71e83 text ammendment 2017-06-17 22:32:59 +08:00
LI JIAHAO c47d805a3f add welcome trans limit 2017-06-17 22:23:50 +08:00
LI JIAHAO cce8b4bc68 Merge branch 'yukiyukiyu-master' 2017-06-17 21:47:01 +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 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
LI JIAHAO 115dc25f3a Merge branch 'master' of https://github.com/catsworld/NEUP-FleaMarket into dev 2017-06-15 21:06:40 +08:00
LI JIAHAO 6122bf0c5b polling msg num 2017-06-15 21:03:48 +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
LI JIAHAO 6f74183efc Merge branch 'dev' of https://github.com/zhouziqunzzq/NEUP-FleaMarket into dev 2017-06-15 14:10:29 +08:00
LI JIAHAO a331f6f39b add purifier 
Signed-off-by: LI JIAHAO <lijiahao99131@gmail.com>
 2017-06-15 14:06:51 +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
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
LI JIAHAO 88503c4ffb transaction bugfix 
Signed-off-by: LI JIAHAO <lijiahao99131@gmail.com>
 2017-06-15 12:34:27 +08:00
LI JIAHAO c86b7394ef transaction bugfix 2017-06-15 12:27:45 +08:00
LI JIAHAO fd349675f0 goodinfo nickname bugfix 2017-06-14 21:29:20 +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
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
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
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
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
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 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
LI JIAHAO 92bfb8e7eb favlist frontend bugfix 2017-06-13 21:31:33 +08:00
LI JIAHAO bd5ac5c236 bugfix 2017-06-13 21:31:33 +08:00
LI JIAHAO fe5bba7f37 fix homepage 2017-06-13 21:31:04 +08:00
LI JIAHAO d93722c1ab Merge branch 'master' into catsworld-master 2017-06-13 21:22:10 +08:00
LI JIAHAO 828f222aac Merge branch 'master' of https://github.com/zhouziqunzzq/NEUP-FleaMarket 2017-06-13 21:02:55 +08:00
LI JIAHAO dae95e84de bugfix 2017-06-13 20:58:19 +08:00
LI JIAHAO 727e72c932 Merge branch 'master' of https://github.com/yukiyukiyu/NEUP-FleaMarket 2017-06-13 20:39:57 +08:00
LI JIAHAO 888c1435d4 change announcement route 2017-06-13 19:15:02 +08:00
LI JIAHAO c8bba38ad4 Merge branch 'master' into catsworld-master 2017-06-13 16:14:36 +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 8fe083d9ae Merge branch 'master' into catsworld-master 2017-06-13 15:22:00 +08:00
LI JIAHAO 3193ca1a17 fix #114 2017-06-13 15:20:12 +08:00
LI JIAHAO c293d5c8b8 fix sso login 2017-06-13 12:42:57 +08:00
LI JIAHAO 483f8c99b5 Add SSO 2017-06-12 22:35:08 +08:00
LI JIAHAO 62e5774c78 bugfix 2017-06-12 17:50:11 +08:00
LI JIAHAO 208fb3abac 举报和评价的显示 2017-06-12 17:14:39 +08:00
LI JIAHAO 1c0ca4ca95 完成举报相关功能 2017-06-12 17:00:37 +08:00
LI JIAHAO 98331544d0 sso guide and fix header menu bug 2017-06-12 16:08:04 +08:00
LI JIAHAO 64e87fafe0 Merge branch 'catsworld-master' 2017-06-12 15:31:49 +08:00
LI JIAHAO f37eacc132 fix ci test 2017-06-12 15:23:56 +08:00
LI JIAHAO 978d693f83 fix message page and add fav bug 2017-06-10 19:16:00 +08:00
LI JIAHAO 893a4def49 Merge branch 'master' of https://github.com/yukiyukiyu/NEUP-FleaMarket into yukiyukiyu-master 2017-06-10 17:55:13 +08:00
LI JIAHAO a0d4d38b95 formatted code 2017-06-10 17:47:19 +08:00
LI JIAHAO bf81dd78c7 fix iborvs bug 2017-06-10 16:59:51 +08:00
LI JIAHAO 2e9e893671 Merge branch 'iborvs-master' 2017-06-10 16:43:11 +08:00
LI JIAHAO 2ba45f3599 fix trans good count update bug 2017-06-09 18:57:50 +08:00
LI JIAHAO 7a9d5674e2 add nav bar menu link 2017-06-09 17:33:45 +08:00
LI JIAHAO 11f24e663e Merge branch 'iborvs-master' 2017-06-09 16:41:56 +08:00
LI JIAHAO d3da0ae97e some transaction frontend 2017-06-07 12:23:58 +08:00
LI JIAHAO 75eb0a8602 Merge branch 'master' of https://github.com/RoyWinchester/NEUP-FleaMarket into master 2017-06-04 00:05:22 +08:00
LI JIAHAO d683f872ad Merge branch 'iborvs-master' 2017-06-04 00:01:21 +08:00
LI JIAHAO 5cc21cf472 fix routes bug 2017-06-02 12:25:17 +08:00
LI JIAHAO b14ec8cf61 forget password and add some test 2017-05-30 15:37:49 +08:00
LI JIAHAO 805c37b53d user 2017-05-30 14:58:41 +08:00