Commit Graph

31 Commits

Author SHA1 Message Date
huang 55d16eb589 完成组织域名申请消息重构 2017-01-17 13:22:03 +08:00
huang d5a0133b0b 个人主页部分优化 2017-01-12 16:19:11 +08:00
cxt 346dc069ef 加入竞赛的消息通知 2016-12-22 16:02:36 +08:00
cxt 7777e63647 首页消息列表样式修改 2016-12-16 19:08:54 +08:00
cxt d8f098c6f4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
	app/views/users/_user_message_course.html.erb
2016-12-16 16:56:21 +08:00
cxt 710c06e41a 匿评成绩的申诉功能 2016-12-16 11:01:58 +08:00
daiao 54687793ec 铃铛样式重新排版 2016-12-13 17:22:30 +08:00
daiao e6763c6d0c 用户消息铃铛样式调整 2016-12-07 09:00:33 +08:00
daiao 4a9967674a 1. 强制编辑基本资料,在删除单位时给出消息通知
2. 单位名称申请提示一直显示
3. 申请单位的消息通知显示申请人头像,并连接到申请人主页
2016-08-13 14:29:33 +08:00
cxt e7e873e0df Merge branch 'dev_shcool' into develop
Conflicts:
	app/helpers/users_helper.rb
2016-08-05 16:32:10 +08:00
daiao 7f62de59e1 优化周二代码审查的代码 2016-08-03 17:36:04 +08:00
daiao 5f969c6593 单位审核相关Bug修复 2016-08-03 10:36:03 +08:00
huang 94b36e227c 申请加入项目消息刷新,同时更新其它管理员的消息状态 2016-08-02 13:03:33 +08:00
daiao fc1fc0bd7d 单位审核bug修复 2016-08-01 15:44:18 +08:00
daiao 5272f20de8 单位审核bug的修复 2016-08-01 13:56:37 +08:00
daiao 6ea829131b 单位列表发送消息样式调整 2016-07-29 23:48:12 +08:00
daiao db690bedab 单位名称列表缺陷修复 2016-07-29 23:22:32 +08:00
daiao 911a769670 Merge branch 'develop' into dev_shcool
Conflicts:
	app/models/applied_message.rb
2016-07-29 22:05:56 +08:00
daiao d6178ec7dd 管理员界面单位申请 2016-07-29 21:45:52 +08:00
huang 847cae6d41 Merge branch 'develop' into rep_quality
Conflicts:
	app/models/applied_message.rb
	db/schema.rb
2016-07-29 21:39:00 +08:00
huang f857ceab32 消息中项目添加title 2016-07-29 21:07:15 +08:00
huang 8d625eff5e 修改方式就用户图像显示 2016-07-29 21:04:01 +08:00
daiao 3251890c91 Merge branch 'rep_quality' into dev_shcool
Conflicts:
	app/models/applied_message.rb
	db/schema.rb
2016-07-29 20:52:18 +08:00
huang 643b06484b 消息表添加字段 2016-07-29 20:50:55 +08:00
daiao 430a93e4b2 单位名称列表功能代码 2016-07-29 20:48:36 +08:00
cxt e3d538c3fa Merge branch 'cxt_course' into develop
Conflicts:
	app/views/layouts/_course_base_info.html.erb
	db/schema.rb
2016-07-29 19:39:42 +08:00
huang 60417b2db7 项目邀请消息样式问题 2016-07-29 19:30:53 +08:00
huang c07677ef99 项目邀请框架 拒绝消息 2016-07-29 14:49:37 +08:00
daiao 50ec127c5b 单位名称列表功能 2016-07-28 20:01:22 +08:00
huang a8fa4a55e3 项目申请消息发送 2016-07-28 16:22:33 +08:00
huang 43cb2a0d18 单位申请消息显示 2016-07-27 11:33:54 +08:00