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

5779 Commits

Author SHA1 Message Date
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 70f80bb36f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-02 19:36:29 +08:00
huang 7d6d349c4d 讨论区鼠标经过显示html代码 2015-09-02 19:35:51 +08:00
lizanle b4ae611718 贴吧交流url 2015-09-02 19:14:13 +08:00
sw c2bfbfecee 编辑作业按钮隐藏 2015-09-02 19:11:34 +08:00
huang 8b9eabd027 迁移文件中添加打印收据 
添加未读消息样式
 2015-09-02 18:35:12 +08:00
sw 2e51d0e833 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-02 18:17:34 +08:00
cxt 69cba79926 修改动态的显示时间 2015-09-02 18:18:08 +08:00
sw 6af0d8f40c 屏蔽课程内发布作业功能，频闭编辑作业功能 2015-09-02 18:06:05 +08:00
huang 86405b8a3c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-02 18:02:16 +08:00
suntao b24909df8f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-02 17:41:32 +08:00
suntao 1fff00bab0 回复模块改动 2015-09-02 17:41:19 +08:00
sw 45c54dabad 课程内创建作业代码还原 2015-09-02 17:04:01 +08:00
sw e360ea0bc7 回复框高度为50px 2015-09-02 16:34:03 +08:00
huang fcb9978a05 消息鼠标经过时显示html内容 2015-09-02 16:21:47 +08:00
sw c8eb7804df 增加发布时间和发送课程的js验证 2015-09-02 16:12:33 +08:00
sw 9df301b4cc 取消无用参数 2015-09-02 14:37:58 +08:00
sw 917442c0e7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/users/_user_homework_list.html.erb
 2015-09-02 14:37:46 +08:00
sw 05739931f3 作业列表点击加载更多 2015-09-02 14:34:32 +08:00
cxt 9f494bc14a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-02 14:35:03 +08:00
cxt 70c2f7de1b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/users/_user_activities.html.erb
 2015-09-02 14:34:51 +08:00
huang a05a3074dd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-02 14:34:10 +08:00
huang a94d5928d4 Merge branch 'szzh' into dev_hjq 2015-09-02 14:32:46 +08:00
cxt 63f52ea9bb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-02 14:31:59 +08:00
cxt 3208574a5e 作业和首页的加载更多传递page参数 2015-09-02 14:31:46 +08:00
sw 594faabcbe Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-02 14:27:43 +08:00
suntao c2dbd9449e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/users/user_homeworks.html.erb
 2015-09-02 14:24:11 +08:00
huang fcdf9b3fc1 清理数据 2015-09-02 14:21:50 +08:00
sw 53c57668aa 点击显示更多按钮的显示与隐藏 2015-09-02 14:19:47 +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
sw e55b61cb81 课程留言回复 2015-09-02 14:07:19 +08:00
sw 0935a7eab1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-02 13:46:55 +08:00
sw 8acc432f91 项目讨论区回复刷新 2015-09-02 13:46:33 +08:00
sw c4da4b6c09 项目缺陷回复刷新 2015-09-02 11:54:52 +08:00
sw 2538797a52 课程论坛回复刷新 2015-09-02 11:51:49 +08:00
sw bbf4478fc0 课程通知回复后不能及时刷新页面 2015-09-02 11:45:52 +08:00
sw 3b153766f6 过滤之后点击展开更多相关BUG 2015-09-02 11:20:21 +08:00
suntao 023bb3d95f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-02 11:15:53 +08:00
sw 9728437953 作业界面样式 2015-09-02 11:02:41 +08:00
suntao 9bbf658fdb 回复框样式调整 2015-09-02 10:51:46 +08:00
sw 6b1e0b1407 Merge branch 'guange_homework' into szzh 2015-09-02 10:42:36 +08:00
guange d5be41eebc merge 2015-09-02 10:41:59 +08:00
guange 45dd48069e submit不能提交的问题 2015-09-02 10:40:28 +08:00
guange ccc4d94212 修复合并出错问题 2015-09-02 10:27:10 +08:00
sw e42b6d65db 导入作业之后显示所有的作业信息 2015-09-02 10:25:22 +08:00
sw b0060fc03b 请选择发送的课程选择 2015-09-02 10:13:41 +08:00
ouyangxuhua 2fc337cb07 修改已读和未读消息样式 2015-09-02 09:25:34 +08:00
suntao f036b322b9 忘记密码页面提示位置调整 2015-09-02 09:05:52 +08:00
suntao e3b0eae427 作业界面展开更多间距 2015-09-01 17:38:42 +08:00
huang e89fbd2c8e 过滤条件改为同种类型过滤 2015-09-01 17:37:43 +08:00
suntao a7ba6b5da2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-01 17:32:00 +08:00
suntao 7276b5685e 表情框按钮间距调整 2015-09-01 17:31:44 +08:00
sw dd3fe5915e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
9e7323539f923b5387b9ec9239b5aeb, reversing
changes made to da9c374ed9.

Conflicts:
	app/views/users/_user_homework_form.html.erb
 2015-09-01 17:24:17 +08:00
cxt 77349fc111 点击新建课程/项目时显示提示信息 2015-09-01 17:24:35 +08:00
cxt 80b97c5692 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-01 17:09:01 +08:00
cxt 21cb59a7ae 点击发布作业的取消按钮时收起输入框 2015-09-01 17:08:52 +08:00
lizanle a8652cbe43 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-01 17:04:33 +08:00
lizanle 262f013b51 发送资源到项目课程 名称要显示完全 2015-09-01 17:04:26 +08:00
cxt 7aef734113 点击发布作业的取消按钮时还原截止日期和课程列表下拉框的默认值 2015-09-01 16:59:54 +08:00
sw d0743e4dbf 缺陷显示界面描述增加html_safe 2015-09-01 16:48:56 +08:00
cxt de1708b8df 选择框默认显示文字类似于“请选择发布作业的课程”，点击即弹出供选择的课程列表，课程名称后还需要显示开课学期 2015-09-01 16:41:49 +08:00
cxt d845b8373a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-01 16:37:53 +08:00
cxt 21565b74fe 冲突 2015-09-01 16:37:43 +08:00
guange fcd7506181 修正一个样式 2015-09-01 16:33:29 +08:00
sw e4559dce78 作业列表样式调整，作业列表取消自动加载，增加加载更多按钮 2015-09-01 16:30:39 +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
cxt 735c374f73 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/users/_user_activities.html.erb
 2015-09-01 16:23:44 +08:00
sw 5b073c5289 Merge branch 'guange_homework' into szzh 2015-09-01 16:21:35 +08:00
sw da9c374ed9 111 2015-09-01 16:21:00 +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
sw c01b71739a 增加加载更多按钮 2015-09-01 16:01:00 +08:00
cxt d4dfd97b97 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-01 15:45:49 +08:00
cxt d0c4bb9470 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/users/_user_homework_form.html.erb
 2015-09-01 15:45:36 +08:00
sw eff6d6cafe Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-01 15:39:20 +08:00
sw edb7173d83 加入课程、新建课程、新建项目按钮样式 2015-09-01 15:39:02 +08:00
lizanle 4a1b2fbbd6 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-01 15:34:31 +08:00
lizanle b2eb846a23 关于我们 
隐藏招聘信息
联系我们改为服务协议
 2015-09-01 15:34:22 +08:00
cxt 756d703b5a 选择框默认显示文字类似于“请选择发布作业的课程”，点击即弹出供选择的课程列表，课程名称后还需要显示开课学期 2015-09-01 15:34:08 +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 8b9ee2260a Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-09-01 15:24:51 +08:00
sw 0994ae9f07 项目讨论区回复功能 2015-09-01 15:24:37 +08:00
huang fede611fea 鼠标经过显示内容效果 
公共贴吧数据迁移
 2015-09-01 15:23:30 +08:00
sw 00a8dc94c3 缺陷的回复功能 2015-09-01 15:17:40 +08:00
lizanle a5e39a1049 Merge remote-tracking branch 'origin/szzh' into szzh 2015-09-01 15:03:36 +08:00
lizanle 7223e6c91c 引用发送资源时刷新资源列表和统计 2015-09-01 15:03:24 +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
cxt a008d9d834 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-01 14:37:59 +08:00
cxt 8a286bb8a8 去掉截止日期的标签 2015-09-01 14:37:46 +08:00
suntao ae3f56c758 提交作业界面对齐 2015-09-01 14:37:34 +08:00
sw b1de662338 讨论区回复功能，修改引用样式 2015-09-01 14:18:44 +08:00
lizanle a78128f5ac 搜不到资源的时候 改为没有数据可以展示 2015-09-01 14:11:04 +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 62360175d1 课程通知回复时，所有回复框都会提交 2015-09-01 11:25:52 +08:00