 huang
|
11bc6b1e6c
|
配置500问题
|
2016-05-17 10:18:24 +08:00 |
|
huang
|
5ee6c9e5d3
|
子域名添加成员问题
|
2016-05-16 18:08:05 +08:00 |
 guange
|
f217b3f510
|
去除用户名域名
|
2016-05-14 16:00:04 +08:00 |
|
huang
|
79e57e2b7f
|
代码和并冲突处理及连接参数
|
2016-05-13 17:00:25 +08:00 |
|
huang
|
e8afcf9157
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/helpers/organizations_helper.rb
app/views/organizations/_org_subfield_rightM2.html.erb
|
2016-05-13 16:56:02 +08:00 |
|
huang
|
39c753fd25
|
名师列表排序
|
2016-05-13 16:54:27 +08:00 |
|
huang
|
467ee60657
|
名师默认显示5个，没有则不显示
|
2016-05-13 15:37:04 +08:00 |
|
huang
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
2016-05-13 15:12:26 +08:00 |
|
huang
|
3853d5b7ad
|
右三模式定制
|
2016-05-13 13:39:44 +08:00 |
 cxt
|
0f61994252
|
点击作业动态优秀排行中学生链接，在打开的作品列表中自动定位到该学生作品并默认打开该作品
|
2016-05-12 17:49:07 +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
|
5baf467d13
|
作品评分不覆盖
|
2016-05-10 15:26:08 +08:00 |
|
huang
|
cabac5914c
|
学生统计数
|
2016-05-10 13:41:21 +08:00 |
|
huang
|
99d9a28828
|
名师榜sql查询
|
2016-05-10 11:33:02 +08:00 |
|
huang
|
5880a12290
|
sql查询
|
2016-05-10 10:00:28 +08:00 |
|
huang
|
6474444cc7
|
用户连接 id变成用户名
|
2016-05-10 09:00:59 +08:00 |
|
huang
|
a98678e001
|
列表中类型显示方法封装
|
2016-05-09 15:00:50 +08:00 |
|
huang
|
878bcc8cf1
|
栏目创建类型添加老师、学生类型
|
2016-05-09 14:43:28 +08:00 |
|
cxt
|
b8f7672424
|
项目动态的更新时间更新到作业动态中
|
2016-05-06 22:02:45 +08:00 |
|
huang
|
00d0bc0ce1
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-05-06 22:02:22 +08:00 |
|
huang
|
0a989daf31
|
Merge branch 'cxt_course' into develop
Conflicts:
app/helpers/application_helper.rb
public/stylesheets/courses.css
public/stylesheets/new_user.css
|
2016-05-06 18:12:08 +08:00 |
|
cxt
|
10d26f89d9
|
作业列表的二级回复
|
2016-05-06 17:36:28 +08:00 |
|
huang
|
c3a016607b
|
解决冲突
|
2016-05-06 10:39:37 +08:00 |
|
huang
|
9e0176bc55
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/controllers/organizations_controller.rb
app/helpers/organizations_helper.rb
db/schema.rb
public/images/homepage_icon.png
public/stylesheets/new_user.css
|
2016-05-06 10:16:56 +08:00 |
|
huang
|
0b43fb5502
|
隐藏可见及箭头的局部刷新
|
2016-05-06 09:49:15 +08:00 |
|
huang
|
231f8f3526
|
二级目录中设置了隐藏，鼠标经过的时候不显示内容及 框框
|
2016-05-05 21:23:34 +08:00 |
|
huang
|
a0ea2c7e5d
|
模式二3在配置整合
|
2016-05-05 10:05:53 +08:00 |
|
huang
|
ccea42cc8b
|
项目和课程的动态只参与五种配置
|
2016-05-04 19:47:44 +08:00 |
|
huang
|
8dfe95dfd1
|
配置页面新建二级域名样式
|
2016-05-04 15:50:53 +08:00 |
|
huang
|
5e8ff06140
|
Merge branch 'yuanke' into develop
|
2016-05-03 17:15:46 +08:00 |
|
cxt
|
1cad1626e0
|
解决冲突
|
2016-04-29 20:31:31 +08:00 |
 yuanke
|
b199a6b8b2
|
列表人气排序修改
|
2016-04-29 19:24:20 +08:00 |
|
yuanke
|
1353c27f64
|
Merge branch 'yuanke' into develop
Conflicts:
app/helpers/application_helper.rb
|
2016-04-29 15:54:37 +08:00 |
|
yuanke
|
f8abd46ae9
|
列表修改
|
2016-04-29 15:52:44 +08:00 |
|
yuanke
|
1da8288fe7
|
列表显示修改
|
2016-04-29 13:42:58 +08:00 |
|
huang
|
1685449381
|
二级目录框架及结构
|
2016-04-28 17:36:29 +08:00 |
|
yuanke
|
f185c59e90
|
Merge branch 'yuanke' into develop
|
2016-04-28 14:33:30 +08:00 |
|
yuanke
|
2cb9f0cd05
|
组织还原
|
2016-04-28 14:31:40 +08:00 |
|
yuanke
|
dc53b86a4e
|
Merge branch 'cxt_course' into yuanke
Conflicts:
app/controllers/student_work_controller.rb
db/schema.rb
|
2016-04-28 10:49:05 +08:00 |
|
yuanke
|
647e6a7f92
|
Merge branch 'yuanke' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
config/locales/zh.yml
db/schema.rb
|
2016-04-28 10:45:57 +08:00 |
|
huang
|
9fbf713709
|
完成组织二级域名
|
2016-04-27 17:02:44 +08:00 |
|
cxt
|
3aa891acf6
|
Merge branch 'cxt_course' into develop
Conflicts:
app/controllers/student_work_controller.rb
app/views/praise_tread/_praise.html.erb
db/schema.rb
|
2016-04-27 16:27:55 +08:00 |
|
cxt
|
766026e3cf
|
教师评分为最终评分
|
2016-04-27 16:21:35 +08:00 |
|
yuanke
|
4258790453
|
Merge branch 'hjq_beidou' into yuanke_1
Conflicts:
db/schema.rb
public/stylesheets/project.css
|
2016-04-27 14:30:28 +08:00 |
|
cxt
|
78c7db1150
|
Merge branch 'weixin_guange' into develop
|
2016-04-27 10:36:24 +08:00 |
|
cxt
|
0222038899
|
缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息
|
2016-04-27 10:28:36 +08:00 |
|
huang
|
d8f71da1fb
|
完成模块8配置
|
2016-04-26 11:01:12 +08:00 |
|
huang
|
255d7e07bc
|
北斗新界面样式
|
2016-04-25 18:54:21 +08:00 |
|
huang
|
dae6a5ecae
|
配置八种类型更新
|
2016-04-25 16:00:52 +08:00 |
|
cxt
|
da73d2b004
|
Merge branch 'cxt_course' into develop
|
2016-04-22 12:40:20 +08:00 |