jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
19,543 Commits 98 Branches 0 Tags 0 B
Commit Graph

19543 Commits

Author SHA1 Message Date
陈晓婷 48d4ba8a36 Merge branch 'xss-bug' into 'develop' 
ADD 云编程按钮事件



See merge request !192
 2019-10-24 15:40:55 +08:00
Jasder 6fef889e19 ADD 云端编程按钮点击事件 2019-10-24 15:34:51 +08:00
Jasder 5375afb765 ADD 云端编程按钮点击事件 2019-10-24 15:28:48 +08:00
陈晓婷 5b5c2bb0df Merge branch 'xss-bug' into 'develop' 
FIX bug

解决冲突bug

See merge request !191
 2019-10-24 15:07:16 +08:00
SylorHuang 5064dffbc6 homeservice的修改 2019-10-24 14:50:21 +08:00
caishi 533170970a 行业动态 2019-10-24 10:34:08 +08:00
Jasder 14f551bc18 FIX bug 2019-10-24 09:32:39 +08:00
caishi 950f09009c ff 2019-10-24 09:22:25 +08:00
Jasder a79dbdc922 ADD some url 2019-10-24 09:13:10 +08:00
陈晓婷 dc9238717a Merge branch 'xss-bug' into 'develop' 
FIX 合并功能分支

合并功能分支

See merge request !190
 2019-10-23 16:30:27 +08:00
Jasder e030201d1d FIX bug 2019-10-23 16:22:57 +08:00
SylorHuang e1c89c6662 消息通知 2019-10-23 15:33:06 +08:00
caishi 2a346b3906 首页 2019-10-23 15:29:54 +08:00
caishi 352a045034 submit 2019-10-23 15:26:46 +08:00
Jasder c8481e7244 FIX 同步项目数和学校数量 2019-10-23 15:20:10 +08:00
Jasder 508ddd38f9 FIX 代码冲突 2019-10-23 15:04:10 +08:00
Jasder 942accb7c1 FIX merge 2019-10-23 15:01:27 +08:00
Jasder 7cfb5c7da0 Merge branch 'dev-homepage-revision' of http://git.trustie.net/jacknudt/trustieforge into dev-homepage-revision 2019-10-23 14:59:08 +08:00
Jasder db52e7a358 ADD url 2019-10-23 14:58:59 +08:00
caishi d3b1cee097 首页 2019-10-23 14:07:26 +08:00
caishi 942e93ae40 首页 2019-10-23 14:06:06 +08:00
Jasder d8718ba2b4 Merge branch 'dev-homepage-revision' of http://git.trustie.net/jacknudt/trustieforge into dev-homepage-revision 2019-10-23 12:22:29 +08:00
Jasder 0f223c7343 ADD 各平台跳转链接 2019-10-23 12:22:17 +08:00
SylorHuang 6d6445465b 消息通知页面的完成 2019-10-23 11:37:24 +08:00
caishi 9ee9850e3b 社区动态 2019-10-23 11:23:27 +08:00
caishi 3488c210b6 社区动态 2019-10-23 11:23:13 +08:00
Jasder 2444af2f5f ADD scholls count api 2019-10-23 11:15:17 +08:00
Jasder 5015f98e53 FIX 调整主页信息数据显示 2019-10-23 11:04:12 +08:00
Jasder 933c30bf21 FIX code style 2019-10-23 10:28:01 +08:00
Jasder ebbbf4ed11 FIX a target blank 2019-10-23 10:27:10 +08:00
caishi e503690dda news_list 2019-10-23 10:22:53 +08:00
Jasder 6fbbc24828 Merge branch 'dev-homepage-revision' of http://git.trustie.net/jacknudt/trustieforge into dev-homepage-revision 2019-10-23 10:11:05 +08:00
Jasder 9b0c37a9bd FIX 首页更新 2019-10-23 10:10:55 +08:00
caishi c7f172940c 动态新闻页面-分页 2019-10-23 09:58:47 +08:00
SylorHuang 0da8977115 消息通知 2019-10-22 18:42:10 +08:00
caishi 393d85e587 首页 2019-10-22 17:58:45 +08:00
caishi 70630df038 首页 2019-10-22 17:55:55 +08:00
caishi 3df8f6acdf 首页修改 2019-10-22 17:55:33 +08:00
SylorHuang 88505a22a4 个人主页的样式和功能 2019-10-22 14:01:58 +08:00
Jasder f6b02e7c93 ADD platform to dynamic_new model and api 2019-10-22 11:25:44 +08:00
Jasder 3e06dddbe4 Merge branch 'dev-homepage-revision' of http://git.trustie.net/jacknudt/trustieforge into dev-homepage-revision 2019-10-22 10:42:58 +08:00
Jasder b4cc5883bd ADD edit and delete dynamic_news 2019-10-22 10:42:52 +08:00
caishi 01a7711d22 不知道什么原因，拉完代码出现很多更改过的文件 2019-10-22 09:05:31 +08:00
Jasder 418975c21e ADD admin destroy dynamic_new 2019-10-21 17:09:26 +08:00
Jasder 2e4e631c6c FIX change root url 2019-10-21 17:08:42 +08:00
Jasder 50e31873dc FIX dynamic_news search 2019-10-21 16:47:21 +08:00
caishi a38f73edac home 2019-10-21 15:59:00 +08:00
SylorHuang d33fa8af92 个人主页的样式问题 2019-10-21 15:55:40 +08:00
SylorHuang 1c9aae461f Merge branch 'dev_new_head' of http://git.trustie.net/jacknudt/trustieforge into dev_new_head 2019-10-21 15:42:41 +08:00
SylorHuang 8f9f0215e3 change user page 2019-10-21 15:42:34 +08:00