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
SylorHuang 14353bceb6 私信的页面的完成 2019-10-29 19:01:56 +08:00
SylorHuang 82c5fbd4fe Merge branch 'dev_new_head' of http://git.trustie.net/jacknudt/trustieforge into dev_new_head 2019-10-29 10:16:03 +08:00
SylorHuang b650b8efe6 私信未完成 2019-10-29 10:15:57 +08:00
caishi 6ebd78f3cc Merge branch 'dev-homepage-revision' into dev_new_head 2019-10-29 09:53:08 +08:00
caishi e64c570b38 fix 2019-10-29 09:52:32 +08:00
caishi 1e7587f69c Merge branch 'dev-homepage-revision' into dev_new_head 
# Conflicts:
#	public/stylesheets/css/iconfont/iconfont.css
 2019-10-28 17:46:04 +08:00
caishi caf41f92b1 icon1 2019-10-28 17:44:11 +08:00
caishi 6452bb1f6f Merge branch 'dev-homepage-revision' into dev_new_head 
# Conflicts:
#	app/views/issues/index.html.erb
 2019-10-28 17:40:34 +08:00
caishi 008e8a0f7a icon 2019-10-28 17:36:56 +08:00
caishi f5d6e1f347 icon 2019-10-28 17:36:15 +08:00
caishi 95f83f7793 个人主页 2019-10-28 17:32:40 +08:00
Jasder 3877d6e29d FIX 完善 网站合作单位的相关功能 2019-10-28 17:27:13 +08:00
caishi 98cfa418ac pull 2019-10-28 15:03:58 +08:00
SylorHuang d8b0a1987e Merge branch 'dev-homepage-revision' into dev_new_head 2019-10-28 14:27:50 +08:00
SylorHuang d479e21221 修改issue的点击权限 2019-10-28 09:35:44 +08:00
SylorHuang 936abfcddd 消息点击失败 2019-10-28 09:22:58 +08:00
caishi 774d12ed9d Merge branch 'develop' into dev_new_head 2019-10-28 09:02:43 +08:00
SylorHuang 40941b0f6d 新增私信的前端和后端 2019-10-26 19:13:30 +08:00
Jasder 50047d1e1c ADD web footer companies sort 2019-10-26 18:06:52 +08:00
Jasder b8c67ef297 Merge branch 'dev_new_head' of http://git.trustie.net/jacknudt/trustieforge into dev_new_head 2019-10-26 14:56:58 +08:00
SylorHuang 52bebf73b8 Merge branch 'dev_new_head' of http://git.trustie.net/jacknudt/trustieforge into dev_new_head 2019-10-26 11:07:16 +08:00
SylorHuang ac49cd0fa8 私信的列表页前后端 2019-10-26 11:07:11 +08:00
caishi 4b483e961e 冲突 2019-10-26 09:10:55 +08:00
Jasder 729ceecd2c FIX 2019-10-25 22:46:05 +08:00
Jasder 83270ab272 FIX bug 2019-10-25 22:41:10 +08:00
Jasder 62f38402f7 Merge branch 'xss-bug' into dev-homepage-revision 2019-10-25 22:27:20 +08:00
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