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

307 Commits

Author SHA1 Message Date
Tim cc99120f25 贴吧样式更改 2015-09-29 14:34:39 +08:00
lizanle de62798d4d 点赞按钮位置调整 2015-09-29 13:54:54 +08:00
lizanle 4f63f3fd2a 导航 2015-09-29 12:06:56 +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
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 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
cxt 223bac373f 课程动态的数据迁移 2015-09-25 16:29:47 +08:00
ouyangxuhua 0b932267c7 调整截止日期快到了的宽度 2015-09-25 15:26:40 +08:00
ouyangxuhua 1935a9caaa 调整消息页面的宽度 2015-09-25 14:38:41 +08:00
ouyangxuhua 4d1bc90161 匿名用户重新评阅作品，在消息显示中，需要正常显示 2015-09-25 11:40:57 +08:00
Tim c675a4c227 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-25 10:43:42 +08:00
Tim e8a7448a7c 资源库用户资源图标位置调整 2015-09-25 10:43:19 +08:00
Tim 7e3ae446f5 资源库头像替换 2015-09-25 10:35:04 +08:00
cxt 15b45e6706 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/header.css
	public/stylesheets/new_user.css
	public/stylesheets/public_new.css
 2015-09-24 16:46:08 +08:00
cxt bb0db1e21d 课程动态页面 2015-09-24 16:30:14 +08:00
lizanle 531b264a8f Merge branch 'dev_zanle' into szzh 2015-09-24 13:44:37 +08:00
lizanle 38a24e8fe4 论坛消息回复改版 2015-09-24 12:17:14 +08:00
huang 99473c6880 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/issues/show.html.erb
 2015-09-24 11:46:33 +08:00
sw f9f51557dd 增加关闭反馈功能 2015-09-24 11:31:07 +08:00
lizanle d512c25c03 Merge branch 'szzh' into dev_zanle 
Conflicts:
	public/javascripts/new_user.js
	public/stylesheets/header.css
	public/stylesheets/new_user.css
 2015-09-24 10:15:23 +08:00
lizanle c8d07dedf6 帖子添加编辑 删除 链接 2015-09-23 17:09:21 +08:00
lizanle 6ac5b738e3 论坛编辑功能 2015-09-23 16:27:13 +08:00
sw fa13ccfaa8 匿评参数设置功能完成 2015-09-23 15:44:48 +08:00
lizanle eed530db2b 添加 上传附件的 文字 2015-09-23 15:14:37 +08:00
ouyangxuhua 841c680bb1 1.作业消息增加显示老师、课程、课程季度等信息 
2.作业内容为空时，tips中不显示内容
 2015-09-23 14:53:50 +08:00
sw 9d474d6528 设置匿评属性静态页面 2015-09-23 13:54:36 +08:00
cxt 76afbdec3f 隐藏kindeditor的“插入代码”，调整项目编号/符号的样式 2015-09-23 09:23:31 +08:00
lizanle 361b391d3c 修改分页的样式 2015-09-22 17:18:10 +08:00
Tim 93804bcfa6 关于我们图片对齐 2015-09-22 16:11:22 +08:00
cxt a37f39558d 项目和课程的列表符号样式修改 2015-09-22 15:54:50 +08:00
cxt 8883093b96 "关于我们"的图片居中 2015-09-21 17:05:51 +08:00
cxt facd12640a 个人动态的回复为0时不显示“回复(0)” 2015-09-21 16:54:23 +08:00
cxt b9bac42c1a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-19 11:18:55 +08:00
cxt 098be99b84 动态回复框的样式调整 2015-09-19 11:18:41 +08:00
sw 715dc28187 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2015-09-18 17:51:11 +08:00
lizanle 9443c139f0 update forum 2015-09-18 17:44:16 +08:00
huang 850a7c937f Merge branch 'szzh' into dev_hjq 2015-09-18 17:39:37 +08:00
huang c8f7655d1e 系统消息样式 2015-09-18 17:01:30 +08:00
cxt cacb3e043a 动态回复框的焦点前焦点后样式调整 2015-09-18 16:34:37 +08:00
sw 607c31c8c5 编辑图片按钮图片不正确 2015-09-18 16:08:59 +08:00
ouyangxuhua 2db6b8311d 1.修改tips宽度； 
2.修改图片的max-width
 2015-09-18 15:56:26 +08:00
sw cf2a00d7a8 作业列表增加：编程语言提示，匿评阶段提示 2015-09-18 14:25:04 +08:00
ouyangxuhua d807180bf2 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-18 13:52:36 +08:00
ouyangxuhua c024bb5e58 1.修改系统消息样式，放在application.css中； 
2.修改消息提示样式
 2015-09-18 13:52:16 +08:00
huang f041c80d0a Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/users/user_messages.html.erb
	db/schema.rb
	public/stylesheets/new_user.css

解决冲突
 2015-09-18 13:08:12 +08:00
sw f04e0c5f84 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2015-09-18 11:34:29 +08:00
ouyangxuhua 989d74bf70 修改消息tips样式 2015-09-18 11:25:23 +08:00
sw 4b83265508 1、编程作业可以修改、删除 
2、关闭匿评之后结束匿评按钮样式
3、编程作业成绩计算有问题
4、相关样式修改
5、编程作业作品展开界面功能
 2015-09-18 11:05:21 +08:00
ouyangxuhua 7694a8fd2c 所有消息里的系统消息样式 2015-09-18 09:35:26 +08:00
Tim 210425277e 导航栏下拉菜单样式调整 2015-09-17 17:17:36 +08:00
ouyangxuhua 47d734e0d9 修改系统消息图片大小 2015-09-17 16:23:03 +08:00
Tim 3dccf8f77d 动态页面菜单栏图标更改； 
提交作业界面图标宽度更改。
 2015-09-17 16:04:27 +08:00
huang e7fc0ca6d3 休整消息样式 2015-09-17 13:44:52 +08:00
huang 7cdebab5e5 1、修改系统消息样式 
2、解决新注册用户系统消息红点不显示问题
3、调整消息样式
 2015-09-17 12:59:52 +08:00
Tim 0930815086 回复头像模糊效果 2015-09-17 10:25:26 +08:00
Tim 1085c9c53f 添加，取消关注图标恢复 2015-09-17 09:06:01 +08:00
ouyangxuhua 1476489921 增加鼠标经过提示title 2015-09-16 17:35:08 +08:00
Tim 3d5f93b938 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/users/_course_message.html.erb
	app/views/users/_course_news.html.erb
	app/views/users/_project_issue.html.erb
	app/views/users/_project_message.html.erb
	app/views/users/_user_activities.html.erb
	public/stylesheets/new_user.css
 2015-09-16 16:13:40 +08:00
sw 5f08ecc7e3 1、作业的开启匿评、关闭匿评功能 
2、提交作品时，迟交扣分、缺评扣分的计算--->改为只计算数量
3、
 2015-09-16 10:26:13 +08:00
Tim 77a8c18a77 1.关于我们样式修改； 
2.登录界面格式调整；
3.个人动态回复样式调整；
 2015-09-16 10:16:25 +08:00
sw cd96fd99a8 快速创建项目 2015-09-15 16:11:55 +08:00
sw f79b2cda94 提交作品关联项目功能 2015-09-15 15:18:33 +08:00
cxt a999897efa 动态回复头像的调整 2015-09-15 09:22:18 +08:00
ouyangxuhua 9ba89b3fe7 系统消息样式 2015-09-14 16:48:39 +08:00
ouyangxuhua 9ba0d3293e 修改系统消息提示样式 2015-09-14 16:05:29 +08:00
cxt f1a6e3d7e3 “关于我们”的样式调整 2015-09-11 17:57:25 +08:00
huang 4d4b48ef99 Merge branch 'szzh' into dev_hjq 
Conflicts:
	db/schema.rb
 2015-09-11 15:50:10 +08:00
huang 8c0f9d24f8 系统消息没保存成功添加验证 
系统消息样式修改
 2015-09-11 15:39:46 +08:00
ouyangxuhua 22e2510482 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-11 14:43:14 +08:00
ouyangxuhua 3044b07df7 系统消息颜色 2015-09-11 14:43:04 +08:00
huang c0437ae992 作业截止时间提醒界面！ 2015-09-11 14:41:23 +08:00
sw f0bd113a5e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-10 17:11:38 +08:00
sw 93b179c958 修改普通作业 2015-09-10 17:11:16 +08:00
lizanle 80e38287dd 所有baselayout都引入prttefy.css .js 
调整资源库宽度
 2015-09-10 16:38:45 +08:00
sw fce5405c41 发布作业界面样式调整 2015-09-10 14:44:25 +08:00
sw 97f9d4fa60 增加教师节祝福语 2015-09-10 10:26:16 +08:00
sw a841c20896 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-09 17:51:13 +08:00
sw e30abd2a81 提交、修改作品界面宽度 2015-09-09 17:50:49 +08:00
cxt 5b14dbba45 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-09 17:47:09 +08:00
cxt 6ed0a151dc 头像下拉框的样式修改 2015-09-09 17:45:39 +08:00
sw 519f079bcc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-09 16:54:21 +08:00
sw b1463f0864 学生提交匿评作业作品功能实现 2015-09-09 16:10:11 +08:00
cxt 040f3f588d 鼠标移到头像上方，才显示账户下拉菜单 2015-09-09 11:23:23 +08:00
cxt 8fec99114a "关于我们"的样式调整 2015-09-09 10:39:11 +08:00
cxt a991500e55 登录首页的样式修改 2015-09-09 10:21:44 +08:00
sw 2e59584031 作业编辑功能按钮、加入课程、项目等按钮样式 2015-09-08 16:36:50 +08:00
sw 137a0b16a0 1、文件的样式图片 
2、点击编程弹框时，测试输入获取焦点
 2015-09-08 15:40:25 +08:00
sw e4209007b1 Merge branch 'guange_homework' into szzh 2015-09-08 10:28:21 +08:00
guange 9e9f373a76 发布作业优化 2015-09-07 23:09:19 +08:00
cxt a86d2aaadd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-07 17:38:41 +08:00
cxt 32b2d4f874 点击动态中的图片即显示大图 2015-09-07 17:38:31 +08:00
lizanle 6bcaf01fe2 课程弹出框样式不对 2015-09-07 16:01:19 +08:00
sw 359e34471b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-02 21:30:59 +08:00
huang c7f15d3a3e 修改留言html样式 2015-09-02 20:06:47 +08:00
sw 5be3a9e03f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-02 19:52:56 +08:00
sw 893ae35039 新建作品、编辑作品界面修改 2015-09-02 19:52:44 +08:00
sw 6a6fbea446 提交作品样式 2015-09-02 19:41:45 +08:00
huang 1ba0c86828 Merge branch 'szzh' into dev_hjq 2015-09-02 19:38:31 +08:00
huang 4c76292e5e message--viewed 2015-09-02 18:00:36 +08:00
suntao 4259540f53 作业列表宽度调整 2015-09-02 17:03:01 +08:00
huang a94d5928d4 Merge branch 'szzh' into dev_hjq 2015-09-02 14:32:46 +08:00
huang 487881bb92 Merge branch 'szzh' into dev_hjq 
Conflicts:
	public/stylesheets/new_user.css
 2015-09-02 14:15:38 +08:00
suntao 9b8270aed1 Banner padding调整 2015-09-02 14:15:26 +08:00
suntao c9d46f17f3 回复blockquote调整 2015-09-02 11:15:38 +08:00
ouyangxuhua 16e018a444 更改未读消息样式的字体大小 2015-09-02 10:55:40 +08:00
suntao 9bbf658fdb 回复框样式调整 2015-09-02 10:51:46 +08:00
ouyangxuhua 2fc337cb07 修改已读和未读消息样式 2015-09-02 09:25:34 +08:00
suntao f036b322b9 忘记密码页面提示位置调整 2015-09-02 09:05:52 +08:00
suntao 313ee0f9d8 footer对齐调整 2015-09-01 16:30:10 +08:00
suntao 59bbfeb0b5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-01 16:25:22 +08:00
suntao 56644ca173 点击展开更多样式 2015-09-01 16:25:05 +08:00
guange 8ad521d4ab merge 2015-09-01 16:19:48 +08:00
guange 41f9daed6d 编程作业放入到users controller 2015-09-01 16:18:03 +08:00
suntao ded497a5f2 个人主页左侧导航配置按钮 2015-09-01 15:43:59 +08:00
sw 5f42ce4c80 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/users/_course_message.html.erb
	app/views/users/_course_news.html.erb
	app/views/users/_project_issue.html.erb
	app/views/users/_project_message.html.erb
 2015-09-01 15:28:03 +08:00
huang fede611fea 鼠标经过显示内容效果 
公共贴吧数据迁移
 2015-09-01 15:23:30 +08:00
suntao 00de825050 作业界面颜色更改，删掉冗余头部导航css 2015-09-01 15:10:56 +08:00
suntao acb46d520c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/users/_user_homework_form.html.erb
 2015-09-01 14:40:24 +08:00
suntao ae3f56c758 提交作业界面对齐 2015-09-01 14:37:34 +08:00
sw b1de662338 讨论区回复功能，修改引用样式 2015-09-01 14:18:44 +08:00
lizanle 798326d6ef Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-01 11:29:53 +08:00
lizanle b3e3737fb5 发布作业时从资源库选择资源功能 2015-09-01 11:29:43 +08:00
sw 84ff3450d2 在动态中回复通知动态 2015-09-01 10:43:30 +08:00
suntao fe664b5e5c 回复模块调整 2015-09-01 09:42:03 +08:00
suntao e917a68bd3 消息页面li间距调整，回复块调整 2015-09-01 09:13:34 +08:00
suntao 1d1d2f738d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-31 17:51:08 +08:00
suntao acf5db7067 placeholder显示等 2015-08-31 17:50:50 +08:00
huang 311634abf1 修改消息列表样式 2015-08-31 16:53:54 +08:00
cxt 1113a7938c 修复点击空白处返回新建课程/项目的页面 2015-08-31 16:53:41 +08:00
cxt 4ab91984f2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-31 15:33:39 +08:00
cxt fa57a6c889 主页动态的样式修改 2015-08-31 15:33:20 +08:00
suntao ac353841b0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-31 15:21:28 +08:00
suntao d3869b03cd 资源库版面样式调整 2015-08-31 15:21:09 +08:00
lizanle 9a1fa316bb Merge remote-tracking branch 'origin/szzh' into szzh 2015-08-31 15:06:38 +08:00
lizanle 19dfd77cad 将资源发送至 会换行，调宽 2015-08-31 15:06:07 +08:00
suntao 3e9bb8a596 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2015-08-31 14:55:15 +08:00
suntao b0ff7f0ee2 页面间距调整，头像大小调整 2015-08-31 14:52:56 +08:00
cxt 23c1ac5a4a 项目问题的动态内容显示超出边框 2015-08-31 14:28:43 +08:00
sw cc50d0d85e 布置作业界面调整删除按钮和文件的距离 2015-08-29 17:08:55 +08:00
sw 17e9b2d293 编辑个人简介文本框 2015-08-29 14:48:47 +08:00
suntao 0d8624a642 颜色更新 2015-08-29 14:43:28 +08:00
suntao 886a00e18d footer间距调整 2015-08-29 14:22:29 +08:00
suntao a22727efb2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 14:08:58 +08:00
suntao 5e25b64004 提交按钮对齐 2015-08-29 14:08:38 +08:00
sw 4ade77f3d0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-29 12:04:57 +08:00
sw e455f93ee1 上传图片；浏览图片按钮 2015-08-29 12:04:35 +08:00
suntao 977f81e031 关注和取消关注，导航圆角 2015-08-29 11:41:12 +08:00