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

1514 Commits

Author SHA1 Message Date
huang fbeb6585d2 去掉初始化输出提示 2015-10-10 16:18:05 +08:00
huang 7c1bb8b9ed Merge branch 'szzh' into gitlab_guange 
Conflicts:
	Gemfile
	app/models/user.rb
	db/schema.rb
	lib/trustie.rb

解决冲突
 2015-10-10 16:09:05 +08:00
huang 530d101024 项目邀请--姓名、长度JS验证 2015-10-09 11:25:21 +08:00
huang 654ebfca46 项目邀请添加：姓、名、性别 2015-10-09 10:33:10 +08:00
huang e054f8045c 去掉Git的中英文说明 
新的提交代码指定入口
 2015-10-08 14:23:32 +08:00
huang 5b0738a4cb 匿评启动失败邮件通知:实现程序及界面 2015-09-29 09:45:41 +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
huang 99473c6880 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/issues/show.html.erb
 2015-09-24 11:46:33 +08:00
huang 4c71e2c256 项目类型提示JS 2015-09-24 11:44:02 +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
huang b94c57691a 项目新建重构 
项目先建添加项目类型
 2015-09-23 17:36:36 +08:00
sw fa13ccfaa8 匿评参数设置功能完成 2015-09-23 15:44:48 +08:00
guange 186bf9070c 配置丢失 2015-09-19 15:21:51 +08:00
huang db1dfa34ac 恢复邮件配置文件 2015-09-19 11:00:00 +08:00
huang 810c0d8fe5 作业开启/关闭匿评邮件通知 2015-09-19 00:03:45 +08:00
lizanle 9443c139f0 update forum 2015-09-18 17:44: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
huang 0fead3b801 1、课程留言发送对象为老师 
2、作业截止时间邮件通知不适用delay_job
3、添加作业截止时间邮件通知界面
 2015-09-18 10:05:26 +08:00
sw 7cc5ce92c6 完成评分比例设置功能 2015-09-17 20:20:20 +08:00
sw 9c20368274 1、系统评分的时候对成绩进行赋值 
2、去掉错误的编程得分计算方法
 2015-09-17 16:53:38 +08:00
huang d00ad2e14d 1、作业截止时间邮件通知 
2、系统消息通知路由、方法定义
 2015-09-17 16:07:41 +08:00
huang 7a014e1f79 解决bug：自动注册用户时，邮箱名过长超过login限制 
解决方法：login长度和邮箱长度同步
 2015-09-17 15:24:12 +08:00
huang b9fc410802 添加系统消息单独新页面 2015-09-17 14:41:03 +08:00
huang 67f7fc7de3 注释掉“邀请系统注册用户”，因为邀请用户中已经包含该功能 2015-09-16 17:35:26 +08:00
huang c9d52571f0 1、项目邀请中添加两种特殊情况的判断。 
2、完成邀请状态列表界面。
3、优化之前的邀请状态逻辑。
 2015-09-16 17:25:06 +08:00
huang 78ca55f121 优化邮件邀请策略 2015-09-16 10:49:34 +08:00
huang b0ccf9037a 邮件邀请： 
1、修改私有项目跳入403问题
2、增加同一个用户反复邀请的邮箱提醒。
3、修改邮箱的发送策略
 2015-09-15 17:39:57 +08:00
huang 295921c89d 邮件：邀请新用户的时候过滤掉邮箱和已注册用户名重叠的问题 2015-09-15 10:50:58 +08:00
lizanle 1ae302621f 课程资源的标签库可点击更改 2015-09-15 10:31:59 +08:00
huang 8c0f9d24f8 系统消息没保存成功添加验证 
系统消息样式修改
 2015-09-11 15:39:46 +08:00
huang cc3990de44 修改发系统消息后跳转路劲 2015-09-11 09:45:28 +08:00
huang 66251c8d30 添加功能：管理员界面发送系统消息 2015-09-09 17:05:32 +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 8ad521d4ab merge 2015-09-01 16:19:48 +08:00
guange 41f9daed6d 编程作业放入到users controller 2015-09-01 16:18:03 +08:00
cxt d4dfd97b97 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-01 15:45:49 +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
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
sw 00a8dc94c3 缺陷的回复功能 2015-09-01 15:17:40 +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
cxt 1e320e63c6 底部导航的论坛反馈改为贴吧交流，帮助中心版权信息的换行修复 2015-09-01 10:20:12 +08:00
guange 8f426ca040 merge 2015-08-29 18:22:33 +08:00
sw a23ec96508 学校首页报404 2015-08-29 10:07:36 +08:00
sw 51bf1cd678 作业搜索支持enter键 2015-08-29 09:53:16 +08:00
guange e8fe397158 added 2015-08-28 17:20:39 +08:00
sw 014881bd42 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/new_user.css
 2015-08-28 17:02:49 +08:00
sw 76ec0d5d48 资源库导入资源到作业静态页面 2015-08-28 16:47:43 +08:00
lizanle 7f9289d6c3 Merge remote-tracking branch 'origin/szzh' into szzh 2015-08-28 15:49:18 +08:00
lizanle 18e2d05f41 重置邮件标题改变 2015-08-28 15:49:02 +08:00
guange 1d8fdbf8f1 可以提交答案 2015-08-28 15:08:07 +08:00
guange 1462ea09f3 测试代码功能完成 2015-08-28 12:04:49 +08:00
sw 2fa03c3102 导入作业功能完成 2015-08-28 11:32:57 +08:00
sw 007a39b5d5 作业列表的过滤查询 2015-08-28 10:00:48 +08:00
sw cb5abc6d74 导入作业弹框 2015-08-27 16:03:41 +08:00
guange b9e08b22cd Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-08-26 20:37:49 +08:00
guange 631283ae79 remove grack 2015-08-26 20:37:43 +08:00
sw b7cbb9b0c2 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	app/controllers/users_controller.rb
	public/stylesheets/new_user.css
 2015-08-26 17:31:37 +08:00
sw 049e27f15f 发布作业功能 2015-08-26 17:29:47 +08:00
huang a54de0c8fb Merge branch 'dev_hjq' into sw_new_course 2015-08-26 16:33:21 +08:00
lizanle ccfd69602c 服务协议 2015-08-26 16:31:28 +08:00
huang b824c3fa46 1、去掉多余的代码 
2、消息样式列表过宽显示跨行问题
 2015-08-26 16:31:28 +08:00
huang bc563119d6 Merge branch 'sw_new_course' into dev_hjq 
Conflicts:
	app/controllers/users_controller.rb
	public/stylesheets/new_user.css
 2015-08-26 15:04:44 +08:00
sw d132c08a11 增加footer 2015-08-25 09:29:19 +08:00
huang 5306d7e2a4 列表排序（未完） 2015-08-24 23:53:28 +08:00
huang 4fd90464d9 Merge branch 'sw_new_course' into dev_hjq 2015-08-24 11:38:50 +08:00
huang e129404b4c 解决图标点两次的问题 2015-08-24 11:11:45 +08:00
sw f6d122e37f Merge branch 'guange_dev' into sw_new_course 2015-08-24 11:04:19 +08:00
sw 111478ec72 Merge branch 'szzh' into sw_new_course 
Conflicts:
	app/controllers/users_controller.rb
	config/routes.rb
 2015-08-24 10:39:52 +08:00
guange 3a601bbd2c Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-08-21 19:23:17 +08:00
sw 2a522f144e 编辑个人简介 2015-08-21 16:29:25 +08:00
lizanle 9138f46301 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/controllers/users_controller.rb
 2015-08-21 14:10:50 +08:00
lizanle 705d31b1d0 资源库 修改 2015-08-20 17:38:30 +08:00
lizanle 76c2c47adf 资源库 2015-08-20 10:14:26 +08:00
lizanle 76be15f79b 资源库 2015-08-18 11:53:54 +08:00
lizanle 25460cd255 资源库 2015-08-18 09:31:03 +08:00
guange d36da76685 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-08-15 19:47:53 +08:00
huang a38e91b3d3 Merge branch 'szzh' into dev_hjq 2015-08-15 17:10:02 +08:00
cxt 58613e843b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2015-08-15 17:09:10 +08:00
cxt da20f6bc89 超级管理员新增功能：留言列表、帖子、通知、最近登录用户列表、作业 2015-08-15 17:06:50 +08:00
lizanle 89b9a5c09d 资源库 2015-08-15 17:06:41 +08:00
sw ac4d529ebc 编程作业取消，并设定匿评为内置功能 2015-08-15 10:45:56 +08:00
huang 2c865069d3 所有消息显示功能 2015-08-13 22:33:08 +08:00
huang 510613f9a4 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-08-13 18:34:29 +08:00
ouyangxuhua 11ad8d6d42 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-08-12 17:48:42 +08:00
huang ee778b5968 1、增加issue消息提醒（发送给指派的人） 
2、下拉框形式区分消息
3、相关关联
 2015-08-12 17:45:17 +08:00
ouyangxuhua a5f7f8e622 项目--版本：如图提示信息不合适问题修改 2015-08-12 16:54:31 +08:00
cxt a872692984 为activities表添加created_at字段，并导入数据 2015-08-11 14:49:32 +08:00
lizanle d0bca180ca Merge remote-tracking branch 'origin/szzh' into szzh 2015-08-10 09:12:57 +08:00
lizanle 5d82f3336e 导入作者是我，但是问卷在其他课程里的问卷，可以多选 2015-08-10 09:12:26 +08:00
huang bc6b6b0536 底部国际化 2015-08-04 18:24:06 +08:00
guange 9d8596a14c 新增gitlab adapter用于适配gitlab命令 2015-08-01 18:48:55 +08:00
huang 15b3d527dc footer 2015-08-01 18:15:04 +08:00
sw fe2d621dc3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/helpers/users_helper.rb
 2015-08-01 15:17:01 +08:00
sw 1cd50693b5 登录失败错误信息提示 2015-08-01 14:31:22 +08:00
huang a915a35819 优化版本代码加提示 2015-08-01 11:35:48 +08:00