 cxt
|
e7e873e0df
|
Merge branch 'dev_shcool' into develop
Conflicts:
app/helpers/users_helper.rb
|
2016-08-05 16:32:10 +08:00 |
|
cxt
|
3178700131
|
Merge branch 'cxt_course' into develop
|
2016-08-05 16:14:56 +08:00 |
|
cxt
|
0d86a28c54
|
我的作业
|
2016-08-05 16:12:53 +08:00 |
 huang
|
81ce93e88b
|
Merge branch 'rep_quality' into develop
|
2016-08-05 15:28:39 +08:00 |
|
huang
|
f4bda16469
|
fork分支PR
|
2016-08-04 18:30:04 +08:00 |
 daiao
|
7f62de59e1
|
优化周二代码审查的代码
|
2016-08-03 17:36:04 +08:00 |
|
huang
|
b8cccdffda
|
完成changes数据获取及展示
|
2016-08-03 15:56:07 +08:00 |
|
huang
|
be081f5c66
|
添加Api（提交内容，改动）及相关方法路由
|
2016-08-03 13:57:59 +08:00 |
|
huang
|
7658844a28
|
鼠标经过弹框消息提示
|
2016-08-02 14:53:33 +08:00 |
 Tim
|
1fc617d5fa
|
pull request页面删除
|
2016-08-01 16:57:55 +08:00 |
|
huang
|
b718803bd9
|
修改控制器名称及控制器查询访问权限
|
2016-08-01 16:54:31 +08:00 |
|
huang
|
685f9d8090
|
项目左侧权限控制
|
2016-08-01 16:19:15 +08:00 |
|
huang
|
96b04f39b1
|
pull requests框架搭建（路由控制器、views）
|
2016-08-01 15:33:47 +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 |
|
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 |
|
cxt
|
335b82c046
|
加入班级的弹框
|
2016-07-29 19:19:58 +08:00 |
|
huang
|
450217e7c2
|
同意加入消息发送，及添加成员
|
2016-07-29 15:58:24 +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 |
|
huang
|
a8fa4a55e3
|
项目申请消息发送
|
2016-07-28 16:22:33 +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
|
7413298aad
|
项目邀请码申请及弹框
|
2016-07-28 10:18:35 +08:00 |
|
huang
|
29edd60ce6
|
Merge branch 'daiao_dev' into dev_shcool
|
2016-07-27 10:54:38 +08:00 |
|
cxt
|
1f8fa1c70a
|
班级动态去掉“>”
|
2016-07-26 17:16:42 +08:00 |
|
cxt
|
04207609cb
|
未配置课程的班级打开报500
|
2016-07-26 16:54:34 +08:00 |
|
cxt
|
feb45a07bf
|
课程列表分为我创建的课程和我加入的课程
|
2016-07-26 16:45:36 +08:00 |
|
huang
|
2c8f94c899
|
去掉ID转换成用户login
|
2016-07-26 09:02:47 +08:00 |
|
huang
|
463c09f02c
|
项目邀请弹框
|
2016-07-26 08:55:07 +08:00 |
|
daiao
|
4646d13234
|
1.修改资源课程名称，竟可能显示全。
2.班级动态下，去掉“班级动态>”
|
2016-07-25 18:54:44 +08:00 |
|
huang
|
920a599417
|
Merge branch 'develop' into rep_quality
|
2016-07-25 14:11:04 +08:00 |
|
huang
|
7984affe36
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-25 14:10:48 +08:00 |
|
huang
|
be88914e39
|
去掉id转换用户名
|
2016-07-25 13:59:10 +08:00 |
|
daiao
|
9ff728f080
|
Merge branch 'develop' into daiao_dev
Conflicts:
app/views/layouts/_syllabus_base_info.html.erb
|
2016-07-25 10:03:50 +08:00 |
|
huang
|
43c6301223
|
id转换成用户名
|
2016-07-25 09:47:14 +08:00 |
|
cxt
|
6c7925a7b4
|
样式调整
|
2016-07-22 18:20:11 +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
|
8dbdebe02e
|
修改动态问题
|
2016-07-22 16:35:03 +08:00 |
|
cxt
|
9422e2886c
|
新版班级主页
|
2016-07-22 15:32:37 +08:00 |
|
huang
|
6fea64afe2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-22 10:35:44 +08:00 |
|
huang
|
ff8cad5cf2
|
项目动态中添加提交动态
|
2016-07-21 18:08:13 +08:00 |
 yuanke
|
f0840d0f31
|
Merge branch 'develop' into weixin_guange
|
2016-07-21 14:29:04 +08:00 |
|
daiao
|
b7cf7a2468
|
Merge branch 'develop' into daiao_dev
|
2016-07-21 09:55:47 +08:00 |
|
huang
|
6357f5be2a
|
解决成员列表获取单位不准确的问题
|
2016-07-21 09:27:14 +08:00 |
|
daiao
|
03d6afd1c4
|
优化上周动态获取代码
|
2016-07-18 15:52:04 +08:00 |
|
huang
|
412d74e295
|
优化最近动态获取方法
|
2016-07-18 13:57:00 +08:00 |
|
huang
|
5c046f922e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-18 11:25:57 +08:00 |
|
huang
|
3198f8a473
|
解决版本库提交记录中：上传图片或者非可以预览文件 显示详情500问题
|
2016-07-18 11:17:22 +08:00 |
|
yuanke
|
f3d74fcd55
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-18 11:08:09 +08:00 |