 huang
|
ef8b127225
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
public/javascripts/application.js
|
2016-07-08 11:33:51 +08:00 |
 yuanke
|
06f7594680
|
Merge branch 'yuanke' into develop
|
2016-07-08 09:15:55 +08:00 |
 cxt
|
37dd447fcb
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
app/views/admin/courses.html.erb
public/stylesheets/new_user.css
|
2016-07-07 15:14:11 +08:00 |
|
cxt
|
da7509f64c
|
课程大纲的优化
|
2016-07-07 15:04:57 +08:00 |
|
cxt
|
a99b03ff76
|
管理员界面增加配置课程
|
2016-07-07 09:02:41 +08:00 |
|
yuanke
|
6fe8d7ddf5
|
点击图片弹框右下角统一用“关闭”
|
2016-07-06 16:03:50 +08:00 |
|
cxt
|
c5840d75da
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
db/schema.rb
|
2016-07-05 16:49:50 +08:00 |
|
yuanke
|
da19bbd3a0
|
优化了下修改资料界面的代码
|
2016-07-05 09:02:34 +08:00 |
|
cxt
|
cc649ae64b
|
课程讨论区、项目讨论区、帖子详情页面的二级回复
|
2016-07-04 14:14:51 +08:00 |
|
cxt
|
e834d09469
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-07-01 17:52:29 +08:00 |
|
cxt
|
0ff8f0a774
|
课程大纲的删除和课程大纲描述的删除
|
2016-07-01 16:25:52 +08:00 |
|
cxt
|
bdaa9983e3
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-07-01 11:30:24 +08:00 |
|
cxt
|
2c1e0f534c
|
课程大纲
|
2016-07-01 11:11:53 +08:00 |
|
cxt
|
ac4218bfb0
|
课程大纲列表
|
2016-06-30 15:36:46 +08:00 |
|
cxt
|
e066445036
|
课程大纲的显示和编辑
|
2016-06-29 10:45:56 +08:00 |
|
cxt
|
383483de26
|
课程大纲的左侧栏base，新建课程大纲、新建班级的调整
|
2016-06-28 15:13:04 +08:00 |
 guange
|
e9f280b4aa
|
.
|
2016-06-28 11:07:15 +08:00 |
|
guange
|
047903ddff
|
重构课程地址
|
2016-06-28 10:57:58 +08:00 |
|
guange
|
1e6454efc0
|
加入我的资源
|
2016-06-27 17:24:06 +08:00 |
|
guange
|
5477c794ba
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-06-27 16:03:55 +08:00 |
|
guange
|
3b383dfa65
|
老师课程界面
|
2016-06-27 16:03:07 +08:00 |
|
yuanke
|
ab99645148
|
Merge branch 'yuanke' into develop
|
2016-06-27 15:52:01 +08:00 |
|
yuanke
|
dd397a060b
|
修改删除组织成员跨域的BUG
|
2016-06-27 15:48:33 +08:00 |
|
guange
|
05f09c4595
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-06-27 11:09:31 +08:00 |
|
guange
|
c501af70ba
|
.
|
2016-06-27 11:09:25 +08:00 |
|
cxt
|
4f342142e6
|
组织文章的展开更多
|
2016-06-24 17:58:50 +08:00 |
|
cxt
|
0611ddcc43
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
2016-06-24 16:54:19 +08:00 |
|
guange
|
2c2e1892e5
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-06-24 16:53:58 +08:00 |
|
guange
|
c39a982093
|
二维码
|
2016-06-24 16:51:40 +08:00 |
|
cxt
|
eab000306c
|
动态回复的展开更多、收起，组织文章回复不可用
|
2016-06-24 16:38:36 +08:00 |
|
cxt
|
d558a4d357
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-24 16:12:31 +08:00 |
 Tim
|
a542ba46a4
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-24 15:55:07 +08:00 |
|
Tim
|
ec33569033
|
取消拖拽
|
2016-06-24 15:54:56 +08:00 |
|
cxt
|
260759e4db
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-24 15:36:03 +08:00 |
|
guange
|
da09983f9e
|
Merge branch 'weixin_guange' into cxt_course
|
2016-06-24 15:34:32 +08:00 |
|
cxt
|
ac629440b1
|
课程邀请码
|
2016-06-24 15:33:45 +08:00 |
|
yuanke
|
c6be37020f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
2016-06-24 15:11:52 +08:00 |
|
guange
|
485d0e3743
|
ticket处理
|
2016-06-24 14:59:50 +08:00 |
|
yuanke
|
86a5eccae6
|
组织设置中添加成员BUG解决
|
2016-06-24 14:16:39 +08:00 |
|
guange
|
e21f4e0b4d
|
merge
|
2016-06-24 13:52:11 +08:00 |
|
guange
|
f9075e08ba
|
merge
|
2016-06-24 13:35:26 +08:00 |
|
guange
|
d348981721
|
加入邀请码
|
2016-06-24 13:29:36 +08:00 |
|
guange
|
52d4d36097
|
邀请码页面
|
2016-06-24 09:01:12 +08:00 |
|
Tim
|
563fb3b459
|
控制table拖拽不靠在一起
|
2016-06-23 14:58:40 +08:00 |
|
cxt
|
126bf9c195
|
个人留言、课程留言的二级回复
|
2016-06-23 14:47:22 +08:00 |
|
guange
|
7700445c17
|
加入课程
|
2016-06-22 16:42:20 +08:00 |
|
guange
|
13273d02de
|
修正了安全问题，不暴露openid
|
2016-06-22 12:11:34 +08:00 |
|
guange
|
5a8de44c43
|
添加我的班级控制器
|
2016-06-20 19:42:51 +08:00 |
|
guange
|
b4a3d4a5a2
|
弹出框处理
|
2016-06-20 16:04:38 +08:00 |
|
Tim
|
3548c23aad
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-20 15:43:15 +08:00 |