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

5992 Commits

Author SHA1 Message Date
cxt 0a2bfa1bdb 个人主页动态的缺陷回复与缺陷页面的回复内容不一致 2015-09-15 16:27:53 +08:00
sw cd96fd99a8 快速创建项目 2015-09-15 16:11:55 +08:00
cxt 5ccace15da Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-15 15:45:29 +08:00
cxt 069c1ddf3c 课程通知页面的评论提示 2015-09-15 15:45:16 +08:00
sw f79b2cda94 提交作品关联项目功能 2015-09-15 15:18:33 +08:00
sw fff9c44271 学生没有课程和项目时，课程和项目导航有2条线 2015-09-15 15:16:49 +08:00
lizanle 1b9bde2284 课程资源的标签库可点击更改 2015-09-15 10:33:05 +08:00
lizanle 71c0bd9b43 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-15 10:32:11 +08:00
lizanle 1ae302621f 课程资源的标签库可点击更改 2015-09-15 10:31:59 +08:00
cxt e10e5e8412 调整课程通知页面的回复头像样式 2015-09-15 09:50:57 +08:00
cxt a999897efa 动态回复头像的调整 2015-09-15 09:22:18 +08:00
cxt d0c19124b7 将课程的“私有”标志改成不可点击 2015-09-14 17:29:00 +08:00
ouyangxuhua 9ba0d3293e 修改系统消息提示样式 2015-09-14 16:05:29 +08:00
huang 4a7d3c9072 系统消息增加长度 2015-09-14 15:33:11 +08:00
sw 4a9fd15bfd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-11 18:12:02 +08:00
sw 8f3889e2c5 编程作品提交框自动增高 2015-09-11 18:03:37 +08:00
sw 1673f4f960 1、老师打开编程作品报错 
2、隐藏开启匿评按钮
 2015-09-11 17:52:37 +08:00
huang 169c7f3a97 修改消息判断作业重复 2015-09-11 17:48:14 +08:00
sw da269ef716 发布作业，请先输入作业标题 2015-09-11 17:27:07 +08:00
huang 0233c9b14b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-11 17:19:40 +08:00
huang 0d595c5feb 修改系统消息提交按钮 2015-09-11 17:19:12 +08:00
sw 4ee4bb6e9d 编辑作业 2015-09-11 17:07:30 +08:00
sw b31104007a Merge branch 'szzh' into develop 2015-09-11 16:59:10 +08:00
sw ecf2ac5e19 课程内发布作业增加提示 2015-09-11 16:57:49 +08:00
cxt dbdd68f45d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2015-09-11 16:43:59 +08:00
huang 27fde3f642 Merge branch 'szzh' into dev_hjq 2015-09-11 16:37:50 +08:00
huang dc564c37f1 修改系统消息参数 
输入内容JS控制
 2015-09-11 16:36:10 +08:00
sw a3d628dc17 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-11 16:29:55 +08:00
sw 760b70971a 取消导入编程作业时对homework_type的赋值 2015-09-11 16:27:34 +08:00
sw 90a52aa01b 导入编程作业后、测试集数量不显示的问题 2015-09-11 16:26:35 +08:00
sw 37f235c2ab 导入编程作业 2015-09-11 16:22:35 +08:00
ouyangxuhua b053a1e43c Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 
Conflicts:
	app/models/system_message.rb
	app/views/admin/messages.html.erb

处理冲突、发布系统消息JS提醒！
 2015-09-11 16:11:34 +08:00
ouyangxuhua 67dcb025aa 系统消息-修改 2015-09-11 16:05:02 +08:00
huang 3da6593720 查看别人的页面时不显示“全部设为已读” 2015-09-11 15:55:51 +08:00
huang 4d4b48ef99 Merge branch 'szzh' into dev_hjq 
Conflicts:
	db/schema.rb
 2015-09-11 15:50:10 +08:00
huang 6209250e6d 内容长度提醒 2015-09-11 15:45:25 +08:00
huang 8c0f9d24f8 系统消息没保存成功添加验证 
系统消息样式修改
 2015-09-11 15:39:46 +08:00
sw 4405a31c9c Merge branch 'guange_homework' into szzh 2015-09-11 15:07:59 +08:00
guange e9f9dd44b9 编程作业的修改功能搞定 2015-09-11 14:59:30 +08:00
huang 64bce0261d Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-11 14:54:18 +08:00
huang 3bfdff81ba 去掉项目组织 2015-09-11 14:53:42 +08:00
lizanle dc32bba5fd Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-11 14:44:59 +08:00
lizanle 17b4b31449 隐藏个人中心的回复 textarea编辑框 2015-09-11 14:44:50 +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 487f46bb32 上传图片后大小问题 2015-09-11 11:46:12 +08:00
cxt 7d6b9005a4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-11 11:41:45 +08:00
cxt 2da3454bc5 暂时屏蔽课程复制功能 2015-09-11 11:41:31 +08:00
huang f1e0eed5a8 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-11 11:03:14 +08:00
sw f4c19c0fb0 1、homework.js on改为live 
2、导入作业之后，编程功能按钮消失
 2015-09-11 10:50:16 +08:00
sw 527ff41d43 1、编程作业开启匿评之后提交作品的提示 
2、匿评弹框不可关闭
 2015-09-11 10:44:10 +08:00
sw dfed4885de 新建作业，取消之后编程设置按钮消失 2015-09-11 10:36:16 +08:00
ouyangxuhua 36e9c20e59 系统消息 2015-09-11 10:30:01 +08:00
sw 30ebe9b2d5 1、编程作业可以开启匿评 
2、取消扣分标准的显示
 2015-09-11 09:59:34 +08:00
huang 08c222266a Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-11 09:54:10 +08:00
huang 4ea20b707c 定义消息标题类型方法 2015-09-11 09:53:18 +08:00
ouyangxuhua 9e61ceefa9 系统消息修改 2015-09-11 09:48:16 +08:00
sw a94521f2e1 编辑普通作业功能完成 2015-09-11 09:36:44 +08:00
sw 948a6c9138 隐藏教师节相关信息 2015-09-11 09:20:43 +08:00
sw 6730c4da84 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-11 09:17:08 +08:00
sw 66636efda9 修改普通作业 2015-09-11 09:15:54 +08:00
lizanle 2beb85561a 上传资源后，全选按钮和已选择资源数清空 2015-09-11 09:08:05 +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
ouyangxuhua 06fea1bf1d 系统消息显示 2015-09-10 15:47:51 +08:00
lizanle cc6fe754d4 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-10 15:45:46 +08:00
lizanle 756aae0cf2 发布issue编辑器可以上传代码并高亮显示了 2015-09-10 15:45:08 +08:00
cxt e6d5d17859 轻抚展开更多->展开更多 2015-09-10 15:08:10 +08:00
cxt 5f0aac9265 点击打开编辑资料，显示保存的性别 2015-09-10 15:01:59 +08:00
sw fce5405c41 发布作业界面样式调整 2015-09-10 14:44:25 +08:00
ouyangxuhua fb155c8458 系统消息注释 2015-09-10 11:42:53 +08:00
ouyangxuhua 596c512d0a 系统消息 2015-09-10 11:39:53 +08:00
sw 1d9fda7eeb Merge branch 'guange_homework' into develop 2015-09-10 11:32:15 +08:00
sw 8d415b0856 取消作业列表的编辑按钮 2015-09-10 10:51:53 +08:00
sw 97a944ff27 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-10 10:28:55 +08:00
sw 97f9d4fa60 增加教师节祝福语 2015-09-10 10:26:16 +08:00
cxt 50aa22c5e5 个人动态的“点击展开更多”改为“轻抚展开更多”，鼠标移到方框上即自动加载更多动态 2015-09-10 10:01:43 +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
ouyangxuhua 3db692dc39 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-09 17:42:55 +08:00
huang 0aa8c5b5cc 完成系统消息通知功能 2015-09-09 17:43:33 +08:00
ouyangxuhua 1feb7022c7 修改系统消息为kindeditor 2015-09-09 17:42:38 +08:00
huang 66251c8d30 添加功能：管理员界面发送系统消息 2015-09-09 17:05:32 +08:00
sw 1bf90739be 调整从资源库选择资源到作业、作品中弹框的初始位置 2015-09-09 17:00:11 +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 adcd3b1ad5 去掉无用加载的js 2015-09-09 16:54:08 +08:00
sw 401b0bc7e3 textarea自动拉伸高度优化，编辑普通作业作品功能完成 2015-09-09 16:50:46 +08:00
sw b1463f0864 学生提交匿评作业作品功能实现 2015-09-09 16:10:11 +08:00
lizanle 4b1153d0a5 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-09 11:28:40 +08:00
lizanle 1dd4700eb2 个人中心留言功能 编辑框自适应高度 2015-09-09 11:28:28 +08:00
cxt 7474d19120 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-09 11:23:37 +08:00
cxt 040f3f588d 鼠标移到头像上方，才显示账户下拉菜单 2015-09-09 11:23:23 +08:00
lizanle 95f66a304c 通过 kindeditor_tag f.kindeditor生产的编辑框可以自动长高缩短 
课程模块的通知，讨论区，留言都可以自动的长高，缩短
 2015-09-09 10:55:32 +08:00
huang 1a6f81f302 用户申请，区分已读和未读 2015-09-09 10:15:05 +08:00
sw e040c20f08 admin界面，最后登录的用户列表报错 2015-09-09 09:36:44 +08:00
lizanle 169c56a58d Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-09 09:22:08 +08:00
lizanle 3b9d1d6200 讨论区编辑框可以自动长高缩短 2015-09-09 09:22:01 +08:00
huang 51d964d371 点击消息链接定位到对应页面的某一点 2015-09-08 17:26:10 +08:00
huang 06753497bb Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-08 16:56:36 +08:00
huang 0746408a9d 增加用户申请加入项目消息提醒功能（管理员收到消息提醒） 2015-09-08 16:55:36 +08:00
sw 2e59584031 作业编辑功能按钮、加入课程、项目等按钮样式 2015-09-08 16:36:50 +08:00
sw 137a0b16a0 1、文件的样式图片 
2、点击编程弹框时，测试输入获取焦点
 2015-09-08 15:40:25 +08:00
ouyangxuhua bff50aa769 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-08 15:28:15 +08:00
ouyangxuhua d01a529040 项目消息标题判断 2015-09-08 15:27:58 +08:00
guange 52c2719a46 去掉老式的编程作业提交 2015-09-08 14:48:02 +08:00
cxt 6f64152ec7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-08 11:56:04 +08:00
cxt cdca8dea4d 去掉缺陷描述的图片点击显示大图后的蓝色边框 2015-09-08 11:55:52 +08:00
lizanle 23e60bf007 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-08 11:18:10 +08:00
lizanle de822daf44 个人动态编辑框高度自动变高缩短 
其他编辑框自动长高缩短
 2015-09-08 11:18:02 +08:00
sw e4209007b1 Merge branch 'guange_homework' into szzh 2015-09-08 10:28:21 +08:00
huang 8d72a9a539 去掉项目base冗余代码 2015-09-08 09:22:15 +08:00
guange 9e9f373a76 发布作业优化 2015-09-07 23:09:19 +08:00
guange 04dffb2f89 模拟回答界面调整 2015-09-07 18:29:25 +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
huang 0a45e08488 1、消息为0的时候不显示 消息数和“全部设置已读”。 
2、消息不为空，未读消息为空的时候不显示“全部设为已读”
 2015-09-07 16:14:34 +08:00
huang 402c0b5173 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-07 16:08:51 +08:00
huang 103d61056d 完成功能： 
1、添加“新的消息”分类
2、新注册用户默认点击时间
 2015-09-07 16:08:04 +08:00
lizanle e8c5627c41 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-07 16:01:33 +08:00
lizanle 6bcaf01fe2 课程弹出框样式不对 2015-09-07 16:01:19 +08:00
cxt 4e1169a021 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-07 15:30:24 +08:00
cxt 61281af497 管理员页面的最近登录用户列表的登录时间精确到分秒 2015-09-07 15:30:11 +08:00
ouyangxuhua 8c66adec1b Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-07 15:24:10 +08:00
ouyangxuhua ef011ad473 项目--邀请--发送邮件邀请用户,对输入的邮箱名进行判断，同时，修改提示样式 2015-09-07 15:23:34 +08:00
ouyangxuhua 5569dacc6c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-07 15:20:37 +08:00
ouyangxuhua a159af8139 项目--邀请--发送邮件邀请用户对输入的邮箱进行判断，同时修改提示样式 2015-09-07 15:20:18 +08:00
cxt aa0c0dab83 添加“我的动态” 2015-09-07 15:01:08 +08:00
guange 53cea36329 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-06 22:59:40 +08:00
guange 216bc7f70f 动态中作业的提交状态修改 2015-09-06 22:59:27 +08:00
cxt 0dc47279de Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-06 17:47:50 +08:00
cxt 7a28a65807 问卷动态不显示的缺陷修复 2015-09-06 17:40:55 +08:00
huang b771cc0fe1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-06 17:03:48 +08:00
sw abf053fc99 Merge branch 'develop' into szzh 2015-09-06 16:51:33 +08:00
huang b89218a1b3 消息列表添加未读消息统计和“全部设为已读”功能 
个人留言添加登录验证功能
 2015-09-06 16:50:03 +08:00
sw e0376b5176 tag的导航栏和底部导航栏修改 2015-09-06 16:46:03 +08:00
sw 9f8fee8267 个人积分报500 2015-09-06 15:46:28 +08:00
cxt 8ecf70588d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-06 15:31:37 +08:00
cxt 55758c3c2f 筛选掉未发布的问卷动态 2015-09-06 15:31:26 +08:00
lizanle baf3d90836 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-06 15:19:11 +08:00
lizanle 704337fe56 全选所有资源，然后再用关键字过滤，全选checkbox和选择资源的个数应该清空 2015-09-06 15:16:32 +08:00
cxt d274b675db 去掉动态中的“缺陷描述”、“通知描述”等文字 2015-09-06 10:07:18 +08:00
lizanle 9caa7a421a Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-06 09:05:37 +08:00
lizanle f8c85ccb83 个人动态页面 回复框固定高度减少 2015-09-06 09:05:24 +08:00
guange 921d2fc422 erge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-03 16:59:24 +08:00
guange 6063f39eac 修改作业的一些链接和跳转问题 2015-09-03 16:58:38 +08:00
huang f1431b27fc Merge branch 'develop' into szzh 
Conflicts:
	app/views/users/user_messages.html.erb
 2015-09-03 16:28:49 +08:00