 huang
|
3ef90a3c62
|
Merge branch 'dev_newproject' into develop
Conflicts:
db/schema.rb
|
2016-10-27 17:33:28 +08:00 |
|
huang
|
ec5645fc66
|
完成项目动态中样式别别的地方冲突问题
|
2016-10-27 14:57:12 +08:00 |
 Tim
|
e3fc304d35
|
项目动态回复栏展开更多时，回复框宽度扩展问题
|
2016-10-27 10:06:58 +08:00 |
 daiao
|
9042304794
|
项目ISSUE编辑和新建页面
|
2016-10-25 15:37:49 +08:00 |
|
daiao
|
a0ba21b397
|
新版Issue编辑和新建页面
|
2016-10-25 11:23:02 +08:00 |
 yuanke
|
bb5d957ec5
|
Merge branch 'cxt_course' into develop
|
2016-10-21 17:46:29 +08:00 |
|
yuanke
|
8e35158fe9
|
增加统计功能
|
2016-10-21 14:06:45 +08:00 |
 cxt
|
86946f9d2c
|
鼠标放在自动保存“恢复”、“不恢复”上要变成手型
|
2016-10-21 09:20:58 +08:00 |
|
yuanke
|
e802629d27
|
Merge branch 'develop' into weixin_guange
Conflicts:
app/models/student_work.rb
app/models/student_work_test.rb
app/views/blog_comments/show.html.erb
public/javascripts/homework.js
|
2016-10-20 13:28:23 +08:00 |
|
cxt
|
6109a1602b
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-10-19 18:11:02 +08:00 |
|
cxt
|
26121d895f
|
袁可 编程测试
|
2016-10-19 18:09:29 +08:00 |
|
cxt
|
e102815f60
|
个人主页
|
2016-10-19 18:03:59 +08:00 |
|
yuanke
|
b907b626a9
|
代码测试结果不全分数100分的BUG修复
|
2016-10-19 10:27:40 +08:00 |
|
yuanke
|
c0e6085e74
|
注册时登录名改为只能字母和数字、字母开头4-15长度
|
2016-10-18 14:47:06 +08:00 |
|
huang
|
fce6c407c8
|
Merge branch 'rep_quality' into dev_newproject
Conflicts:
app/controllers/projects_controller.rb
app/views/layouts/base_projects.html.erb
app/views/projects/settings/_new_edit.html.erb
public/stylesheets/css/project.css
|
2016-10-19 11:27:49 +08:00 |
|
Tim
|
ee03cda8a6
|
班级资源库弹窗样式及位置js控制
|
2016-10-15 15:34:33 +08:00 |
|
huang
|
5532ec3b86
|
Merge branch 'develop' into dev_newproject
Conflicts:
app/views/issues/index.html.erb
app/views/layouts/base_projects.html.erb
public/stylesheets/css/project.css
|
2016-10-15 10:53:01 +08:00 |
|
cxt
|
d247109819
|
编程作业提示信息
|
2016-10-14 16:44:37 +08:00 |
|
cxt
|
a1b70a7e91
|
Merge branch 'cxt_course' into develop
|
2016-10-14 16:18:12 +08:00 |
|
Tim
|
2735aca331
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-10-14 14:51:09 +08:00 |
|
Tim
|
86de58f793
|
问卷问题增加支持折行输入功能；输入随文字高度自适应js；问卷折行输入按格式输出css支持及格式调整
|
2016-10-14 14:50:51 +08:00 |
|
cxt
|
12ad7c1612
|
班级讨论区增加二级子栏目
|
2016-10-14 14:28:19 +08:00 |
|
huang
|
2126364a19
|
新版项目配置及JS
|
2016-10-12 14:13:52 +08:00 |
|
daiao
|
da630a728e
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-10-09 09:02:39 +08:00 |
|
daiao
|
b259f92381
|
一级帖子栏目默认展示5个，点击可进入详情页面，
|
2016-10-09 09:02:12 +08:00 |
|
cxt
|
b28579a3a3
|
Merge branch 'cxt_course' into develop
|
2016-09-30 14:49:57 +08:00 |
|
cxt
|
03fac1900e
|
分班
|
2016-09-28 10:00:01 +08:00 |
|
yuanke
|
89d91f69c2
|
Merge branch 'weixin_guange' into develop
|
2016-09-27 16:20:07 +08:00 |
|
yuanke
|
1620a13565
|
修改图片放大js的一个BUG
|
2016-09-27 09:13:46 +08:00 |
|
cxt
|
398a6f1da7
|
Merge branch 'cxt_course' into develop
|
2016-09-23 16:50:45 +08:00 |
|
yuanke
|
a169ad087b
|
加入分班时选择暂无返回班级列表刷新
|
2016-09-22 14:03:59 +08:00 |
|
yuanke
|
11132d3459
|
修改加入班级时选择分班后跳入页面
|
2016-09-22 10:49:53 +08:00 |
|
yuanke
|
930acd382c
|
微信图片点击调试
|
2016-09-20 15:14:48 +08:00 |
|
yuanke
|
8bb1323612
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
public/assets/wechat/edit_userinfo.html
|
2016-09-20 14:59:40 +08:00 |
|
yuanke
|
8b771a183c
|
微信分班功能
|
2016-09-20 14:58:37 +08:00 |
|
Tim
|
2856cd06d5
|
微信图片内容点击可放大
|
2016-09-20 14:42:36 +08:00 |
|
cxt
|
ba4a1c64d9
|
作业动态的重构
|
2016-09-19 17:14:14 +08:00 |
|
yuanke
|
3624d9d4ca
|
微信增加分班相关功能
|
2016-09-19 13:22:29 +08:00 |
|
yuanke
|
04a2effcee
|
微信增加分班相关
|
2016-09-18 16:12:38 +08:00 |
|
yuanke
|
016d1f4bba
|
Merge branch 'weixin_guange' into develop
|
2016-09-14 20:23:55 +08:00 |
|
yuanke
|
ede580d03a
|
微信修改一个项目点返回相关的BUG
|
2016-09-14 20:22:26 +08:00 |
|
cxt
|
1bd93904af
|
Merge branch 'cxt_course' into develop
|
2016-09-14 19:47:24 +08:00 |
|
yuanke
|
c7be9cadf1
|
Merge branch 'weixin_guange' into develop
|
2016-09-14 19:38:19 +08:00 |
|
cxt
|
a0f4cc1c0c
|
新建编程作业时的提交验证
|
2016-09-14 19:27:12 +08:00 |
|
Tim
|
ffedecab7a
|
新问题反馈样式；侧导航课程、班级名称长度js控制
|
2016-09-14 15:05:08 +08:00 |
|
cxt
|
9002844188
|
新版发布作业
|
2016-09-13 16:18:57 +08:00 |
|
yuanke
|
22da03a1e0
|
微信注册后跳入编辑资料界面，进入别的页面无姓名则跳入编辑资料界面
|
2016-09-13 13:44:26 +08:00 |
|
yuanke
|
80ab8801ce
|
Merge branch 'weixin_guange' into develop
|
2016-09-09 16:05:32 +08:00 |
|
yuanke
|
5f77c97c9d
|
课件下载功能
|
2016-09-09 15:01:46 +08:00 |
|
daiao
|
ed448f0087
|
Merge branch 'develop' into dev_shcool
Conflicts:
db/schema.rb
|
2016-09-09 09:31:17 +08:00 |