 huang
|
c7f2ab0415
|
修复创建英文名字的项目标题为“为项目讨论区的问题”
|
2016-08-01 13:51:11 +08:00 |
 daiao
|
911a769670
|
Merge branch 'develop' into dev_shcool
Conflicts:
app/models/applied_message.rb
|
2016-07-29 22:05:56 +08:00 |
 cxt
|
98a2ebd682
|
Merge branch 'cxt_course' into develop
|
2016-07-29 21:54:33 +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 |
|
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 |
|
huang
|
0bf9b5c6e6
|
消息红点记录 个人主页添加加入项目入口
|
2016-07-29 20:31:24 +08:00 |
|
cxt
|
d0f83aab64
|
去掉姓和名之间的空格
|
2016-07-29 20:24:04 +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 |
|
cxt
|
72977886c7
|
Merge branch 'cs_optimize_txz' into cxt_course
Conflicts:
app/views/layouts/_course_base_info.html.erb
|
2016-07-29 19:37:15 +08:00 |
|
huang
|
c07677ef99
|
项目邀请框架 拒绝消息
|
2016-07-29 14:49:37 +08:00 |
|
cxt
|
a1a2b3dd33
|
Merge branch 'rep_quality' into cxt_course
Conflicts:
db/schema.rb
|
2016-07-29 14:36:18 +08:00 |
|
cxt
|
848c56d54e
|
班级主页身份切换、成员管理页面的多重身份
|
2016-07-29 14:34:42 +08:00 |
|
daiao
|
6bd9f47222
|
Merge branch 'dev_shcool' into develop
Conflicts:
db/schema.rb
|
2016-07-28 20:02:57 +08:00 |
|
daiao
|
50ec127c5b
|
单位名称列表功能
|
2016-07-28 20:01:22 +08:00 |
|
huang
|
a8fa4a55e3
|
项目申请消息发送
|
2016-07-28 16:22:33 +08:00 |
 yuanke
|
6d594cfcbe
|
git pull后重新commit
|
2016-07-28 15:11:04 +08:00 |
|
huang
|
4a9eec0cce
|
完成项目邀请及公共弹框的封装
|
2016-07-28 14:42:36 +08:00 |
|
huang
|
c6bc5c9cb8
|
Merge branch 'dev_shcool' into rep_quality
Conflicts:
db/schema.rb
|
2016-07-28 10:19:37 +08:00 |
|
huang
|
2f79e521ca
|
单位批准发送消息；申请单位给系统每位管理员发送消息
|
2016-07-27 11:20:12 +08:00 |
|
daiao
|
9e788c9b6f
|
单位批准及消息框架搭建
|
2016-07-27 10:46:48 +08:00 |
|
huang
|
d51295127d
|
issue删除回复删除附件的问题 同事关联删除
|
2016-07-26 16:13:20 +08:00 |
|
huang
|
2c8f94c899
|
去掉ID转换成用户login
|
2016-07-26 09:02:47 +08:00 |
 guange
|
6a871e2116
|
.
|
2016-07-25 17:09:14 +08:00 |
|
huang
|
774650c819
|
项目邀请码直接数据库读取，权限修改
|
2016-07-25 15:22:34 +08:00 |
|
yuanke
|
b9b9a867f4
|
项目
|
2016-07-25 15:20:01 +08:00 |
|
huang
|
84d1adbf25
|
生成邀请码
|
2016-07-25 14:36:52 +08:00 |
|
huang
|
be88914e39
|
去掉id转换用户名
|
2016-07-25 13:59:10 +08:00 |
|
huang
|
35172dab59
|
管理员界面单位申请框架
|
2016-07-25 10:59:08 +08:00 |
|
huang
|
43c6301223
|
id转换成用户名
|
2016-07-25 09:47:14 +08:00 |
|
huang
|
0e1a52726f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/base_syllabus.html.erb
|
2016-07-22 16:46:01 +08:00 |
|
huang
|
537cc20e06
|
已repository_id为范围，version唯一性控制
|
2016-07-22 10:34:59 +08:00 |
|
huang
|
4e4ff4958f
|
修改changeset触发事件
|
2016-07-21 17:19:45 +08:00 |
|
huang
|
466a25c121
|
提交后更新项目动态表update时间
|
2016-07-21 17:02:50 +08:00 |
|
huang
|
246923a335
|
版本库新增提交次数表，增加至项目动态
|
2016-07-21 16:09:07 +08:00 |
|
cxt
|
71b5fe1273
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/issues_controller.rb
app/views/issues/_issue_replies.html.erb
app/views/issues/_issue_reply_ke_form.html.erb
db/schema.rb
|
2016-07-21 14:31:43 +08:00 |
|
cxt
|
f3c95906d8
|
项目缺陷的二级回复
|
2016-07-21 10:30:48 +08:00 |
|
huang
|
f979e80f24
|
Gitlab数据清理及迁移，主要是历史数据
|
2016-07-20 17:05:55 +08:00 |
|
cxt
|
7853b8aa54
|
班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复， 二级回复代码的整合
|
2016-07-20 17:00:18 +08:00 |
|
huang
|
14e6db457b
|
rake
|
2016-07-20 09:38:23 +08:00 |
|
huang
|
0c0dfbd093
|
changeset关联
|
2016-07-19 17:38:11 +08:00 |
|
huang
|
cf04bb5ec6
|
迁移上线
|
2016-07-19 15:59:52 +08:00 |
|
huang
|
facf3ae8f8
|
提交次数写入动态中
|
2016-07-18 16:45:49 +08:00 |
|
cxt
|
e260c0b7cc
|
Merge branch 'cxt_course' into develop
|
2016-07-15 15:49:27 +08:00 |
|
cxt
|
05fe987a8b
|
新手注册三条留言
|
2016-07-15 15:43:35 +08:00 |
|
yuanke
|
15ccf5cfbe
|
Merge branch 'yuanke' into develop
|
2016-07-13 15:56:44 +08:00 |
|
yuanke
|
b4ac13c157
|
修改编程作业没main函数系统评分100的BUG
|
2016-07-13 09:36:43 +08:00 |
|
guange
|
8279d9385c
|
区分是课程邀请，还是意见反馈
|
2016-07-09 10:13:05 +08:00 |
|
guange
|
7c98e0f392
|
merge
|
2016-07-08 20:00:49 +08:00 |