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

19562 Commits

Author SHA1 Message Date
caishi bfcc9c6b38 nyan 2019-11-04 15:26:54 +08:00
caishi b0ecc9f819 nyan 2019-11-04 15:25:22 +08:00
caishi 61b844dfd4 个人主页左侧 2019-11-04 15:05:13 +08:00
caishi ce3792b219 Merge branch 'dev-homepage-revision' of http://git.trustie.net/jacknudt/trustieforge into dev_new_head 
# Conflicts:
#	app/views/users/_user_message_left.html.erb
 2019-11-04 14:59:18 +08:00
Jasder b4a8cfc363 FIX merge 2019-11-04 14:55:22 +08:00
caishi 8cce8438a1 Merge branch 'dev-homepage-revision' into dev_new_head 
# Conflicts:
#	app/views/users/_user_message_left.html.erb
 2019-11-04 14:37:41 +08:00
Jasder 17b9c06027 FIX only show read messages count 2019-11-01 17:27:48 +08:00
Jasder 21dfac44ab FIX 解决KE编辑器导致Latex公式显示不正常的bug -MathJax 2019-11-01 16:14:26 +08:00
Jasder da73c34c5a Merge branch 'dev-homepage-revision' of http://git.trustie.net/jacknudt/trustieforge into dev-homepage-revision 2019-11-01 11:07:09 +08:00
Jasder ade760d2dd ADD blog url 2019-11-01 11:04:54 +08:00
SylorHuang 9523a8304e 私信添加提醒 2019-10-30 09:44:40 +08:00
SylorHuang 4555eba8e7 私信的功能完成 2019-10-29 19:03:37 +08:00
SylorHuang 14353bceb6 私信的页面的完成 2019-10-29 19:01:56 +08:00
caishi 96816ffb5d 待办事项页面 2019-10-29 17:32:35 +08:00
caishi 3ab74de0eb Merge branch 'dev-homepage-revision' into dev_new_head 2019-10-29 11:25:01 +08:00
caishi ee5778746d again 2019-10-29 11:24:11 +08:00
caishi 26cee33e9e common.css 2019-10-29 11:23:08 +08:00
caishi 644300ccaa fix 2019-10-29 11:21:41 +08:00
caishi c041de02a7 新版个人主页和“TA的主页”的左侧头像和个人信息显示调整 2019-10-29 11:20:55 +08:00
SylorHuang 3ad343fc33 项目的500 错误 2019-10-29 10:33:04 +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