 huang
|
3501d6f1d6
|
完成组织模块的开发
|
2016-04-07 17:05:22 +08:00 |
|
huang
|
2162d7d4b8
|
组织banner上传功能
|
2016-04-06 10:40:38 +08:00 |
|
huang
|
86aecd21b9
|
上传图片
|
2016-04-01 23:56:05 +08:00 |
|
huang
|
8f4ff2bf91
|
列表样式问题
|
2016-04-01 10:20:31 +08:00 |
|
huang
|
5866dfb7ff
|
登录
没内容more
logo不加链接
|
2016-03-31 20:12:20 +08:00 |
|
huang
|
45343a44b8
|
修改链接
|
2016-03-31 17:13:40 +08:00 |
|
huang
|
f662bfa40b
|
组织科配置
|
2016-03-31 17:06:00 +08:00 |
|
huang
|
c431658333
|
setting中后台编辑
|
2016-03-31 16:19:59 +08:00 |
|
huang
|
0244008b32
|
一些链接和样式
|
2016-03-30 17:33:22 +08:00 |
|
huang
|
7c55356ace
|
组织新界面修改
|
2016-03-30 17:22:23 +08:00 |
|
huang
|
961a264e05
|
创建时间统一date
|
2016-03-29 19:04:51 +08:00 |
|
huang
|
65e80b1978
|
用户图像样式
|
2016-03-29 18:25:16 +08:00 |
|
huang
|
2728cccd41
|
Merge branch 'develop' into hjq_beidou
|
2016-03-29 16:54:44 +08:00 |
|
huang
|
d28a46c48a
|
北斗资源库板块
|
2016-03-29 16:45:14 +08:00 |
 ouyangxuhua
|
74d8dffc14
|
发送功能样式调整
|
2016-03-29 16:07:00 +08:00 |
|
ouyangxuhua
|
9e599da365
|
组织动态，点击展开更多没有反应问题解决
|
2016-03-29 15:47:05 +08:00 |
|
huang
|
80cd5089a4
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
2016-03-29 13:51:46 +08:00 |
|
huang
|
2b9ddf3594
|
组织新版
|
2016-03-29 13:43:28 +08:00 |
|
huang
|
b80bc98fcb
|
组织首页
|
2016-03-29 11:31:58 +08:00 |
|
ouyangxuhua
|
a69997f6c7
|
Merge branch 'develop' into ouyangxuhua
|
2016-03-29 10:21:29 +08:00 |
 yuanke
|
213cf48c09
|
编程的输出和结果每行尾部的空格才用别的符号代替,中间的空格不管
|
2016-03-29 09:02:54 +08:00 |
|
ouyangxuhua
|
1a1d5b4c49
|
解决：发送功能在中文输入的情况下，会出现输入框内容增多的问题
|
2016-03-28 19:20:09 +08:00 |
|
huang
|
4b6b5504ca
|
北斗框架（未完）
|
2016-03-28 14:11:40 +08:00 |
|
yuanke
|
5116d75eb7
|
编程作业空格用□表示
|
2016-03-26 14:48:57 +08:00 |
|
yuanke
|
e62ee2eade
|
修改评测问题
|
2016-03-26 13:44:13 +08:00 |
|
yuanke
|
63ae921c40
|
return 放错位置了
|
2016-03-25 17:07:06 +08:00 |
|
yuanke
|
674b63d106
|
Merge branch 'develop' into yuanke
Conflicts:
app/views/student_work/_programing_work_show.html.erb
|
2016-03-25 15:59:49 +08:00 |
|
yuanke
|
3c1be19702
|
修改编程提示语句
|
2016-03-25 15:41:14 +08:00 |
|
yuanke
|
1f9d2ceffb
|
修改下编程的提示
|
2016-03-25 15:38:14 +08:00 |
 cxt
|
46a05d1000
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-25 15:37:15 +08:00 |
|
yuanke
|
0fd164d2bb
|
修改编程的几个提示语句
|
2016-03-25 15:24:31 +08:00 |
|
yuanke
|
3af257eb77
|
评测服务器有问题时得提示
|
2016-03-25 15:18:33 +08:00 |
|
yuanke
|
dea947e9ce
|
Merge branch 'develop' into yuanke
Conflicts:
db/schema.rb
public/javascripts/application.js
public/javascripts/homework.js
public/stylesheets/new_user.css
|
2016-03-25 14:58:17 +08:00 |
|
yuanke
|
c6361406b5
|
代码评测超时优化
|
2016-03-25 14:43:51 +08:00 |
|
ouyangxuhua
|
5cc31fb511
|
组织资源栏目排序，带过滤条件，如tag类型、搜索条件等
|
2016-03-25 12:30:33 +08:00 |
|
ouyangxuhua
|
2d4f5284df
|
删除的课程、项目不能被关联到组织；组织名称长度限制；组织栏目添加帖子加上栏目名称；编辑组织时，如果组织名称没变，就不需要提示；学生回复老师的作业留言，打开后，显示该学生作业；新增、编辑组织文章，需要验证标题
|
2016-03-24 17:03:51 +08:00 |
|
cxt
|
f90b25b230
|
作业附件的用户名省略号太早
|
2016-03-22 15:50:06 +08:00 |
|
yuanke
|
a10830c90f
|
Merge branch 'develop' into yuanke
Conflicts:
public/stylesheets/new_user.css
|
2016-03-21 14:40:47 +08:00 |
 guange
|
59923dfb03
|
merge
|
2016-03-18 16:38:21 +08:00 |
|
guange
|
b356c6cd1f
|
答案提交加入超时处理
|
2016-03-18 15:40:02 +08:00 |
|
cxt
|
d2bff21de5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-18 15:39:27 +08:00 |
|
cxt
|
54a00ca867
|
题库作业信息框的样式调整
|
2016-03-18 15:39:20 +08:00 |
|
huang
|
51bd745b8d
|
课程讨论区限制改成20000
|
2016-03-18 13:39:28 +08:00 |
|
ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
2016-03-17 16:18:30 +08:00 |
|
huang
|
7e0aa44b68
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_user_message_userfeedaback.html.erb
|
2016-03-17 16:06:36 +08:00 |
|
huang
|
28cb1755d8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/files/_org_subfield_list.html.erb
db/schema.rb
|
2016-03-17 16:06:05 +08:00 |
|
cxt
|
6b8ae56ce4
|
Merge branch 'alan_develop' into develop
|
2016-03-17 16:04:06 +08:00 |
|
cxt
|
d72aa3a93c
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/homework_common_controller.rb
app/views/student_work/show.js.erb
public/javascripts/application.js
public/stylesheets/base.css
public/stylesheets/public_new.css
|
2016-03-17 15:27:52 +08:00 |
|
cxt
|
a8780be9b4
|
提交作品、提交作业、发布课程帖子、组织文章实现每隔10秒自动保存帖子
|
2016-03-17 15:03:34 +08:00 |
 alan
|
9265186307
|
修改user动态中issue行高，使之与project中的一样
|
2016-03-17 14:36:05 +08:00 |