 Tim
|
5c795b92ee
|
图片百分百显示； 默认大图尺寸调整
|
9 years ago |
 yuanke
|
dc53b86a4e
|
Merge branch 'cxt_course' into yuanke
Conflicts:
app/controllers/student_work_controller.rb
db/schema.rb
|
9 years ago |
|
yuanke
|
647e6a7f92
|
Merge branch 'yuanke' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
config/locales/zh.yml
db/schema.rb
|
9 years ago |
 cxt
|
451b53f3cc
|
qianyi
|
9 years ago |
|
cxt
|
d244e22066
|
rake
|
9 years ago |
 huang
|
9fbf713709
|
完成组织二级域名
|
9 years ago |
|
cxt
|
3aa891acf6
|
Merge branch 'cxt_course' into develop
Conflicts:
app/controllers/student_work_controller.rb
app/views/praise_tread/_praise.html.erb
db/schema.rb
|
9 years ago |
|
cxt
|
766026e3cf
|
教师评分为最终评分
|
9 years ago |
|
yuanke
|
c357971e8a
|
课程列表、项目列表等修改
|
9 years ago |
|
yuanke
|
4258790453
|
Merge branch 'hjq_beidou' into yuanke_1
Conflicts:
db/schema.rb
public/stylesheets/project.css
|
9 years ago |
|
cxt
|
78c7db1150
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
|
cxt
|
0222038899
|
缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息
|
9 years ago |
|
Tim
|
53e6b41d93
|
北斗登录效果调整
|
9 years ago |
|
huang
|
5d506458df
|
迁移空数据问题
|
9 years ago |
|
huang
|
cc48fb5a98
|
Merge branch 'hjq_beidou' into develop
|
9 years ago |
|
huang
|
f5a88ef6f9
|
数据库为空的迁移问题
|
9 years ago |
|
yuanke
|
81cd30cbda
|
Merge branch 'cxt_course' into yuanke_1
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
76b37d7670
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
26b1aee90d
|
修改周海芳老师四个作业的截止日期和学生得分
|
9 years ago |
|
yuanke
|
8f62cccfd6
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
dc3837da76
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
bc59ce0b60
|
Merge branch 'yuanke' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
0f5fe51f97
|
1.管理员界面代码测试列表的修改
2.代码查重按钮位置
3.查重结果样式
|
9 years ago |
|
cxt
|
0fa16251e7
|
删除学生提交的多分作品
|
9 years ago |
|
txz
|
73b89cdde5
|
微信边框，回复点赞样式更改
|
9 years ago |
|
huang
|
16bba76f61
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
6027b6d0f5
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
f1090d45ad
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
40b45ce1b4
|
版本库动态中统计改成从数据库获取
|
9 years ago |
|
yuanke
|
de0ba0fbe5
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
6444d859a7
|
迁移文件修改
|
9 years ago |
|
yuanke
|
ef4b256313
|
Merge branch 'yuanke' into develop
Conflicts:
app/models/homework_common.rb
config/locales/zh.yml
db/schema.rb
|
9 years ago |
|
yuanke
|
a8dce5e520
|
代码查重功能增加,管理员界面增加代码测试列表.
|
9 years ago |
|
cxt
|
fcddaf403c
|
删除博客为空的数据
|
9 years ago |
guange
|
aa9cb4e579
|
merge
|
9 years ago |
|
txz
|
feb0014bf8
|
作业详情页面
|
9 years ago |
|
huang
|
c408185b40
|
Merge branch 'develop_new' of http://git.trustie.net/jacknudt/trustieforge into develop_new
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
6a8a82e85a
|
删除周海芳老师2882作业的学生匿评
|
9 years ago |
|
huang
|
c431658333
|
setting中后台编辑
|
9 years ago |
|
huang
|
1ccb3a2c41
|
Merge branch 'hjq_beidou' of http://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
c6f6030e10
|
组织新样式
|
9 years ago |
|
cxt
|
893fad2b48
|
组织配置里的栏目 “排列做成可编辑的”
|
9 years ago |
|
huang
|
20ea251cab
|
添加字段
|
9 years ago |
|
Tim
|
77e11fe0fe
|
微信最新动态修改
|
9 years ago |
 Yiang Gan
|
4de598873f
|
动态和作业的api
|
9 years ago |
|
huang
|
80cd5089a4
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
9 years ago |
 ouyangxuhua
|
a69997f6c7
|
Merge branch 'develop' into ouyangxuhua
|
9 years ago |
|
cxt
|
0b0f484a5b
|
更新吴文植的分数
|
9 years ago |
|
huang
|
b8463fcca5
|
北斗
|
9 years ago |
|
ouyangxuhua
|
f4b4bf40de
|
增加显示组织显示模式字段，并且在新建组织和配置组织中能够选择
|
9 years ago |
|
huang
|
dea1c13a64
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/migrate/20160324074942_add_index_to_forge_activities.rb
|
9 years ago |
 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
|
9 years ago |
|
ouyangxuhua
|
b581a13736
|
Merge branch 'develop' into ouyangxuhua
|
9 years ago |
|
huang
|
5fd3e7d3a2
|
动态表添加索引
|
9 years ago |
|
alan
|
bd5dd24164
|
add alias name to farge_activitiy index
|
9 years ago |
|
huang
|
9cbe719c5e
|
项目动态表添加索引
|
9 years ago |
|
huang
|
a9ef2c28e2
|
项目创建类型迁移
|
9 years ago |
|
ouyangxuhua
|
675b1ad403
|
1.组织配置中，输入组织名字、子栏目域名目录后，自动变成小写字母；2.将所有子域名及域名目录改成小写；3.组织配置中，修改子栏目时，如果没有点确定，输入框的内容保持不变。
|
9 years ago |
|
huang
|
44549e091d
|
message_all表中添加type索引
|
9 years ago |
|
huang
|
e77a891bc6
|
消息查询语句优化，添加索引
|
9 years ago |
|
guange
|
6ae4cd0767
|
merge
|
9 years ago |
|
huang
|
79767f4bae
|
用户行为记录
|
9 years ago |
|
ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
9 years ago |
|
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
|
9 years ago |
|
cxt
|
4de81605a4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
42d89c7ed0
|
课程导语发送这改成课堂使者
|
9 years ago |
|
huang
|
e8e9688644
|
项目资源数目迁移
|
9 years ago |
|
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
|
9 years ago |
|
ouyangxuhua
|
a7312a6191
|
修改游客下载组织资源的权限
|
9 years ago |
|
cxt
|
f174101297
|
数据迁移
|
9 years ago |
|
cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
9 years ago |
 linchun
|
8c145c9d39
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
8079254089
|
首页增加访问统计
|
9 years ago |
 luoquan
|
1900a824e8
|
0
|
9 years ago |
|
cxt
|
9fd0951ec3
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
9 years ago |
|
cxt
|
8a4175dc02
|
点击学生作品列表中的编程作品，代码会跳到上一个作品的详情
|
9 years ago |
|
cxt
|
5b4ff5ec8a
|
学生列表中的作业积分为负分
|
9 years ago |
|
ouyangxuhua
|
a51ca428be
|
组织中，增加调整栏目显示顺序的功能
|
9 years ago |
|
huang
|
2a1eac02a9
|
Merge branch 'hjq_new_course' into szzh
|
9 years ago |
|
huang
|
d3fd445108
|
数据迁移
|
9 years ago |
|
cxt
|
d3489ec5cb
|
作业回复时间、作品提交时间、作品评阅时间加到动态的最后更新时间
|
9 years ago |
|
huang
|
f469e51202
|
课程模块/通知、作业、留言、发帖，删除的时候统计数字递减
|
9 years ago |
|
linchun
|
3e70db4e82
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
9 years ago |
|
Tim
|
1deb611ba2
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
Tim
|
ef05867e6e
|
自动生成文件
|
9 years ago |
|
cxt
|
0090c89dd1
|
数据迁移
|
9 years ago |
|
huang
|
4f2937e1a2
|
英雄榜
|
9 years ago |
|
huang
|
0a18f365ab
|
新的迁移
|
9 years ago |
|
huang
|
094af07a2f
|
数据迁移
|
9 years ago |
|
huang
|
d54609075b
|
区分新闻和新闻回复得分
|
9 years ago |
|
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
|
9 years ago |
|
huang
|
bafa151c0d
|
0
|
9 years ago |
|
huang
|
3f56fa3405
|
0
|
9 years ago |
|
huang
|
f381784a3c
|
数据迁移
|
9 years ago |
|
linchun
|
bb8a6af13e
|
admin界面添加精品课程页面，目前该页面中的精品课程是固定的
|
9 years ago |
|
cxt
|
8aff404f0c
|
题库过滤作业的搜索
|
9 years ago |
|
huang
|
085729f91b
|
课程活跃度中添加作业留言得分
|
9 years ago |
|
Tim
|
f51d16c538
|
资源库样式调整
|
9 years ago |
|
guange
|
a59f65a455
|
wechat
|
9 years ago |
|
guange
|
15d5fe127e
|
merge
|
9 years ago |
