huang
|
f7cb451feb
|
gitlab版本库添加提交信息统计接口
|
2016-04-13 14:36:43 +08:00 |
cxt
|
fcd1684658
|
作业列表按更新时间排序 作业列表左上角添加作业的下拉列表
|
2016-04-13 11:20:38 +08:00 |
huang
|
04849659de
|
版本库统计
|
2016-04-12 16:00:54 +08:00 |
huang
|
dc0b7defa1
|
版本库show页面简化及注释
|
2016-04-12 11:10:30 +08:00 |
huang
|
23a4a29c76
|
关联项目、课程中过滤掉私有课程、项目
|
2016-04-07 14:12:24 +08:00 |
huang
|
623114dc41
|
解决删除项目的私有资源显示在我的资源中的问题
|
2016-04-06 19:02:07 +08:00 |
huang
|
a6f6f63d6d
|
图片上传添加提示
|
2016-04-06 11:05:13 +08:00 |
huang
|
2162d7d4b8
|
组织banner上传功能
|
2016-04-06 10:40:38 +08:00 |
huang
|
e4b5a4df05
|
500wenti
|
2016-04-02 00:14:48 +08:00 |
huang
|
86aecd21b9
|
上传图片
|
2016-04-01 23:56:05 +08:00 |
huang
|
0459856a2c
|
上线logo更换
|
2016-04-01 21:30:32 +08:00 |
huang
|
ac1b3338c5
|
logo图标替换
|
2016-04-01 20:10:28 +08:00 |
huang
|
218a6b9358
|
Merge branch 'hjq_beidou' of http://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-04-01 19:25:01 +08:00 |
huang
|
c00c674c34
|
Merge branch 'develop' into hjq_beidou
Conflicts:
app/controllers/organizations_controller.rb
|
2016-04-01 19:24:41 +08:00 |
huang
|
9e7c595e55
|
组织发送动态的显示
|
2016-04-01 17:23:15 +08:00 |
huang
|
a9412b959e
|
动态一致问题
|
2016-04-01 11:54:58 +08:00 |
huang
|
25da925497
|
课程列表显示内容统一
|
2016-04-01 11:38:20 +08:00 |
huang
|
92a08dc606
|
作业500问题
admin组织编辑500问题
|
2016-04-01 09:37:31 +08:00 |
huang
|
4cca290592
|
组织编辑500问题
作业列表500问题
|
2016-04-01 09:33:50 +08:00 |
huang
|
10371e8bdd
|
添加附件图片功能
|
2016-04-01 00:27:34 +08:00 |
huang
|
ebb2f30f3b
|
配置完点确定,自动跳转
|
2016-03-31 19:14:58 +08:00 |
huang
|
4797cbe65d
|
模式默认选中
|
2016-03-31 19:09:11 +08:00 |
huang
|
756a2db4aa
|
组织配置样式问题
链接more空白问题
|
2016-03-31 19:04:31 +08:00 |
huang
|
6af8c48d3b
|
Merge branch 'hjq_beidou' into develop
|
2016-03-31 17:06:30 +08:00 |
huang
|
f662bfa40b
|
组织科配置
|
2016-03-31 17:06:00 +08:00 |
huang
|
1ccb3a2c41
|
Merge branch 'hjq_beidou' of http://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
db/schema.rb
|
2016-03-31 15:25:24 +08:00 |
huang
|
c6f6030e10
|
组织新样式
|
2016-03-31 15:25:02 +08:00 |
cxt
|
893fad2b48
|
组织配置里的栏目 “排列做成可编辑的”
|
2016-03-31 15:21:40 +08:00 |
huang
|
da1438b04e
|
Merge branch 'hjq_beidou' into develop
|
2016-03-30 19:34:03 +08:00 |
huang
|
5621f01284
|
权限访问控制
|
2016-03-30 19:31:43 +08:00 |
huang
|
8f43341f81
|
新建组织为空的情况
|
2016-03-30 19:17:29 +08:00 |
huang
|
7c55356ace
|
组织新界面修改
|
2016-03-30 17:22:23 +08:00 |
linchun
|
d98eb8748e
|
修改管理员界面作业列表的截止时间为作业发布时间,并且按时间倒序排列
|
2016-03-30 14:17:12 +08:00 |
huang
|
f2106d0045
|
more链接添加,区分两种模式
|
2016-03-29 20:33:16 +08:00 |
huang
|
2728cccd41
|
Merge branch 'develop' into hjq_beidou
|
2016-03-29 16:54:44 +08:00 |
alan
|
88a4b8ce6c
|
Merge branch 'alan_develop' into develop
|
2016-03-29 16:44:06 +08:00 |
alan
|
200561da92
|
修改《私有资源公共资源中不显示》
|
2016-03-29 16:43:14 +08:00 |
yuanke
|
be1351a4d8
|
Merge branch 'yuanke' into develop
|
2016-03-29 15:56:02 +08:00 |
yuanke
|
ef5d8abf38
|
修改编程作业提示服务器出错的BUG
|
2016-03-29 15:54:44 +08:00 |
huang
|
80cd5089a4
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
2016-03-29 13:51:46 +08:00 |
ouyangxuhua
|
2275b367f4
|
在organization控制器的show方法添加layout
|
2016-03-29 13:22:18 +08:00 |
alan
|
eb1c6ccf85
|
Merge branch 'alan_develop' into develop
Conflicts:
app/views/users/_resource_share_for_orgs.html.erb
app/views/users/_resource_share_for_project_popup.html.erb
app/views/users/_resource_share_popup.html.erb
app/views/users/search_user_course.js.erb
app/views/users/search_user_org.js.erb
app/views/users/search_user_project.js.erb
|
2016-03-29 11:36:49 +08:00 |
huang
|
b80bc98fcb
|
组织首页
|
2016-03-29 11:31:58 +08:00 |
cxt
|
d1cb44cff7
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-29 10:39:51 +08:00 |
cxt
|
1daf620ed1
|
新建作品点取消时跳到我的作业页面
|
2016-03-29 10:39:44 +08:00 |
ouyangxuhua
|
a69997f6c7
|
Merge branch 'develop' into ouyangxuhua
|
2016-03-29 10:21:29 +08:00 |
alan
|
dfe9cb0c68
|
Merge branch 'develop' into alan_develop
|
2016-03-29 10:16:30 +08:00 |
alan
|
90fd52970b
|
fix bugger on 资源区
|
2016-03-29 10:15:18 +08:00 |
yuanke
|
213cf48c09
|
编程的输出和结果每行尾部的空格才用别的符号代替,中间的空格不管
|
2016-03-29 09:02:54 +08:00 |
alan
|
395fb8fae6
|
修改pagination,资源区bug
|
2016-03-28 22:37:01 +08:00 |
huang
|
b8463fcca5
|
北斗
|
2016-03-28 16:51:58 +08:00 |
huang
|
74a4e80795
|
Merge branch 'ouyangxuhua' into hjq_beidou
|
2016-03-28 15:11:37 +08:00 |
huang
|
4b6b5504ca
|
北斗框架(未完)
|
2016-03-28 14:11:40 +08:00 |
ouyangxuhua
|
f4b4bf40de
|
增加显示组织显示模式字段,并且在新建组织和配置组织中能够选择
|
2016-03-28 11:24:31 +08:00 |
huang
|
326730f6b1
|
北斗框架
|
2016-03-28 10:39:09 +08:00 |
yuanke
|
f217c9097a
|
全部正确需要提示是否提交
|
2016-03-26 15:44:28 +08:00 |
yuanke
|
88ba2bf556
|
编译错误处理
|
2016-03-26 14:59:51 +08:00 |
yuanke
|
5116d75eb7
|
编程作业空格用□表示
|
2016-03-26 14:48:57 +08:00 |
yuanke
|
e62ee2eade
|
修改评测问题
|
2016-03-26 13:44:13 +08:00 |
yuanke
|
4c47dae88b
|
Merge branch 'develop' into yuanke
|
2016-03-25 16:38:21 +08:00 |
huang
|
dea1c13a64
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/migrate/20160324074942_add_index_to_forge_activities.rb
|
2016-03-25 16:33:22 +08:00 |
alan
|
46951f7af9
|
Merge branch 'develop' into alan_develop
Conflicts:
app/views/student_work/_student_work_list.html.erb
app/views/users/_user_activities.html.erb
app/views/users/_user_message_course.html.erb
|
2016-03-25 16:16:55 +08:00 |
alan
|
4f5e083707
|
优化个人主页,缓存设置
|
2016-03-25 16:06:14 +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 |
ouyangxuhua
|
9f8ad41533
|
Merge branch 'ouyangxuhua' into develop
|
2016-03-25 15:42:37 +08:00 |
cxt
|
46a05d1000
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-25 15:37:15 +08:00 |
ouyangxuhua
|
b581a13736
|
Merge branch 'develop' into ouyangxuhua
|
2016-03-25 15:32:38 +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 |
huang
|
9549d695f6
|
讨论区局部优化
|
2016-03-25 14:29:58 +08:00 |
alan
|
aeb694a68e
|
修改《删除blog_comment时删除user_activities内容》
|
2016-03-25 13:57:00 +08:00 |
alan
|
357c60d42e
|
Merge branch 'hjq_new_course' into alan_develop
|
2016-03-25 09:36:17 +08:00 |
alan
|
7108e6d763
|
减少数据库查询字段
|
2016-03-25 09:22:05 +08:00 |
ouyangxuhua
|
2d4f5284df
|
删除的课程、项目不能被关联到组织;组织名称长度限制;组织栏目添加帖子加上栏目名称;编辑组织时,如果组织名称没变,就不需要提示;学生回复老师的作业留言,打开后,显示该学生作业;新增、编辑组织文章,需要验证标题
|
2016-03-24 17:03:51 +08:00 |
huang
|
88185b1f34
|
点击作品消息,作品展开
|
2016-03-24 15:04:50 +08:00 |
huang
|
1330f02db8
|
项目创建的动态以多态形式存入forge_activities
|
2016-03-24 12:59:03 +08:00 |
huang
|
d6f81c8978
|
课程讨论区优化
|
2016-03-24 10:41:08 +08:00 |
huang
|
f1ffd3852f
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
2016-03-24 09:37:06 +08:00 |
huang
|
185ad829cd
|
项目访问速度优化
|
2016-03-24 09:36:46 +08:00 |
ouyangxuhua
|
1579a86f9f
|
老师给学生的作品打分后,学生再次编辑,要给老师和助教发消息提示
|
2016-03-23 17:19:25 +08:00 |
alan
|
a165657915
|
Merge branch 'develop' into hjq_new_course
|
2016-03-23 14:03:41 +08:00 |
alan
|
49026f0438
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
2016-03-23 00:05:21 +08:00 |
alan
|
9273e37a5b
|
优化SQL查询:1,members与users表关联查询; 2,blogs表单查询
|
2016-03-23 00:04:53 +08:00 |
cxt
|
aa1cbcdf87
|
课程留言动态加入个人动态
|
2016-03-22 16:44:53 +08:00 |
huang
|
12efbcb9ae
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-22 15:07:25 +08:00 |
huang
|
7967066b05
|
附件添加动态发送方式改变
|
2016-03-22 15:06:54 +08:00 |
ouyangxuhua
|
675b1ad403
|
1.组织配置中,输入组织名字、子栏目域名目录后,自动变成小写字母;2.将所有子域名及域名目录改成小写;3.组织配置中,修改子栏目时,如果没有点确定,输入框的内容保持不变。
|
2016-03-22 13:51:19 +08:00 |
huang
|
478311128d
|
优化project_controller show方法
|
2016-03-22 12:42:53 +08:00 |
huang
|
341308658d
|
优化项目消息更新代码
|
2016-03-22 10:48:37 +08:00 |
huang
|
e77a891bc6
|
消息查询语句优化,添加索引
|
2016-03-21 16:36:25 +08:00 |
linchun
|
6284b8d4f9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-18 16:57:59 +08:00 |
guange
|
59923dfb03
|
merge
|
2016-03-18 16:38:21 +08:00 |
cxt
|
74e77bf347
|
题库的来源排序不可用
题库的分布时间排序
|
2016-03-18 16:23:24 +08:00 |
huang
|
2793a9a874
|
0
|
2016-03-18 15:39:39 +08:00 |
huang
|
8b09be83e0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-18 15:18:31 +08:00 |
huang
|
fc6210eada
|
资源导入,搜索条件中导入400问题
|
2016-03-18 15:17:49 +08:00 |
cxt
|
9917e802cb
|
课程推荐的资源统计
|
2016-03-18 15:15:25 +08:00 |
cxt
|
a482b76207
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-18 14:53:52 +08:00 |
cxt
|
dc4a7ee2e6
|
Merge branch 'cxt_course' into develop
|
2016-03-18 14:53:43 +08:00 |
cxt
|
e34f2e45db
|
管理员界面的课程列表和项目列表分页
|
2016-03-18 14:53:06 +08:00 |