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

147 Commits

Author SHA1 Message Date
huang c0437ae992 作业截止时间提醒界面！ 2015-09-11 14:41:23 +08:00
huang 66251c8d30 添加功能：管理员界面发送系统消息 2015-09-09 17:05:32 +08:00
huang 103d61056d 完成功能： 
1、添加“新的消息”分类
2、新注册用户默认点击时间
 2015-09-07 16:08:04 +08:00
huang ecd0056f0a 1、完成消息点击记后图标不显示红点的功能。 
2、首次登陆以“最后登录时间”为准，后面以点击时间为准
 2015-09-07 11:13:15 +08:00
huang a7eff50c61 消息留言发送：回复东家，回复人和东家只能一人收到消息 2015-08-27 10:32:45 +08:00
lizanle 1aa61acd79 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/public.css
 2015-08-21 16:16:18 +08:00
lizanle 9138f46301 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/controllers/users_controller.rb
 2015-08-21 14:10:50 +08:00
huang ef45e41a40 新消息提醒。表情插入 2015-08-21 09:41:59 +08:00
huang d18d1a9d81 用户留言添加 
公共讨论区留言修改
 2015-08-19 17:29:05 +08:00
huang d657e9f3cc 新增 公共贴吧 消息通知 2015-08-19 11:06:39 +08:00
lizanle 89b9a5c09d 资源库 2015-08-15 17:06:41 +08:00
huang 9b98bdcf5c 1、消息看过则不提示（方法实现） 
2、添加消息新按钮
 2015-08-15 15:44:44 +08:00
huang ed8c4ac906 不同类型消息发送 2015-08-15 02:11:18 +08:00
huang 17fad1f291 课程（所有消息）--发布作业、新闻、问卷界面 2015-08-14 17:05:27 +08:00
huang c903325352 缺陷状态更新消息提醒 
留言消息提醒
 2015-08-13 16:55:25 +08:00
huang 5dd2befe88 添加消息看过后即不显示功能 2015-08-13 10:10:01 +08:00
huang ee778b5968 1、增加issue消息提醒（发送给指派的人） 
2、下拉框形式区分消息
3、相关关联
 2015-08-12 17:45:17 +08:00
huang 5f87d5806b 解决留言消息提示中遗留的bug 2015-08-11 15:26:41 +08:00
huang 82747a7690 留言添加消息提示 2015-08-10 16:12:13 +08:00
sw 11afcaf17c 没有昵称的用户显示为：匿名用户 
个人主页留言换行
 2015-08-01 15:14:45 +08:00
huang dae15840b8 新注册用户邮件默认缺省值按天发送 2015-07-07 14:45:46 +08:00
sw f675211642 学生作品列表，没有真实姓名就显示login，作品附件导出也一样 2015-06-05 15:26:35 +08:00
sw cc5171bc1d 解决冲突 2015-06-02 14:48:48 +08:00
huang 7197c33be4 注释掉暂时未完成的功能 2015-05-29 16:07:57 +08:00
huang cae882b3d6 新增邮件状态表 
相关关联
 2015-05-28 14:44:04 +08:00
sw dc1971f507 学生作品详细得分表，以及相关的关系 2015-05-19 11:18:19 +08:00
sw 08b469fa3c 学生作品匿评分配表 2015-05-19 10:56:41 +08:00
sw 3abfaed081 学生提交作品表，以及相关的关系 2015-05-19 10:36:30 +08:00
sw a43a6289e4 新的老师布置的作业表添加，以及相关关系定义 2015-05-19 09:49:26 +08:00
huang 95c5e6ac83 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/helpers/application_helper.rb
	app/helpers/files_helper.rb
	app/helpers/members_helper.rb
	app/models/journals_for_message.rb
	app/models/mailer.rb
	app/models/user.rb
	app/views/attachments/_form.html.erb
	app/views/bids/_new_homework_form.html.erb
	app/views/boards/_project_show.html.erb
	app/views/courses/_courses_jours.html.erb
	app/views/courses/feedback.html.erb
	app/views/courses/new_homework.html.erb
	app/views/courses/settings.html.erb
	app/views/issues/_list.html.erb
	app/views/issues/new.html.erb
	app/views/messages/_project_show.html.erb
	app/views/messages/edit.html.erb
	app/views/news/_project_news.html.erb
	app/views/projects/invite_members.html.erb
	app/views/projects/settings/_modules.html.erb
	app/views/projects/show.html.erb
	config/configuration.yml
	config/locales/zh.yml
	db/schema.rb
	public/assets/kindeditor/kindeditor.js
	public/javascripts/course.js
	public/stylesheets/courses.css
	public/stylesheets/public.css
 2015-04-16 10:26:03 +08:00
guange 5a876d9df1 邮件发送时，单个收件人会报错 2015-04-10 10:41:44 +08:00
huang 12eaac5683 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/boards/_project_show.html.erb
	public/javascripts/course.js

处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
 2015-04-07 13:47:39 +08:00
guange c1ed8bd36d #2096 course、forge的邮件通知系统，改为可以每日一报、一事一报、不报 2015-03-29 12:33:33 +08:00
guange e007920cb6 Merge remote-tracking branch 'origin/szzh' into guange_dev 
Conflicts:
	Gemfile
	app/views/attachments/_form.html.erb
 2015-03-19 17:41:45 +08:00
z9hang 9d686349da 用户搜索接口添加按昵称或姓名搜索 2015-03-18 17:31:35 +08:00
guange ab6c21314d #1503 老师发布的作业可以在课程动态中显示了 2015-03-12 21:57:35 +08:00
alan 4bfc4493eb 添加《邮件周日发送》功能，修改《贴吧》邮件发送策略 
Signed-off-by: alan <547533434@qq.com>
 2015-02-11 20:23:50 +08:00
alan 6e72e07028 Merge branch 'szzh' into email_verify 
Conflicts:
	Gemfile
	Gemfile.lock
 2015-02-06 18:16:20 +08:00
alan 6f9e2bad63 mail weekly 2015-02-06 18:15:08 +08:00
alan 48cb0e0450 email verify 2015-01-31 15:04:48 +08:00
alan fdba8ca986 修改《邮箱地址真实性验证》《课程分班提示重名出错》《留言模块发送邮件模板功能》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-23 11:46:55 +08:00
alan 40d6c3b19c 添加《邮箱地址验证是否存在及国际化的编写》功能 
Signed-off-by: alan <547533434@qq.com>
 2015-01-20 16:33:59 +08:00
alan 5191411508 <邮件加密自动登录功能，邮件附件下载功能> 
Signed-off-by: alan <547533434@qq.com>
 2015-01-15 18:48:19 +08:00
sw ee9d82bfc7 1.实现文件调查的model、control、view的架构 
2.修正完善新增表之间的关系
3.修正代码中单复数不正确的问题
 2015-01-08 17:42:46 +08:00
sw b512bc53e9 修改用户搜索无法精确搜索的bUG 2014-12-24 09:08:42 +08:00
alan 7c1b86556d 增加《作业评分弹窗》《学生列表增加作业评分》两项功能 
Signed-off-by: alan <547533434@qq.com>
 2014-12-17 17:36:12 +08:00
alan 66f93150f6 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group 2014-12-04 19:09:51 +08:00
alan 9765f11f7e 增加<修改，添加分组>功能 
Signed-off-by: alan <547533434@qq.com>
 2014-12-04 19:09:10 +08:00
z9hang ec21a98e64 修改密码验证的方法 2014-12-03 16:14:11 +08:00
alan ace5b514c6 修改bug<测试版--注册登录：成功激活注册的用户后，登录返回资料修改的页面，姓氏、名字还是标识为必填项> 
Signed-off-by: alan <547533434@qq.com>
 2014-11-25 14:17:04 +08:00