 huang
|
a0f722837b
|
精品课程加入到左模式二
|
2016-06-03 10:47:57 +08:00 |
|
huang
|
a1200a41b0
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-06-03 10:31:52 +08:00 |
|
huang
|
ca3b072f85
|
热门项目按照项目得分排序及设置界面中默认设置
|
2016-06-03 10:31:29 +08:00 |
 Tim
|
3c6c617d09
|
门户样式冲突问题
|
2016-06-03 10:08:54 +08:00 |
|
huang
|
432baebdc3
|
组织默认activite status
|
2016-06-03 09:38:24 +08:00 |
|
Tim
|
57bb2f69a4
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/views/organizations/_org_custom_right2.html.erb
|
2016-06-03 09:12:36 +08:00 |
|
Tim
|
bb9c9ddddf
|
添加链接鼠标覆盖蓝色效果
|
2016-06-03 09:11:49 +08:00 |
|
huang
|
fa03867cc2
|
样式神略问题
|
2016-06-03 08:56:54 +08:00 |
|
huang
|
6fbad6d53d
|
右二优化
|
2016-06-03 08:45:43 +08:00 |
|
Tim
|
a9ad6c05a8
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-06-03 08:42:09 +08:00 |
|
Tim
|
709ceca1a8
|
托代码改动
|
2016-06-03 08:41:14 +08:00 |
|
huang
|
257165dbaf
|
模式二中添加课程定配
|
2016-06-02 21:32:56 +08:00 |
|
huang
|
e2848f4dec
|
创建栏目时默认状态
|
2016-06-02 21:10:07 +08:00 |
|
huang
|
dc4f927c39
|
完成右二模式
|
2016-06-02 21:01:39 +08:00 |
|
huang
|
52bc4aab81
|
右二（未完）
|
2016-06-02 18:46:15 +08:00 |
|
huang
|
0b3ec0322f
|
右一模式
|
2016-06-02 18:41:00 +08:00 |
|
huang
|
76732a3034
|
新模式有一
|
2016-06-02 13:17:38 +08:00 |
|
huang
|
e5eeba90f6
|
组织精品课程，热门项目
|
2016-06-02 09:52:06 +08:00 |
|
huang
|
27a9170318
|
组织添加设为精品项目，热门课程
|
2016-06-01 17:38:41 +08:00 |
|
huang
|
b1cb4e5f94
|
完成左一的配置
|
2016-06-01 14:31:42 +08:00 |
|
huang
|
2acc545896
|
完成组织左二模式
|
2016-06-01 10:24:50 +08:00 |
|
huang
|
5c27aee2bd
|
模式二课程模块 定义公共方法（显示描述内容以省略号结束）
|
2016-06-01 09:08:08 +08:00 |
|
huang
|
9ecdf0892b
|
完成左三模式的配置
|
2016-05-31 20:45:54 +08:00 |
|
huang
|
91ae3d8b39
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
2016-05-31 18:38:05 +08:00 |
|
huang
|
a96fafd704
|
模式三（未完）
|
2016-05-31 18:37:21 +08:00 |
|
huang
|
8d56d8556f
|
完成模式6
|
2016-05-31 16:03:48 +08:00 |
|
huang
|
bb7204846f
|
新版资源类型定制模式6
|
2016-05-31 14:41:50 +08:00 |
|
huang
|
6bfe344cbf
|
组织模式一左侧权限控制
|
2016-05-31 13:59:29 +08:00 |
|
huang
|
8f897cbf89
|
组织管理员模式，二级目录局部刷新
|
2016-05-31 13:47:05 +08:00 |
|
huang
|
c369b271a0
|
组织管理员配置后的权限控制及局部刷新
|
2016-05-31 11:24:47 +08:00 |
|
huang
|
c333a0c55d
|
组织管理员提供学霸功能
|
2016-05-31 10:31:08 +08:00 |
|
huang
|
c57c575c84
|
新版组织静态页面模板
|
2016-05-30 16:24:51 +08:00 |
|
huang
|
471ed7cbd2
|
组织logo获取，添加样式图片
|
2016-05-30 14:58:46 +08:00 |
|
huang
|
81ab73e286
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/views/organizations/_org_custom_header.html.erb
|
2016-05-30 14:48:12 +08:00 |
|
huang
|
698e4bd7b3
|
header
|
2016-05-30 14:41:53 +08:00 |
|
Tim
|
9cc749bd57
|
门户样式统一，防止冲突
|
2016-05-30 14:38:57 +08:00 |
|
huang
|
46e4f2c143
|
组织新base框架
|
2016-05-30 14:23:52 +08:00 |
|
huang
|
389172e5b2
|
CSS样式
|
2016-05-30 10:45:00 +08:00 |
|
huang
|
94dd8befc8
|
Merge branch 'yuanke' into develop
|
2016-05-27 17:13:39 +08:00 |
|
huang
|
f7cb9bdffd
|
Merge branch 'cxt_course' into develop
|
2016-05-27 17:13:01 +08:00 |
|
huang
|
4a8288d720
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-27 17:12:49 +08:00 |
|
huang
|
12ac353de9
|
北斗新base
|
2016-05-27 17:08:50 +08:00 |
 yuanke
|
e650dca1ed
|
修改用户反馈中二级回复 回复框不消失的问题
|
2016-05-27 17:06:34 +08:00 |
 cxt
|
086ccedc08
|
先隐藏作业信息，再点击查询或分班后“显示作业信息”的按钮不见了
|
2016-05-27 16:45:04 +08:00 |
|
yuanke
|
98244d2a3d
|
将文章标题的颜色恢复正常
|
2016-05-27 16:42:05 +08:00 |
|
cxt
|
1535c4cd07
|
编辑分组作业时的基于项目实施总是默认选中
|
2016-05-27 15:54:55 +08:00 |
|
yuanke
|
5b7011e07b
|
Merge branch 'develop' into yuanke
|
2016-05-27 15:37:11 +08:00 |
|
yuanke
|
d08809bfbd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/project.css
|
2016-05-27 15:34:55 +08:00 |
|
yuanke
|
9d9e2ff613
|
自动识别URL正则匹配修改
|
2016-05-27 15:31:13 +08:00 |
|
huang
|
ff14809237
|
Merge branch 'cxt_course' into develop
|
2016-05-27 15:30:35 +08:00 |