 cxt
|
07b97c8eb9
|
学生列表增加删除功能、删除学生时删除其对应的作品
|
2016-11-11 13:58:07 +08:00 |
 yuanke
|
44724c6905
|
弹框BUG修改
|
2016-11-04 21:07:57 +08:00 |
|
yuanke
|
d71ebb08b0
|
弹框BUG修复
|
2016-11-04 20:29:18 +08:00 |
|
yuanke
|
9ef8f0f612
|
弹框BUG修改
|
2016-11-04 18:59:48 +08:00 |
|
cxt
|
78ca68b5e3
|
Merge branch 'cxt_course' into develop
Conflicts:
public/stylesheets/css/moduel.css
public/stylesheets/css/public.css
|
2016-11-04 16:15:56 +08:00 |
|
cxt
|
d762c68f7b
|
分组作业的页面显示和评分处理调整
|
2016-11-04 16:10:13 +08:00 |
|
cxt
|
54f45f18a5
|
匿评设置的调整
|
2016-11-02 15:19:17 +08:00 |
|
yuanke
|
93ed72fb59
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-10-28 15:57:53 +08:00 |
 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 |
|
cxt
|
51e422c1a6
|
个人留言、课程留言的主留言增加自动保存
|
2016-10-26 16:12:51 +08:00 |
|
yuanke
|
8e35158fe9
|
增加统计功能
|
2016-10-21 14:06:45 +08:00 |
|
cxt
|
86946f9d2c
|
鼠标放在自动保存“恢复”、“不恢复”上要变成手型
|
2016-10-21 09:20:58 +08:00 |
|
Tim
|
ee03cda8a6
|
班级资源库弹窗样式及位置js控制
|
2016-10-15 15:34:33 +08:00 |
|
Tim
|
86de58f793
|
问卷问题增加支持折行输入功能；输入随文字高度自适应js；问卷折行输入按格式输出css支持及格式调整
|
2016-10-14 14:50:51 +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
|
ba4a1c64d9
|
作业动态的重构
|
2016-09-19 17:14:14 +08:00 |
 daiao
|
3dc0e8407a
|
Merge branch 'develop' into dev_shcool
Conflicts:
app/views/organizations/_org_member_list.html.erb
app/views/organizations/setting.html.erb
app/views/users/_project_news.html.erb
|
2016-09-05 13:47:39 +08:00 |
|
cxt
|
aaefd8b4aa
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_news_replies.html.erb
|
2016-09-02 15:24:55 +08:00 |
|
daiao
|
27ad94eac2
|
组织配置界面，成员列表分页
|
2016-09-02 13:25:01 +08:00 |
|
huang
|
52a8a64a69
|
项目隐藏 项目讨论区发送中去掉课程
|
2016-09-01 10:48:13 +08:00 |
|
cxt
|
a8575f2a15
|
暂时隐藏个人名片
|
2016-08-31 14:08:19 +08:00 |
|
cxt
|
6eb518c465
|
Merge branch 'cxt_course' into develop
Conflicts:
app/helpers/application_helper.rb
app/views/at/show.json.erb
app/views/layouts/new_base_user.html.erb
|
2016-08-26 16:23:07 +08:00 |
|
Tim
|
a8f30fe85f
|
个人主页，课程，项目头像、logo增加编辑按钮
|
2016-08-26 11:31:54 +08:00 |
|
yuanke
|
82779c99ea
|
字符串去掉空白时，空格不去掉。
|
2016-08-26 09:59:00 +08:00 |
|
Tim
|
083d5453d4
|
加入课程、项目弹框，在内容部分不能拖拽
|
2016-08-13 10:00:31 +08:00 |
|
cxt
|
0ed508a887
|
题库预览弹窗的调整
|
2016-08-09 17:09:36 +08:00 |
|
cxt
|
9594aada50
|
Merge branch 'cxt_course' into develop
Conflicts:
public/javascripts/application.js
|
2016-08-09 16:42:23 +08:00 |
|
cxt
|
fc3df1c26f
|
题库预览弹框的样式调整
|
2016-08-09 16:38:17 +08:00 |
|
Tim
|
cd30f94d72
|
题库发送预览弹框位置及可拖拽js更新
|
2016-08-05 18:01:11 +08:00 |
|
cxt
|
e7e873e0df
|
Merge branch 'dev_shcool' into develop
Conflicts:
app/helpers/users_helper.rb
|
2016-08-05 16:32:10 +08:00 |
|
cxt
|
3178700131
|
Merge branch 'cxt_course' into develop
|
2016-08-05 16:14:56 +08:00 |
|
cxt
|
0d86a28c54
|
我的作业
|
2016-08-05 16:12:53 +08:00 |
|
Tim
|
82644bcd81
|
加入班级、项目弹框可拖拽
|
2016-08-05 14:36:01 +08:00 |
|
Tim
|
28a29fa724
|
拖拽删除
|
2016-08-04 16:50:33 +08:00 |
|
daiao
|
5f969c6593
|
单位审核相关Bug修复
|
2016-08-03 10:36:03 +08:00 |
|
Tim
|
08b8e3f1cb
|
加入班级，项目弹框定位js重写
|
2016-08-01 15:21:23 +08:00 |
|
daiao
|
39478eb4e4
|
Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool
Conflicts:
app/views/admin/applied_schools.html.erb
app/views/admin/has_applied_schools.html.erb
|
2016-07-29 21:50:19 +08:00 |
|
yuanke
|
1f47eb5ea8
|
单位申请列表修改
|
2016-07-29 21:19:09 +08:00 |
|
huang
|
c07677ef99
|
项目邀请框架 拒绝消息
|
2016-07-29 14:49:37 +08:00 |
|
huang
|
4a9eec0cce
|
完成项目邀请及公共弹框的封装
|
2016-07-28 14:42:36 +08:00 |
|
huang
|
463c09f02c
|
项目邀请弹框
|
2016-07-26 08:55:07 +08:00 |
|
cxt
|
60bbe89c0d
|
博客的自动保存
|
2016-07-21 14:05:15 +08:00 |
|
cxt
|
fdf925a0b8
|
个人主页留言动态：如图回复当前用户自己的留言却不能删除，“展开回复”后又可删除了，刷新网页后又删除不了
|
2016-07-18 16:40:04 +08:00 |
|
cxt
|
e19efc1c8a
|
博客的二级回复
|
2016-07-14 14:44:47 +08:00 |
|
cxt
|
5d9bde3c95
|
课程发送资源到课程
|
2016-07-11 15:10:55 +08:00 |
|
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 |