 huang
|
1685449381
|
二级目录框架及结构
|
2016-04-28 17:36:29 +08:00 |
|
huang
|
9fbf713709
|
完成组织二级域名
|
2016-04-27 17:02:44 +08:00 |
|
huang
|
f5a88ef6f9
|
数据库为空的迁移问题
|
2016-04-24 10:52:29 +08:00 |
|
huang
|
40b45ce1b4
|
版本库动态中统计改成从数据库获取
|
2016-04-15 12:24:54 +08:00 |
|
huang
|
c408185b40
|
Merge branch 'develop_new' of http://git.trustie.net/jacknudt/trustieforge into develop_new
Conflicts:
db/schema.rb
|
2016-04-05 11:25:25 +08:00 |
 cxt
|
6a8a82e85a
|
删除周海芳老师2882作业的学生匿评
|
2016-04-05 11:23:50 +08:00 |
|
cxt
|
893fad2b48
|
组织配置里的栏目 “排列做成可编辑的”
|
2016-03-31 15:21:40 +08:00 |
|
huang
|
20ea251cab
|
添加字段
|
2016-03-31 14:01:09 +08:00 |
 ouyangxuhua
|
a69997f6c7
|
Merge branch 'develop' into ouyangxuhua
|
2016-03-29 10:21:29 +08:00 |
|
cxt
|
0b0f484a5b
|
更新吴文植的分数
|
2016-03-29 09:50:37 +08:00 |
|
ouyangxuhua
|
f4b4bf40de
|
增加显示组织显示模式字段，并且在新建组织和配置组织中能够选择
|
2016-03-28 11:24:31 +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 |
|
ouyangxuhua
|
b581a13736
|
Merge branch 'develop' into ouyangxuhua
|
2016-03-25 15:32:38 +08:00 |
|
huang
|
5fd3e7d3a2
|
动态表添加索引
|
2016-03-25 11:13:42 +08:00 |
|
alan
|
bd5dd24164
|
add alias name to farge_activitiy index
|
2016-03-25 10:55:08 +08:00 |
|
huang
|
9cbe719c5e
|
项目动态表添加索引
|
2016-03-24 16:44:54 +08:00 |
|
huang
|
a9ef2c28e2
|
项目创建类型迁移
|
2016-03-24 13:57:52 +08:00 |
|
ouyangxuhua
|
675b1ad403
|
1.组织配置中，输入组织名字、子栏目域名目录后，自动变成小写字母；2.将所有子域名及域名目录改成小写；3.组织配置中，修改子栏目时，如果没有点确定，输入框的内容保持不变。
|
2016-03-22 13:51:19 +08:00 |
|
huang
|
44549e091d
|
message_all表中添加type索引
|
2016-03-21 16:54:12 +08:00 |
|
huang
|
e77a891bc6
|
消息查询语句优化，添加索引
|
2016-03-21 16:36:25 +08:00 |
|
huang
|
79767f4bae
|
用户行为记录
|
2016-03-17 17:22:07 +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
|
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 |
|
huang
|
42d89c7ed0
|
课程导语发送这改成课堂使者
|
2016-03-17 15:12:28 +08:00 |
|
huang
|
e8e9688644
|
项目资源数目迁移
|
2016-03-16 14:18:57 +08:00 |
|
ouyangxuhua
|
098844a910
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/helpers/application_helper.rb
app/views/organizations/_org_course_homework.html.erb
app/views/organizations/_org_course_news.html.erb
app/views/organizations/_org_project_issue.html.erb
app/views/organizations/_project_message.html.erb
app/views/organizations/_show_org_document.html.erb
app/views/users/_user_message_course.html.erb
|
2016-03-15 13:40:33 +08:00 |
|
ouyangxuhua
|
a7312a6191
|
修改游客下载组织资源的权限
|
2016-03-14 14:43:30 +08:00 |
|
cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
2016-03-11 19:43:36 +08:00 |
|
huang
|
8079254089
|
首页增加访问统计
|
2016-03-11 15:51:45 +08:00 |
 luoquan
|
1900a824e8
|
0
|
2016-03-11 14:39:17 +08:00 |
|
cxt
|
9fd0951ec3
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-03-10 14:52:23 +08:00 |
|
cxt
|
8a4175dc02
|
点击学生作品列表中的编程作品，代码会跳到上一个作品的详情
|
2016-03-10 11:40:56 +08:00 |
|
ouyangxuhua
|
a51ca428be
|
组织中，增加调整栏目显示顺序的功能
|
2016-03-09 18:06:28 +08:00 |
|
huang
|
2a1eac02a9
|
Merge branch 'hjq_new_course' into szzh
|
2016-03-09 15:28:28 +08:00 |
|
huang
|
d3fd445108
|
数据迁移
|
2016-03-09 15:27:50 +08:00 |
|
cxt
|
d3489ec5cb
|
作业回复时间、作品提交时间、作品评阅时间加到动态的最后更新时间
|
2016-03-09 11:15:43 +08:00 |
|
huang
|
0a18f365ab
|
新的迁移
|
2016-03-05 08:00:56 +08:00 |
|
huang
|
094af07a2f
|
数据迁移
|
2016-03-05 04:22:01 +08:00 |
|
huang
|
d54609075b
|
区分新闻和新闻回复得分
|
2016-03-05 04:01:10 +08:00 |
|
huang
|
6ceb4f4549
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/models/course_contributor_score.rb
app/views/organizations/_org_course_homework.html.erb
app/views/users/_homework_search_input.html.erb
app/views/users/_show_user_homeworks.html.erb
app/views/users/_user_homework_detail.html.erb
app/views/users/_user_homework_form.html.erb
app/views/users/user_homework_type.js.erb
app/views/users/user_homeworks.html.erb
app/views/users/user_homeworks.js.erb
|
2016-03-05 03:17:47 +08:00 |
|
huang
|
bafa151c0d
|
0
|
2016-03-05 03:16:04 +08:00 |
|
huang
|
f381784a3c
|
数据迁移
|
2016-03-05 03:13:58 +08:00 |
|
huang
|
085729f91b
|
课程活跃度中添加作业留言得分
|
2016-03-03 18:51:28 +08:00 |
|
cxt
|
c93b4d109a
|
作业动态添加子菜单：公开作品/取消公开
|
2016-02-25 16:18:24 +08:00 |
|
cxt
|
2aa0fefa1c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-02-24 16:08:38 +08:00 |
|
cxt
|
72c3fa1166
|
某个学生分数异常
|
2016-02-24 16:05:16 +08:00 |
|
ouyangxuhua
|
11231d0ff9
|
1.解决组织配置报500的错误；2.增加转发表
|
2016-02-24 16:01:32 +08:00 |
|
ouyangxuhua
|
3eb7c62b85
|
组织子域名迁移
|
2016-02-23 17:09:33 +08:00 |
|
ouyangxuhua
|
16efcafe77
|
注释迁移
|
2016-02-23 16:55:25 +08:00 |