 yuanke
|
d38ce793bd
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-08 16:23:29 +08:00 |
|
yuanke
|
bb62ba40b7
|
修改微信权限问题、管理课程界面等
|
2016-07-08 16:23:07 +08:00 |
 txz
|
ed39b4b4f1
|
动态：创建班级；学生进入资源也显示课件；已有班级和新增班级颜色区分
|
2016-07-08 11:29:33 +08:00 |
 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
|
9eee510649
|
新建课程时创建的班级设为私有
|
2016-07-06 16:23:12 +08:00 |
|
yuanke
|
796c5d5666
|
修改课程列表还显示已删除班级的BUG
|
2016-07-06 15:58:10 +08:00 |
|
yuanke
|
b994e786ab
|
我的动态中三类动态之间切换的效果
|
2016-07-06 11:06:32 +08:00 |
|
yuanke
|
d49bc8b114
|
发送课程的时候提示语修改
|
2016-07-05 14:44:50 +08:00 |
|
txz
|
7a9665bbee
|
微信详情页面样式调整
|
2016-07-05 11:18:58 +08:00 |
|
txz
|
8a59623a73
|
项目问题，项目讨论区，博客，留言详情页面样式更新
|
2016-07-05 10:15:32 +08:00 |
|
txz
|
64a1d197ee
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-04 17:06:47 +08:00 |
|
txz
|
3066a564bd
|
课程作业详情页面样式更新
|
2016-07-04 17:06:43 +08:00 |
|
guange
|
373e3d3422
|
merge
|
2016-07-04 17:06:26 +08:00 |
|
guange
|
48fb02a2d6
|
管理课程
|
2016-07-04 17:04:06 +08:00 |
|
yuanke
|
08f263128c
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-04 16:53:10 +08:00 |
|
yuanke
|
9d0b5789d9
|
1.修改我的动态博客详情页面显示不了的BUG 2.资源界面切换是暂无XX先隐藏 3. 发送资源不选择班级的提示修改
|
2016-07-04 16:50:49 +08:00 |
|
txz
|
45b824938e
|
课程讨论区与课程通知详情页面样式更新
|
2016-07-04 16:41:41 +08:00 |
|
guange
|
60367415fa
|
新建课程功能完成
|
2016-07-04 16:19:05 +08:00 |
|
txz
|
bd1aae07fd
|
微信动态页面样式更新
|
2016-07-04 14:43:51 +08:00 |
|
guange
|
3c295ba5a1
|
merge
|
2016-07-04 10:54:03 +08:00 |
|
guange
|
2c13184d9d
|
修改js引用
|
2016-07-04 10:52:32 +08:00 |
|
guange
|
201abd6358
|
assets
|
2016-07-03 00:08:51 +08:00 |
|
guange
|
06733b17a0
|
ignore accesstoken
|
2016-07-03 00:07:55 +08:00 |
|
guange
|
b010ce2e61
|
发送课程完成
|
2016-07-02 23:46:45 +08:00 |
|
yuanke
|
3159d16917
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-01 21:39:14 +08:00 |
 huang
|
3737ef40d0
|
Merge branch 'cxt_course' into develop
Conflicts:
public/stylesheets/courses.css
|
2016-07-01 21:39:29 +08:00 |
|
yuanke
|
447e624f36
|
课程大纲bug修复
|
2016-07-01 21:38:37 +08:00 |
|
huang
|
d346679eaf
|
Merge branch 'rep_quality' into develop
|
2016-07-01 21:34:49 +08:00 |
|
txz
|
6ac7d322b9
|
some added
|
2016-07-01 21:31:50 +08:00 |
|
yuanke
|
62a7d56c97
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-01 20:39:17 +08:00 |
|
yuanke
|
70e26927cb
|
班级中的课程字样改为班级
|
2016-07-01 20:38:33 +08:00 |
|
huang
|
171130ed74
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-01 20:28:51 +08:00 |
|
huang
|
641b1531b5
|
Merge branch 'rep_quality' into develop
|
2016-07-01 20:28:30 +08:00 |
|
txz
|
61b5a100eb
|
delete log messages
|
2016-07-01 20:25:58 +08:00 |
|
txz
|
134aa55e04
|
authoriod
|
2016-07-01 20:16:06 +08:00 |
|
yuanke
|
bc30f1128e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-01 20:06:53 +08:00 |
|
yuanke
|
1bfb2918f0
|
KE间距改回原来的，修改课程大纲附件删除下载问题，修改博客标题与置顶样式问题
|
2016-07-01 20:06:12 +08:00 |
|
txz
|
8cc4b7a878
|
public questions
|
2016-07-01 20:00:23 +08:00 |
|
Tim
|
28c20c966e
|
查看标签页面显示bug
|
2016-07-01 19:28:55 +08:00 |
|
huang
|
67cad6fc25
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-01 17:54:38 +08:00 |
|
huang
|
374a905d1e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-01 17:53:47 +08:00 |
|
huang
|
e74a2ba275
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2016-07-01 17:53:29 +08:00 |
|
huang
|
2a048b86f2
|
Merge branch 'rep_quality' into develop
|
2016-07-01 17:52:45 +08:00 |
 cxt
|
b1a77a036b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-01 17:52:35 +08:00 |
|
cxt
|
e834d09469
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-07-01 17:52:29 +08:00 |