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

218 Commits

Author SHA1 Message Date
lizanle 4efb660214 全站搜索 2015-11-26 09:57:53 +08:00
huang c8b1cae947 建立贡献榜表及相关关联 
部分页面
按总分排序（英雄榜）
部分页面（未完成）
 2015-11-25 15:16:33 +08:00
cxt 62d80c27d6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-16 08:59:54 +08:00
sw 466f3c4cc3 数据库修改以及一对一，一对多，多对多等关系的确立 2015-11-13 15:47:39 +08:00
ouyangxuhua 866c2feaa1 修改组织模块的bug 2015-11-13 15:02:12 +08:00
sw bbf087fa67 数据库的修改以及model数据关系的确定 2015-11-13 14:40:14 +08:00
ouyangxuhua 6ec27761fb 组织功能实现及缺陷修改 2015-11-12 20:57:41 +08:00
ouyangxuhua 21275e8b7b 组织模块功能缺陷修改 2015-11-12 17:52:47 +08:00
ouyangxuhua 283af137c6 组织模块动态及配置 2015-11-05 17:57:07 +08:00
guange be25a57eaf 同步用户bug解决 2015-11-01 21:49:07 +08:00
cxt c4816a0414 名字为空的用户创建博客时博客名称为登录名 2015-10-30 09:56:55 +08:00
huang 4c61e7490b Merge branch 'develop' into gitlab_guange 
Conflicts:
	db/schema.rb
 2015-10-27 14:42:05 +08:00
lizanle 2a76461cd1 简单博客功能 2015-10-24 15:34:43 +08:00
huang 150ee3d28d Merge branch 'szzh' into gitlab_guange 
Conflicts:
	db/schema.rb
 2015-10-16 09:07:38 +08:00
cxt 8abc97ae84 个人主页添加个人留言动态 2015-10-14 11:38:16 +08:00
cxt b9b7f6fa9e 个人主页留言动态的实现 2015-10-13 16:51:44 +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 b49d19cdb2 添加注释 2015-09-21 15:32:28 +08:00
huang b0ccf9037a 邮件邀请： 
1、修改私有项目跳入403问题
2、增加同一个用户反复邀请的邮箱提醒。
3、修改邮箱的发送策略
 2015-09-15 17:39:57 +08:00
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
guange 7d0a53ec86 merge 2015-07-21 20:56:33 +08:00
guange 006ed66d7a 新注册用户可以同步到gitlab 2015-07-15 15:51:49 +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
alan 584944059a huanyuan 
Signed-off-by: alan <547533434@qq.com>
 2014-11-24 11:25:23 +08:00
alan 88ab53730b 修改bug《登录密码错误报错》 
Signed-off-by: alan <547533434@qq.com>
 2014-11-22 17:45:09 +08:00
alan 0049f921b9 修改bug《测试版--课程/项目--配置--成员添加：如图，用户列表中各用户的邮箱全部为空了》 
Signed-off-by: alan <547533434@qq.com>
 2014-11-22 09:51:41 +08:00
alan 70e8c4ebe7 修改bug<注册后，用户第一次登陆都得转到《修改资料》页面> 
Signed-off-by: alan <547533434@qq.com>
 2014-11-21 19:11:40 +08:00
sw 460ba55dde Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/models/user.rb
	app/views/courses/_course_form.html.erb
	db/schema.rb
 2014-11-08 16:40:36 +08:00
alan 1d76d559dd 添加功能<用户搜索的问题> 
Signed-off-by: alan <547533434@qq.com>
 2014-11-04 17:06:16 +08:00
alan fecf9513b9 修改bug《课程讨论区老师不能给帖子置顶》 
Signed-off-by: alan <547533434@qq.com>
 2014-11-01 23:30:10 +08:00
sw c045b4682a 增加匿评分配作业表，以及和作业、作品、用户表关系键确认 2014-10-31 19:30:49 +08:00
alan 7d3a18197b 修改bug<注册时用户可以不填真实姓名，将其设置为可选>和《测试版：项目--点击作品下载报500错误》 
Signed-off-by: alan <547533434@qq.com>
 2014-10-29 16:13:49 +08:00
linhk d8964d81a8 用户注册lastname超长报错 2014-08-05 17:13:50 +08:00
z9hang acb41158e7 错误提示页面导航栏添加 
登陆时自动忽略登陆名前后空格
 2014-08-01 16:01:16 +08:00
yanxd 4eee70a845 course new/created test 2014-07-16 17:46:17 +08:00
yanxd 4dbe149b42 删掉user里的扩展表信息，防止第一次迁移失败 2014-07-07 17:24:51 +08:00
z9hang 2dd249a105 修正发帖不填主题报错问题，修正发帖内容为空可成功发布bug、修改主页贴吧动态里回帖数字颜色、修改昵称字符为不超过25个 2014-07-04 10:10:20 +08:00
z9hang d34ab220cc 登录名区分大小写 2014-07-01 17:12:48 +08:00
z9hang 2e38f66899 搜索用户修改为按昵称搜索 2014-07-01 16:31:40 +08:00
nwb 7425178419 Merge branch 'CourseModify' into szzh 
Conflicts:
	app/views/layouts/base_courses.html.erb
	app/views/layouts/base_homework.html.erb
	app/views/projects/_course.html.erb
	db/schema.rb
	lib/redmine/activity/fetcher.rb
 2014-06-26 08:53:16 +08:00
z9hang f16bec924c 处理undefined method `update_user_level' for nil:NilClass问题 2014-06-23 09:27:21 +08:00
nwb 6039cf63af 课程讨论区文件上传权限优化 2014-06-20 09:08:18 +08:00
nwb 099e8a0912 Merge branch 'szzh' into CourseModify 
Conflicts:
	app/controllers/application_controller.rb
	app/views/attachments/upload.js.erb
	app/views/courses/_homework_form.html.erb
	app/views/layouts/base_courses.html.erb
	app/views/users/_my_joinedcourse.html.erb
	db/schema.rb
	lib/redmine.rb
	lib/redmine/access_control.rb
 2014-06-17 10:12:44 +08:00
nwb 755e758596 优化课程资源文件动态和权限判断 2014-06-16 09:48:55 +08:00
yanxd 955fece267 merge develop 2014-06-13 16:52:12 +08:00
yanxd 70abac4c1e Merge branch 'competition' into develop 
Conflicts:
	app/controllers/application_controller.rb
	config/locales/en.yml
	config/locales/zh.yml
	db/schema.rb
 2014-06-13 10:59:43 +08:00
z9hang 4fb96bacdc 修正更新用户等级方法，保证每个用户只有一条记录 2014-06-12 16:41:48 +08:00
z9hang ebbd4b0642 课程讨论区踩顶帖子 
会员等级计算（占位实现自动升级）
技术得分计算
 2014-06-12 15:12:55 +08:00
nwb ae8fcca14f 1.课程接触视图修改 
2.添加课程成员列表视图
 2014-06-12 14:57:25 +08:00
sw 872b7efb84 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-06-11 15:54:40 +08:00
sw d0dd6eb781 1.修改作业时实现作业添加参与人员与删除参与人员 
2.homework_attach、homework_user、users关系添加
3.优化页面显示
 2014-06-11 15:28:13 +08:00
yanxd 541b22b84d score statistics init 2014-06-10 10:42:41 +08:00