 daiao
|
7fbca5f260
|
单位审查消息及其BUG修复
|
2016-08-05 16:14:26 +08:00 |
|
daiao
|
5f969c6593
|
单位审核相关Bug修复
|
2016-08-03 10:36:03 +08:00 |
|
daiao
|
24783705b5
|
Merge branch 'dev_shcool' into develop
|
2016-08-01 16:11:47 +08:00 |
|
daiao
|
0ffeec64e3
|
单位审核bug修复
|
2016-08-01 16:10:57 +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
|
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
|
5b93d40f67
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/assets/wechat/app.html
public/assets/wechat/new_project.html
public/javascripts/wechat/directives/ellipsis.js
public/stylesheets/weui/weixin.css
|
2016-07-29 22:03:45 +08:00 |
|
daiao
|
641ccee631
|
修改名称过长问题
|
2016-07-29 22:02:23 +08:00 |
 cxt
|
98a2ebd682
|
Merge branch 'cxt_course' into develop
|
2016-07-29 21:54:33 +08:00 |
|
daiao
|
39478eb4e4
|
Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool
Conflicts:
app/views/admin/applied_schools.html.erb
app/views/admin/has_applied_schools.html.erb
|
2016-07-29 21:50:19 +08:00 |
|
daiao
|
d6178ec7dd
|
管理员界面单位申请
|
2016-07-29 21:45:52 +08:00 |
 yuanke
|
1704462986
|
管理员界面单位申请修改
|
2016-07-29 21:45:32 +08:00 |
|
yuanke
|
1f47eb5ea8
|
单位申请列表修改
|
2016-07-29 21:19:09 +08:00 |
|
daiao
|
430a93e4b2
|
单位名称列表功能代码
|
2016-07-29 20:48:36 +08:00 |
|
cxt
|
b3d34d6e0f
|
配置班级列表的名称显示全
|
2016-07-29 20:18:26 +08:00 |
|
daiao
|
5b30036639
|
单位名称列表功能
|
2016-07-29 16:11:26 +08:00 |
|
daiao
|
50ec127c5b
|
单位名称列表功能
|
2016-07-28 20:01:22 +08:00 |
|
daiao
|
9e788c9b6f
|
单位批准及消息框架搭建
|
2016-07-27 10:46:48 +08:00 |
|
daiao
|
5883b451ca
|
在管理员界面添加单位名称列表
|
2016-07-25 18:31:28 +08:00 |
 huang
|
6357f5be2a
|
解决成员列表获取单位不准确的问题
|
2016-07-21 09:27:14 +08:00 |
|
cxt
|
b7e6725e1f
|
管理员界面的课程名称双击可点击
|
2016-07-15 14:48:39 +08:00 |
|
cxt
|
d21eaf9154
|
未配置班级列表的班级重命名
|
2016-07-11 15:32:01 +08:00 |
|
cxt
|
834e72b0f8
|
未配置班级列表报500，全部班级列表添加状态列表明班级是否已删除
|
2016-07-11 14:43:22 +08:00 |
|
cxt
|
d25f401afa
|
管理员界面修改班级名称
|
2016-07-08 19:16:53 +08:00 |
|
cxt
|
a99b03ff76
|
管理员界面增加配置课程
|
2016-07-07 09:02:41 +08:00 |
|
cxt
|
c5840d75da
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
db/schema.rb
|
2016-07-05 16:49:50 +08:00 |
|
cxt
|
2c1e0f534c
|
课程大纲
|
2016-07-01 11:11:53 +08:00 |
|
daiao
|
2eb7aa7c38
|
修改精品课程下-全部课程下 除序列、主讲老师和课程名外的所有列进行排序！
|
2016-06-30 11:32:14 +08:00 |
|
daiao
|
cb11cac506
|
Merge branch 'develop' into daiao_dev
Conflicts:
app/views/admin/excellent_all_courses.html.erb
|
2016-06-28 18:39:32 +08:00 |
|
daiao
|
d8284e45ed
|
在课程列表下增加动态时间一栏
|
2016-06-28 15:06:08 +08:00 |
|
daiao
|
863cdee37c
|
在精品课程的全部课程界面下增加公开属性
|
2016-06-28 14:39:43 +08:00 |
|
cxt
|
3a8a61e404
|
在精品课程列表增加“取消精品”列、在全部课程列表增加“开课学期”列，并支持排序
|
2016-06-13 11:10:28 +08:00 |
|
cxt
|
02e2831980
|
管理员界面的留言列表优化
|
2016-06-12 17:17:37 +08:00 |
|
huang
|
fe54a19940
|
Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
Conflicts:
app/views/blogs/_article.html.erb
app/views/users/_project_boardlist.html.erb
public/stylesheets/new_user.css
|
2016-05-19 16:10:18 +08:00 |
|
yuanke
|
708cb35fd2
|
增加一个弹框的通用接口pop_up_box
|
2016-05-16 16:57:18 +08:00 |
|
cxt
|
7481d96166
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/admin_controller.rb
config/routes.rb
lib/redmine.rb
|
2016-05-12 10:40:35 +08:00 |
|
cxt
|
9ec488684b
|
分享申请的消息更改
|
2016-05-12 09:30:06 +08:00 |
|
cxt
|
f6d7df7393
|
管理员界面添加“分享作业申请”列表
|
2016-05-09 18:40:21 +08:00 |
|
yuanke
|
d538d1967b
|
解决管理员界面代码测试列表404的问题
|
2016-04-21 11:16:32 +08:00 |
|
yuanke
|
c6174406fb
|
数据库语句使用rails已有的
|
2016-04-20 10:39:07 +08:00 |
|
yuanke
|
dc3837da76
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
2016-04-20 09:59:37 +08:00 |
|
yuanke
|
0f5fe51f97
|
1.管理员界面代码测试列表的修改
2.代码查重按钮位置
3.查重结果样式
|
2016-04-20 09:51:51 +08:00 |
|
cxt
|
7f3fcb7d01
|
精品课程列表中的全部课程可点击动态数排序
|
2016-04-15 14:54:17 +08:00 |
|
yuanke
|
f1090d45ad
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
2016-04-15 14:13:44 +08:00 |
|
yuanke
|
365540cf1f
|
管理员界面显示代码测试列表的修改
|
2016-04-15 12:39:22 +08:00 |
|
yuanke
|
998106b37b
|
修改代码查重的一些弹框显示效果等问题
|
2016-04-15 11:28:20 +08:00 |
|
cxt
|
143f3f8f9a
|
管理员界面增加精品课程的设置
|
2016-04-15 11:26:56 +08:00 |
|
yuanke
|
a8dce5e520
|
代码查重功能增加,管理员界面增加代码测试列表.
|
2016-04-14 11:29:22 +08:00 |