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

1951 Commits

Author SHA1 Message Date
lizanle 94bffb5458 插入头像 ， 粘贴图片 ，插入图片，都要加入域名。防止邮件中出现图片不显示的问题 2015-10-10 11:37:58 +08:00
Tim 0d85fb3c5f 导航栏链接在变色范围内都可点击 2015-10-10 11:07:29 +08:00
Tim 9e91429b1e 鼠标在侧导航左侧文字颜色不变修复 2015-10-10 10:32:08 +08:00
Tim 99e19c51f9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-10 10:24:12 +08:00
Tim 48bd70b9f6 个人动态编辑图片显示 2015-10-10 10:23:52 +08:00
huang ddac70c9b8 项目成员角色Gitlab一致，单选 
添加成员按钮样式调整
 2015-10-10 10:00:11 +08:00
lizanle 724abee12a 缩进问题 2015-10-09 15:49:50 +08:00
cxt c6cca9f17e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-09 14:40:49 +08:00
cxt 0f6ea47792 课程讨论区的列表显示 2015-10-09 14:39:40 +08:00
lizanle 5f8d21f1cb 暂时去掉 工具栏聚焦和不聚焦的时候 的隐藏和显示控制 2015-10-09 14:26:27 +08:00
lizanle b04e20ed7d 工具栏聚焦和不聚焦的时候 的隐藏和显示控制 2015-10-09 14:25:40 +08:00
lizanle 357a5d4139 添加点赞人数 2015-10-09 14:08:12 +08:00
huang 530d101024 项目邀请--姓名、长度JS验证 2015-10-09 11:25:21 +08:00
huang 7b18c14aa3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-10-09 10:34:18 +08:00
huang 654ebfca46 项目邀请添加：姓、名、性别 2015-10-09 10:33:10 +08:00
Tim fb5eae3ae2 搜索框图标漂移效果清除 2015-10-09 10:26:47 +08:00
Tim 0ff58b7631 修复了贴吧图片漂移的问题 2015-10-09 09:41:36 +08:00
Tim 2ceba291bf 蓝色箭头替换 2015-10-08 17:27:08 +08:00
Tim f5ff94d888 资源库固定宽度、作品描述margin、搜索框文字居中 2015-10-08 16:35:08 +08:00
lizanle 7d04ce80d4 tag为可以点击的时候 是 手型 2015-10-08 13:56:17 +08:00
lizanle c8357a6364 批量修改tag 2015-10-08 13:51:55 +08:00
lizanle d8a4e4d710 issue序号丢失的问题 
issue缩进以及代码缩进的样式不同 的问题
 2015-10-08 11:33:52 +08:00
lizanle 56db8b4232 批量修改tag的bug 2015-10-08 11:08:26 +08:00
lizanle 88ddaaaaf5 Merge remote-tracking branch 'origin/szzh' into szzh 2015-10-08 10:00:23 +08:00
lizanle f71ca2391f 编辑器换行行间距巨大的bug 2015-10-08 10:00:10 +08:00
huang 326c05d0eb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-30 11:24:31 +08:00
huang fd020b56f7 细调红点样式 2015-09-30 11:24:17 +08:00
Tim c7a9738dc8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-30 10:52:44 +08:00
Tim ff18381f64 引用资源库弹框调整 2015-09-30 10:52:27 +08:00
sw af892fa7ef Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-30 10:44:00 +08:00
Tim 78d11b57b9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-30 10:33:31 +08:00
Tim 42d4a5628d 引用资源库的icon修改 2015-09-30 10:33:13 +08:00
huang 548a18d1fe Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-30 10:32:16 +08:00
huang edf6f8e1f0 消息提示，显示新消息数目 2015-09-30 10:31:47 +08:00
sw d1bb76cfcb 调整学生匿评界面提交按钮样式 2015-09-30 10:24:20 +08:00
lizanle d182f532a6 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-30 10:21:27 +08:00
lizanle acdb63974f 具体课程发布作业的样式 2015-09-30 10:21:11 +08:00
sw 9edfa49bcb 项目内上传图片按钮 2015-09-29 17:41:12 +08:00
huang 278d26e9a0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 17:35:37 +08:00
huang fe83fe31af 项目版本库--》内容对比 2015-09-29 17:35:22 +08:00
Tim b6a8a69be8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 17:30:02 +08:00
Tim 4c5b59ebc8 作业动态图标替换 2015-09-29 17:28:45 +08:00
sw 3cf5e9e2b1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 17:26:31 +08:00
lizanle 4386f3fddf 样式问题 2015-09-29 17:29:44 +08:00
sw 7cba1e5f76 课程内发布作业按钮无反应 2015-09-29 17:10:16 +08:00
lizanle 2c9e46fc77 靠左 0间距 2015-09-29 16:48:56 +08:00
lizanle b292b1580d Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-29 16:36:58 +08:00
lizanle 38702dde64 去掉源码模式 2015-09-29 16:36:51 +08:00
cxt 06b97e281a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 16:20:50 +08:00
cxt 26624c8009 动态回复编辑框的“我要回复”的隐藏 2015-09-29 16:20:35 +08:00
lizanle 3c01969db1 代码缩进 2015-09-29 16:06:04 +08:00
Tim 1613f41e77 点赞判断 2015-09-29 15:44:04 +08:00
Tim 0fdf10649c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 15:25:01 +08:00
Tim a0f4cabcf2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 15:24:30 +08:00
lizanle 81092a7e32 行高调整 2015-09-29 15:24:50 +08:00
Tim 971ff1e692 贴吧点赞位置调整 2015-09-29 15:24:15 +08:00
lizanle c8b5ccdd34 行高调整 2015-09-29 15:23:09 +08:00
sw 9beaba0aac Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 15:21:11 +08:00
lizanle 9e4896fc7b Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-29 15:13:14 +08:00
lizanle 138b24b34c oschina模式的代码插入 2015-09-29 15:13:05 +08:00
sw b22669e36f 课程上传图片按钮 2015-09-29 14:50:29 +08:00
Tim 21408f3843 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-29 14:35:02 +08:00
Tim cc99120f25 贴吧样式更改 2015-09-29 14:34:39 +08:00
sw 515e2be4f8 课程内的作业列表匿评设置确定按钮无效 2015-09-29 14:23:50 +08:00
lizanle de62798d4d 点赞按钮位置调整 2015-09-29 13:54:54 +08:00
lizanle 4f63f3fd2a 导航 2015-09-29 12:06:56 +08:00
huang da4b00e56c Merge branch 'szzh' into dev_hjq 2015-09-29 10:46:19 +08:00
huang 61061573a7 去掉版本库git操作指南 2015-09-29 10:42:17 +08:00
sw 22b9c6a866 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/courses.css
 2015-09-29 10:40:11 +08:00
lizanle 5002daad52 帖子内容显示不对 2015-09-29 10:34:05 +08:00
sw 6194be8933 界面样式调整。js修改 
在课程内发布作业时无课程id
 2015-09-28 17:09:07 +08:00
cxt 12c394c36e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 16:11:18 +08:00
cxt 955d87a98c 新增测试集的编辑框自适应高度 2015-09-28 16:09:59 +08:00
ouyangxuhua 80fabf0681 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 16:09:55 +08:00
ouyangxuhua e9d61a928a 修复项目issue中，图片显示超出边界的问题 2015-09-28 16:08:47 +08:00
sw 35b1bc8069 课程内作业列表界面修改 2015-09-28 15:52:30 +08:00
cxt e1348a4845 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 15:24:27 +08:00
cxt 038bcdb80e 课程动态的作业编辑菜单样式调整 2015-09-28 15:24:03 +08:00
ouyangxuhua eac31cda7f 修改个人主页最新动态图片显示超出边界问题 2015-09-28 15:13:42 +08:00
cxt e298f738ed 调整课程动态的过滤列表样式 2015-09-28 14:10:04 +08:00
ouyangxuhua 29b4e174fd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 10:20:27 +08:00
ouyangxuhua f73865b771 1.修改作业消息的样式； 
2.解决系统消息时间显示问题。
 2015-09-28 10:20:14 +08:00
cxt 9190f0515d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-28 08:46:20 +08:00
sw 591324854b 项目缺陷点击留言，下面留言框获得焦点 2015-09-25 17:22:31 +08:00
cxt be932e3b1b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 16:32:41 +08:00
cxt c81e07d588 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2015-09-25 16:32:25 +08:00
lizanle c3d829a68f 名称检查 2015-09-25 16:32:02 +08:00
cxt 223bac373f 课程动态的数据迁移 2015-09-25 16:29:47 +08:00
lizanle e0c338b497 限制字符长度 2015-09-25 16:20:51 +08:00
lizanle c8cbab2d50 火狐浏览器 和 ie浏览器的event获得 和 阻止 方式不同 2015-09-25 15:55:29 +08:00
ouyangxuhua 6591ea8e9a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 15:27:00 +08:00
ouyangxuhua 0b932267c7 调整截止日期快到了的宽度 2015-09-25 15:26:40 +08:00
sw 6c62b44b59 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 15:06:06 +08:00
ouyangxuhua 474779498b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 14:40:22 +08:00
ouyangxuhua 1935a9caaa 调整消息页面的宽度 2015-09-25 14:38:41 +08:00
sw 5f1b4b1b24 导入作业后编辑按钮、弹出框确定按钮不可用 2015-09-25 14:16:12 +08:00
lizanle 7ef48f3fa3 标签修改的问题 2015-09-25 12:31:52 +08:00
lizanle 9184dddb5e Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-25 11:50:05 +08:00
lizanle 3fe5adcaf8 统一修改tag 会 和边框有边距 2015-09-25 11:49:57 +08:00
huang 8886bda790 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 11:46:15 +08:00