guange
|
a2ba65956c
|
.
|
2016-07-07 15:03:45 +08:00 |
yuanke
|
3a6470b1f3
|
删除班级时增加提示确定信息
|
2016-07-07 14:55:41 +08:00 |
guange
|
7859bf9c32
|
.
|
2016-07-07 14:51:54 +08:00 |
guange
|
a17a6ed596
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-07 14:35:26 +08:00 |
guange
|
10789d2505
|
added alert2
|
2016-07-07 14:35:15 +08:00 |
yuanke
|
9d46040f7a
|
课程列表 + - 按钮增加效果,资源发送界面课程列表显示和课程列表界面保持一直
|
2016-07-06 17:08:22 +08:00 |
yuanke
|
b994e786ab
|
我的动态中三类动态之间切换的效果
|
2016-07-06 11:06:32 +08:00 |
yuanke
|
d49bc8b114
|
发送课程的时候提示语修改
|
2016-07-05 14:44:50 +08:00 |
guange
|
373e3d3422
|
merge
|
2016-07-04 17:06:26 +08:00 |
guange
|
48fb02a2d6
|
管理课程
|
2016-07-04 17:04:06 +08:00 |
yuanke
|
9d0b5789d9
|
1.修改我的动态博客详情页面显示不了的BUG 2.资源界面切换是暂无XX先隐藏 3. 发送资源不选择班级的提示修改
|
2016-07-04 16:50:49 +08:00 |
guange
|
60367415fa
|
新建课程功能完成
|
2016-07-04 16:19:05 +08:00 |
guange
|
3c295ba5a1
|
merge
|
2016-07-04 10:54:03 +08:00 |
guange
|
201abd6358
|
assets
|
2016-07-03 00:08:51 +08:00 |
guange
|
b010ce2e61
|
发送课程完成
|
2016-07-02 23:46:45 +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 |
guange
|
0bb5c8b5fb
|
注册绑定问题
|
2016-06-29 21:09:49 +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 |