Commit Graph

19667 Commits

Author SHA1 Message Date
caishi dca1515830 issue页面样式错乱 2019-10-25 18:20:17 +08:00
SylorHuang 7096abce3b 私信的页面 2019-10-25 16:44:30 +08:00
caishi 9dd5bf66b3 私信对话框 2019-10-25 16:27:17 +08:00
caishi 5587175e48 Merge branch 'dev-homepage-revision' into dev_new_head 2019-10-25 14:26:25 +08:00
陈晓婷 e278d778d5 Merge branch 'xss-bug' into 'develop'
删除issue回复隐藏按钮



See merge request !198
2019-10-25 11:16:20 +08:00
caishi 7ed3df6738 issue回复隐藏删除按钮-黄 2019-10-25 11:13:57 +08:00
caishi 9f6f585bc3 issue回复隐藏删除按钮-黄 2019-10-25 11:11:45 +08:00
caishi 7d3b4f6efe repeat 2019-10-25 11:10:22 +08:00
caishi 250ff98cbb h-删除 2019-10-25 11:09:13 +08:00
caishi 69d90a36bd 私信列表页面 2019-10-25 10:56:35 +08:00
caishi 06827df1c8 冲突 2019-10-25 10:02:27 +08:00
caishi 14d427aed1 Merge branch 'dev-homepage-revision' into dev_new_head 2019-10-25 09:57:45 +08:00
Jasder d06c0d6fa0 ADD url 2019-10-25 09:15:15 +08:00
caishi 21409187d0 链接 2019-10-25 08:50:48 +08:00
陈晓婷 a9c14caf68 Merge branch 'xss-bug' into 'develop'
chang build socks shop id



See merge request !197
2019-10-25 00:16:18 +08:00
Jasder b20e403044 FIX change build socks shop id 2019-10-25 00:15:21 +08:00
陈晓婷 c76215cda9 Merge branch 'xss-bug' into 'develop'
socks shop request

socks shop request

See merge request !196
2019-10-24 23:48:08 +08:00
Jasder b57f5d5d3b ADD build socks shop request 2019-10-24 23:47:07 +08:00
陈晓婷 0f105b5ab4 Merge branch 'xss-bug' into 'develop'
http 跨域配置



See merge request !195
2019-10-24 17:27:52 +08:00
Jasder 9a88a47f4e FIX http 跨域问题 2019-10-24 17:26:24 +08:00
陈晓婷 575a359978 Merge branch 'xss-bug' into 'develop'
FIX 指定项目id,测试



See merge request !194
2019-10-24 16:35:26 +08:00
Jasder 1fa2617119 FIX bug 2019-10-24 16:34:21 +08:00
陈晓婷 7978a7795a Merge branch 'xss-bug' into 'develop'
ADD headers



See merge request !193
2019-10-24 16:32:44 +08:00
Jasder fbfe908d46 ADD ajax request headers 2019-10-24 16:31:51 +08:00
陈晓婷 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