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

1416 Commits

Author SHA1 Message Date
huang dc90976497 项目资源库添加 “发送”功能 2016-01-08 17:09:32 +08:00
ouyangxuhua b2bad60b38 1.修改用户留言页面的宽度；2.编辑博客首页转到博客首页 2016-01-08 16:16:57 +08:00
cxt a0afe6ccbf 动态显示附件并统一附件样式 2016-01-08 16:05:36 +08:00
cxt 7d663ce66f 动态内容统一高度 2016-01-08 14:53:12 +08:00
ouyangxuhua 66bf50098a 增加组织/个人屏蔽项目/课程动态功能 2016-01-08 14:12:55 +08:00
ouyangxuhua 9e286ef8a5 对于当前用户，鼠标经过该用户头像显示详细信息时，有编辑资料按钮 2016-01-08 10:11:47 +08:00
ouyangxuhua 178f9e167c 1.申请子域名时，对子域名进行规范，仅能输入字母、数字和下划线； 
2.博客主页，添加取消主页按钮；
3.私信只能发送者和接收者能看到
 2016-01-08 09:41:56 +08:00
cxt 5e0ee0426a 作业动态的附件放在扣分上面 2016-01-07 17:23:32 +08:00
ouyangxuhua e763a7a8ca 课程/项目/组织动态，鼠标经过显示详细信息，并且可以留言、私信等 2016-01-07 15:58:22 +08:00
cxt 1263e4cac0 关联项目的样式修改 2016-01-07 15:33:21 +08:00
ouyangxuhua 80668d6a47 增加以下功能： 
鼠标经过用户头像时，显示用户的详细信息，并且可以添加/取消关注，可以私信/留言。
 2016-01-07 10:10:24 +08:00
ouyangxuhua eacf89100d Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/controllers/organizations_controller.rb
	config/routes.rb
	db/schema.rb
	public/images/hwork_icon.png
	public/stylesheets/new_user.css
	public/stylesheets/public.css
 2016-01-06 16:27:42 +08:00
ouyangxuhua 7d4e3cdd5c 1.增加项目/课程快捷功能； 
2.增加私信功能
 2016-01-06 16:22:13 +08:00
Tim e9d986b311 课程关联项目样式调整 2016-01-06 11:01:00 +08:00
cxt cf125159f2 关联项目增加提交次数 2016-01-06 10:36:53 +08:00
cxt 244e133803 关联项目的对齐 2016-01-06 09:57:54 +08:00
huang 0a1aa9e569 Merge branch 'develop' into hjq_new_course 
Conflicts:
	db/schema.rb
	public/stylesheets/public.css
 2016-01-06 09:27:00 +08:00
huang 7ee4ff69b3 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	public/stylesheets/new_user.css
	public/stylesheets/public.css
 2016-01-05 17:03:10 +08:00
ouyangxuhua d8c6775f42 1.解决“组织动态中的作业动态，评分设置弹框不能关闭 ”的问题； 
2.组织申请子域名功能。
 2016-01-05 16:46:06 +08:00
huang be218baa52 添加迁移：项目讨论区数据重复问题 2016-01-05 15:59:13 +08:00
cxt 0a2d2a539f 关联项目的组长名字加个title 2016-01-05 15:46:41 +08:00
cxt f52dc37a76 作业动态添加作品评阅和作品提交消息 2016-01-05 11:29:30 +08:00
huang 9e87e63b82 系统消息去掉附件 2016-01-04 10:36:27 +08:00
huang 3394af7ad5 Merge branch 'develop' into hjq_new_course 2016-01-04 10:29:13 +08:00
cxt 6b5341805e Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-31 17:54:04 +08:00
cxt f0216cf604 Merge branch 'cxt_course' into szzh 2015-12-31 17:53:52 +08:00
cxt 3dac8d2944 课程/项目帖子的编辑/删除跳转 所有用户都有发送帖子的权限 2015-12-31 17:53:05 +08:00
huang 0541294c33 为解决完： 
1、user_message_system附件显示问题
2、issue回复添加附件问题
 2015-12-31 17:08:27 +08:00
lizanle a82fef3ea2 资源库新上传资源不能被删除 2015-12-31 16:08:46 +08:00
lizanle d26b51c982 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/controllers/organizations_controller.rb
	db/schema.rb
 2015-12-31 15:44:57 +08:00
cxt 7e76a32480 项目/课程讨论区的动态增加设置菜单 2015-12-31 15:36:42 +08:00
lizanle 2c7ef034cb 资源库更改 2015-12-31 12:27:31 +08:00
cxt 2c5a4f8a13 发布和编辑作业时的启用匿评改为禁用匿评，默认不选中 2015-12-31 11:36:21 +08:00
lizanle be146a9421 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/controllers/organizations_controller.rb
	db/schema.rb
	public/stylesheets/courses.css
	public/stylesheets/public.css
 2015-12-31 11:11:38 +08:00
lizanle a85a3339bb 文件的删除限制加大 
如果文件有了历史版本 数据记录不能被删除
如果文件被发送过，或者有了历史版本，硬盘上的文件和数据记录就不能被删除
 2015-12-30 18:24:07 +08:00
lizanle fd4d2910d0 课程发送资源 以及 项目发送资源 2015-12-30 10:00:45 +08:00
lizanle 1d0e6e1c5c 课程发送资源 以及 项目发送资源 2015-12-30 09:37:16 +08:00
huang 743950d264 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2015-12-29 18:13:15 +08:00
lizanle 659f322ca2 send resource to org 2015-12-29 17:58:36 +08:00
lizanle c425106d0b 目标地址样式修改 2015-12-29 17:26:45 +08:00
lizanle abb19422ff 发送资源到组织功能。同时个人资源库也要添加这个功能 2015-12-29 17:13:01 +08:00
cxt c3ddbcfddf Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2015-12-29 16:33:32 +08:00
huang 41cd038758 讨论区帖子添加锁定 2015-12-29 15:05:07 +08:00
cxt 000f40ad42 作业动态的截止时间根据作业当前所处状态来确定是提交截止时间还是匿评截止时间 2015-12-29 10:59:26 +08:00
ouyangxuhua 2076c9b449 Merge branch 'develop' into dev_hjq 
Conflicts:
	app/controllers/organizations_controller.rb
	app/views/layouts/_footer.html.erb
	app/views/layouts/base_org.html.erb
	app/views/organizations/_org_activities.html.erb
	db/schema.rb
	public/stylesheets/new_user.css
	public/stylesheets/org.css
	public/stylesheets/public.css
 2015-12-28 15:32:03 +08:00
huang ce740170ca Merge branch 'hjq_new_course' into szzh 
Conflicts:
	public/stylesheets/public.css

处理冲突
 2015-12-25 18:05:36 +08:00
huang cd36a6874e 修改issue动态错位 2015-12-25 18:03:32 +08:00
cxt 7f133c860a 发布和编辑作业时可设置是否启用匿评 2015-12-25 15:57:30 +08:00
cxt b8d8cece02 关联项目的样式修改 2015-12-25 14:56:08 +08:00
cxt ce5f0eb855 关联项目的样式修改 2015-12-25 11:00:41 +08:00
Tim b0b4527ea1 Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq 
Conflicts:
	public/stylesheets/org.css
 2015-12-24 10:40:00 +08:00
cxt 24542105f4 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2015-12-24 09:57:47 +08:00
ouyangxuhua 9e0b88c186 项目讨论区样式改成方块样式 2015-12-24 09:46:18 +08:00
Tim c405950469 课程关联项目列表显示调整 2015-12-23 17:26:13 +08:00
cxt 1623d846f4 动态的展开更多改成点击展开更多 2015-12-22 15:14:03 +08:00
cxt 65022f03cb 作业动态中的评分设置和匿评自动开启、关闭时间的自动刷新 2015-12-18 21:34:31 +08:00
cxt e7db03f271 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 19:49:42 +08:00
guange e9a45012f8 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 19:47:21 +08:00
guange 08cd3808ad ke引用错误 2015-12-18 19:47:06 +08:00
cxt 6a563d4256 匿评结束后不可修改作业的截止日期，作业发布后不可修改作业的发布日期 2015-12-18 18:47:36 +08:00
lizanle a1d0bf43ee Merge remote-tracking branch 'origin/szzh' into szzh 2015-12-18 17:55:21 +08:00
lizanle 009dc089f0 资源库重命名修改 2015-12-18 17:55:15 +08:00
huang ea51b24a4e Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 17:06:00 +08:00
cxt 63f9601c15 Merge branch 'cxt_course' into szzh 2015-12-18 16:27:31 +08:00
cxt 7ce8e330c3 课程留言动态的显示 2015-12-18 16:21:27 +08:00
huang a080306f75 解决课程动态中，点击按钮，提交多次的问题 2015-12-18 16:05:39 +08:00
cxt 2eaa05306f Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	app/views/boards/_course_show.html.erb
 2015-12-18 15:08:38 +08:00
cxt ba4c93e4c4 Merge branch 'cxt_course' into szzh 2015-12-18 15:03:24 +08:00
lizanle 70f93741d6 issue图标问题 2015-12-18 14:38:04 +08:00
cxt ca77af9221 作业动态添加扣分规则 2015-12-18 13:13:23 +08:00
cxt 2faddd7d75 分组设置中的基于项目实施默认勾选 2015-12-18 10:00:26 +08:00
guange eb97f7dfb2 merge 2015-12-18 09:20:51 +08:00
cxt 0ed58d4898 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-17 19:07:17 +08:00
lizanle 5f8c04e3a0 Merge branch 'szzh' into dev_zanle 2015-12-17 18:17:38 +08:00
guange fc63dfcb7b 消息通知 2015-12-17 15:14:52 +08:00
cxt 89d3d3821c 分组作业的导入 2015-12-17 10:38:14 +08:00
cxt 51e082a551 编辑和新建作品时的样式和提示信息调整 2015-12-17 10:17:13 +08:00
cxt fa0f9c6751 分组作业的编辑，若分组作业已提交了作品则不可再编辑分组设置 2015-12-17 10:16:29 +08:00
cxt ff579afd45 作业动态中添加分组人数 2015-12-17 09:27:51 +08:00
cxt a8c8dc3cc6 关联项目的提示信息修改 2015-12-16 17:38:28 +08:00
guange c0de5d55de 加入了issue的at消息提醒 2015-12-16 16:37:00 +08:00
cxt dc0f004021 关联项目的提示信息 2015-12-16 15:47:30 +08:00
cxt 5cf88a287b 分组作业提示语的修改 2015-12-16 11:37:59 +08:00
cxt 72c475e8a2 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-15 16:03:26 +08:00
Tim b687c42de3 Merge branch 'dev_zanle' of https://git.trustie.net/jacknudt/trustieforge into dev_zanle 2015-12-15 15:01:21 +08:00
Tim b761121f9f "指派给"颜色更换 2015-12-15 15:00:24 +08:00
guange 4f57e48b92 merge 2015-12-14 18:20:32 +08:00
guange d1315e35b5 merge 2015-12-14 17:26:40 +08:00
guange f61f639af2 转换为remote js 2015-12-14 17:13:57 +08:00
cxt 438ae82980 非课程学生不能关联项目 2015-12-14 17:02:44 +08:00
cxt eb8e9f32a3 作品列表的私有项目不可点击 2015-12-14 10:06:19 +08:00
cxt dfd0c95f2a Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-11 18:11:48 +08:00
cxt 1d2b6165ef 分组作业报500 2015-12-11 18:00:55 +08:00
lizanle b178fb7f0a 消息提醒 病句 2015-12-11 15:56:37 +08:00
cxt bb2f49439e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2015-12-11 15:00:35 +08:00
cxt a3715051b1 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-11 14:59:13 +08:00
cxt f880ccd749 分组作业 2015-12-11 14:57:09 +08:00
huang f2b8335912 移出成员时，删除项目后没有关联删除而引起的400问题 2015-12-11 13:48:52 +08:00
huang fed989753a 修复林处账号不能查看消息的问题 2015-12-11 13:46:23 +08:00
huang fbd1b2f541 用户留言重复提交问题 2015-12-11 10:53:14 +08:00
cxt 4e04df7a8a 分组作业的动态显示及关联项目 2015-12-09 16:33:48 +08:00
cxt 53f9141cf1 分组作业动态 2015-12-09 10:29:54 +08:00
cxt a9f6e817b4 分组作业关联项目 2015-12-08 17:37:15 +08:00
lizanle 92bc3361fe 匿评失败消息改变 2015-12-08 15:33:17 +08:00
lizanle 5fcbde2ff1 资源库监听回车键 2015-12-07 17:29:14 +08:00
lizanle ee661bb6d4 input光光标到最后的折中解决方案 2015-12-07 16:21:00 +08:00
lizanle 9e01f02a66 作业题目统一改为作业标题 
作业匿评截止消息改造
 2015-12-07 15:52:22 +08:00
lizanle ad2d9fa374 添加对帖子的全文搜索 2015-12-07 15:32:57 +08:00
cxt cb7ad682cf Merge branch 'develop' into cxt_course 2015-12-07 15:21:43 +08:00
cxt 8e999ed9f0 作业动态的回复删除功能只在鼠标进入时显示 2015-12-07 15:18:32 +08:00
cxt 73e9a00a1a 作业动态添加回复的删除功能 2015-12-07 11:25:41 +08:00
cxt a62ecc10ad 作业动态设置评分后无法刷新 2015-12-07 10:54:18 +08:00
cxt b61a0a98e5 Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/student_work/new.html.erb
	app/views/users/_user_homework_form.html.erb
	db/schema.rb
	public/stylesheets/courses.css
 2015-12-07 09:47:18 +08:00
guange 3d2ac4b59f KE引用统一使用import_ke 2015-12-06 15:03:36 +08:00
lizanle dbfc4969e0 测验消息bug 2015-12-04 15:36:19 +08:00
lizanle e3c594a7ca Merge branch 'develop' into dev_zanle 2015-12-04 10:59:14 +08:00
lizanle 6553559929 发送消息 2015-12-04 10:56:16 +08:00
cxt 77e96af78f 还原分组作业 2015-12-03 10:41:27 +08:00
cxt 9c4c90e066 Merge branch 'develop' into cxt_course 2015-12-03 09:55:18 +08:00
cxt f90ff781ab 学生提交作品页面的合作成员弹窗 2015-12-03 09:17:36 +08:00
lizanle adb246f9ad 注释标记 错误 
<!-- -->
 2015-12-02 15:30:07 +08:00
lizanle 9fe5cfbf76 资源发送课程发送项目自动搜索 2015-12-02 14:38:41 +08:00
lizanle 2f0895c2c2 发送资源成功给出提示 
发送资源默认为发送课程
 2015-12-02 13:40:53 +08:00
cxt ae218fa86c 发布作业时添加分组作业 2015-12-02 11:14:46 +08:00
lizanle 304cc078a7 去掉警示的感叹号 2015-12-01 15:30:47 +08:00
lizanle 1c3bff0007 资源库的删除bug 
和右键菜单的bug
和变背景色的bug
 2015-11-30 10:39:50 +08:00
lizanle cb910b8d4a 系统消息添加logo 2015-11-27 17:02:37 +08:00
Tim 64d4789150 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/users/user_organizations.html.erb
 2015-11-24 15:06:19 +08:00
Tim 269d2f992e 组织列表搜索框调整后注释 2015-11-24 15:02:25 +08:00
ouyangxuhua 68bb142278 解决组织bug:动态过滤，点击“展开更多”，有通知等其他动态 2015-11-23 17:29:55 +08:00
ouyangxuhua d2a87127da 我的组织搜索功能显示 2015-11-23 09:32:03 +08:00
Tim 1aa7599771 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-20 14:31:10 +08:00
Tim e3d78bf4f0 组织样式更改 2015-11-20 14:30:54 +08:00
ouyangxuhua 0c891236a8 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/projects/settings/_join_org.html.erb
 2015-11-19 10:44:30 +08:00
ouyangxuhua 8e359c3d94 隐藏我的组织的搜索功能 2015-11-18 17:27:29 +08:00
lizanle 7ad2e657eb 提示信息去掉感叹号 2015-11-17 10:34:59 +08:00
lizanle 1961868e5e Merge remote-tracking branch 'origin/szzh' into szzh 2015-11-17 10:20:05 +08:00
lizanle 6af8bfef37 加入课程的相关系统提示加上logo 2015-11-17 10:19:48 +08:00
ouyangxuhua d220dbbc9a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-16 15:45:18 +08:00
ouyangxuhua de32745eef 1.将项目动态数据迁移至组织动态； 
2.在组织动态中，按时间倒排显示组织动态；
3.增加我的组织中搜索功能。
 2015-11-16 15:02:57 +08:00
cxt c50bcf9331 对于提交已截止的作业，作业状态由“作品提交中”改为“作品补交中” 2015-11-16 10:56:00 +08:00
ouyangxuhua 36b3d0b636 修复火狐浏览器上动态显示文章的bug 2015-11-13 20:22:13 +08:00
cxt 82541cae1c 新建作业时去掉发布日期和截止日期的label 2015-11-13 17:57:32 +08:00
ouyangxuhua 78e1ae4188 Merge branch 'szzh' into dev_hjq 
Conflicts:
	db/schema.rb
 2015-11-13 17:27:33 +08:00
ouyangxuhua 022c656db6 修复项目加入组织的bug 2015-11-13 17:19:17 +08:00
ouyangxuhua 3451ced888 添加我的组织页面及修改bug 2015-11-13 16:34:00 +08:00
lizanle 78ebeaee3b 批量删除提示修改 2015-11-13 15:38:16 +08:00
lizanle 465bc9bd6c 新增和删除的时候数据联动bug 2015-11-13 15:04:50 +08:00
lizanle 28a6e09edd 资源批量删除情况 2015-11-13 14:56:18 +08:00
cxt 2c5cd1a4b3 编辑作业页面添加截止日期和发布日期label 2015-11-12 18:14:56 +08:00