 huang
|
9b97f7e472
|
解决用户主页关注和粉丝问题
|
9 years ago |
|
huang
|
0e1a52726f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/base_syllabus.html.erb
|
9 years ago |
|
huang
|
6fea64afe2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
537cc20e06
|
已repository_id为范围，version唯一性控制
|
9 years ago |
|
huang
|
2381a78e1b
|
提交次数比较多的项目数据迁移
|
9 years ago |
 yuanke
|
1aba4394e9
|
Merge branch 'weixin_guange' into develop
|
9 years ago |
guange
|
080b2ac2fa
|
兼容ruby2.3.1
|
9 years ago |
|
huang
|
4e4ff4958f
|
修改changeset触发事件
|
9 years ago |
|
huang
|
466a25c121
|
提交后更新项目动态表update时间
|
9 years ago |
|
huang
|
3fb5322b03
|
版本库历史数据处理
|
9 years ago |
 cxt
|
71b5fe1273
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/issues_controller.rb
app/views/issues/_issue_replies.html.erb
app/views/issues/_issue_reply_ke_form.html.erb
db/schema.rb
|
9 years ago |
|
yuanke
|
f0840d0f31
|
Merge branch 'develop' into weixin_guange
|
9 years ago |
|
huang
|
f979e80f24
|
Gitlab数据清理及迁移，主要是历史数据
|
9 years ago |
|
cxt
|
7853b8aa54
|
班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复， 二级回复代码的整合
|
9 years ago |
|
huang
|
14e6db457b
|
rake
|
9 years ago |
|
huang
|
0c0dfbd093
|
changeset关联
|
9 years ago |
|
huang
|
cf04bb5ec6
|
迁移上线
|
9 years ago |
|
huang
|
04fe06eff9
|
gitlab数据迁移
|
9 years ago |
|
huang
|
facf3ae8f8
|
提交次数写入动态中
|
9 years ago |
|
yuanke
|
f3d74fcd55
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
guange
|
51692eadd6
|
改进上线流程
|
9 years ago |
|
cxt
|
c9e0143fe8
|
作业动态的时间
|
9 years ago |
|
huang
|
87e1e0c4b1
|
rake任务，课程作业关联项目后获取最新版本库提交时间
|
9 years ago |
|
huang
|
3485d48163
|
Merge branch 'develop' into rep_quality
Conflicts:
app/controllers/quality_analysis_controller.rb
|
9 years ago |
|
huang
|
e766adf087
|
add delete to qa
|
9 years ago |
|
cxt
|
66c40ba139
|
动态的更新时间
|
9 years ago |
|
cxt
|
5d9bde3c95
|
课程发送资源到课程
|
9 years ago |
|
huang
|
6b8b20e127
|
logger to puts
|
9 years ago |
|
huang
|
b0aa3c18c3
|
Merge branch 'rep_quality' into develop
|
9 years ago |
|
huang
|
8916cc7730
|
update homeworkcommon time
|
9 years ago |
|
cxt
|
cc4b24cdb9
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
13bae8f8a5
|
线下作业
|
9 years ago |
|
huang
|
ef8b127225
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
public/javascripts/application.js
|
9 years ago |
|
cxt
|
a99b03ff76
|
管理员界面增加配置课程
|
9 years ago |
|
huang
|
f50c4a879b
|
modified total commits
|
9 years ago |
|
huang
|
74ee3205bd
|
淘宝源
|
9 years ago |
|
cxt
|
7b7f9cf8f2
|
删除wechat无用代码
|
9 years ago |
|
huang
|
4857769c49
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
fe54a19940
|
Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
Conflicts:
app/views/blogs/_article.html.erb
app/views/users/_project_boardlist.html.erb
public/stylesheets/new_user.css
|
9 years ago |
 txz
|
1b3bc38f8e
|
拖代码改动
|
9 years ago |
|
yuanke
|
708cb35fd2
|
增加一个弹框的通用接口pop_up_box
|
9 years ago |
|
huang
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
9 years ago |
|
huang
|
7759670fa1
|
Merge branch 'yuanke' into develop
Conflicts:
Gemfile
public/stylesheets/new_user.css
|
9 years ago |
|
yuanke
|
a39702f962
|
图片自动上传，代码测试编译错误过长。
|
9 years ago |
|
cxt
|
7481d96166
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/admin_controller.rb
config/routes.rb
lib/redmine.rb
|
9 years ago |
|
huang
|
922958e732
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
yuanke
|
5180fdab39
|
图片自动上传修改
|
9 years ago |
|
huang
|
43f06c0826
|
版本库ZIP下载
|
9 years ago |
|
yuanke
|
135e02504e
|
图片自动上传
|
9 years ago |
|
yuanke
|
e502aa7c43
|
KE表格项目问题，自动上传图片做了一点
|
9 years ago |
|
cxt
|
f6d7df7393
|
管理员界面添加“分享作业申请”列表
|
9 years ago |
|
cxt
|
644e097dc8
|
定时更新关联项目的作业更新时间
|
9 years ago |
|
huang
|
0a989daf31
|
Merge branch 'cxt_course' into develop
Conflicts:
app/helpers/application_helper.rb
public/stylesheets/courses.css
public/stylesheets/new_user.css
|
9 years ago |
|
cxt
|
10d26f89d9
|
作业列表的二级回复
|
9 years ago |
|
huang
|
df1c70880a
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_homework_repository.html.erb
public/stylesheets/new_user.css
|
9 years ago |
|
cxt
|
0fafbffa49
|
项目的更新加到作业的最后更新时间中
|
9 years ago |
|
yuanke
|
4258790453
|
Merge branch 'hjq_beidou' into yuanke_1
Conflicts:
db/schema.rb
public/stylesheets/project.css
|
9 years ago |
|
guange
|
cc9825e6a2
|
将wechat放到项目里面
|
9 years ago |
|
guange
|
744c04b54a
|
修改gem源
|
9 years ago |
|
huang
|
ab8c1a0bad
|
Merge branch 'hjq_beidou' into develop
|
9 years ago |
|
huang
|
cb2033c80f
|
去掉rake中输出
|
9 years ago |
|
huang
|
81f8559c48
|
gitlab版本库成员同步任务
|
9 years ago |
|
huang
|
adc17c5038
|
代码优化
文件目录动态获取接口
文件目录显示样式
|
9 years ago |
|
huang
|
7259d607dc
|
Merge branch 'hjq_beidou' into develop
|
9 years ago |
|
huang
|
41aa81f966
|
rake 任务：同步文件数
|
9 years ago |
|
yuanke
|
f1090d45ad
|
Merge branch 'cxt_course' into yuanke
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
d948536a10
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
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 |
|
huang
|
f7cb451feb
|
gitlab版本库添加提交信息统计接口
|
9 years ago |
|
huang
|
2162d7d4b8
|
组织banner上传功能
|
9 years ago |
 alan
|
1f0f7708c6
|
fix pagination bug
|
9 years ago |
|
alan
|
03d855f5d5
|
修改资源区分页问题
|
9 years ago |
|
alan
|
395fb8fae6
|
修改pagination,资源区bug
|
9 years ago |
|
yuanke
|
dea947e9ce
|
Merge branch 'develop' into yuanke
Conflicts:
db/schema.rb
public/javascripts/application.js
public/javascripts/homework.js
public/stylesheets/new_user.css
|
10 years ago |
|
yuanke
|
a10830c90f
|
Merge branch 'develop' into yuanke
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
|
guange
|
59923dfb03
|
merge
|
10 years ago |
|
huang
|
7c624cd571
|
公共资源只包括公开资源
|
10 years ago |
|
cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
10 years ago |
|
guange
|
24a278d7d6
|
加上atall
|
10 years ago |
 linchun
|
8c145c9d39
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
10 years ago |
 luoquan
|
1900a824e8
|
0
|
10 years ago |
|
huang
|
a6c7766b00
|
修复部分用户不能删除的问题
|
10 years ago |
|
linchun
|
3c66a29767
|
完善课程资源列表，完成项目资源列表
|
10 years ago |
|
linchun
|
b7f4b584f2
|
完成管理员界面课程资源列表
|
10 years ago |
|
linchun
|
bb8a6af13e
|
admin界面添加精品课程页面，目前该页面中的精品课程是固定的
|
10 years ago |
|
huang
|
a10e973c75
|
版本库配置默认分支
|
10 years ago |
|
huang
|
ed7183b1a9
|
0
|
10 years ago |
|
huang
|
929afea196
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
e62386ad65
|
版本局角色同步
|
10 years ago |
|
cxt
|
6b4be999ee
|
资源的定时发布
|
10 years ago |
|
guange
|
1f7bcbed20
|
处理导入题库标题中的换行字符
|
10 years ago |
|
guange
|
eb3644a197
|
将一堆的rake命令变为一条
|
10 years ago |
|
guange
|
609d98f8a3
|
执行task时没有代入环境变量
|
10 years ago |
|
guange
|
ed2a3c976d
|
执行task时没有代入环境变量
|
10 years ago |
|
cxt
|
184e0ee689
|
管理员界面增加项目、组织、课程、用户、作业个数的显示
|
10 years ago |
|
huang
|
655cc0d2db
|
issue截止时间邮件通知
|
10 years ago |
|
huang
|
59aa1e9c6f
|
issue截止修改
|
10 years ago |
|
huang
|
024e299817
|
gitlab同步问题
|
10 years ago |
|
huang
|
524e152b24
|
Issue截止时间到了邮件提醒
|
10 years ago |
