 daiao
|
6bd9f47222
|
Merge branch 'dev_shcool' into develop
Conflicts:
db/schema.rb
|
10 years ago |
 yuanke
|
283dc86a8b
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
Conflicts:
db/schema.rb
public/assets/wechat/homework_detail.html
public/javascripts/wechat/controllers/activity.js
|
10 years ago |
|
yuanke
|
6d594cfcbe
|
git pull后重新commit
|
10 years ago |
 huang
|
29edd60ce6
|
Merge branch 'daiao_dev' into dev_shcool
|
10 years ago |
guange
|
4bdb679352
|
将微信token缓存到rails体系里面
|
10 years ago |
|
yuanke
|
1ae23bafe4
|
改回原来的
|
10 years ago |
|
guange
|
6a871e2116
|
.
|
10 years ago |
|
guange
|
9d2900d58f
|
解决没绑定用户不跳转到绑定页问题
|
10 years ago |
|
guange
|
e31fbe9b50
|
解决task报错，找不到uglifier的问题
|
10 years ago |
|
huang
|
35172dab59
|
管理员界面单位申请框架
|
10 years ago |
|
huang
|
9b97f7e472
|
解决用户主页关注和粉丝问题
|
10 years ago |
|
huang
|
0e1a52726f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/base_syllabus.html.erb
|
10 years ago |
|
huang
|
6fea64afe2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
537cc20e06
|
已repository_id为范围，version唯一性控制
|
10 years ago |
|
huang
|
2381a78e1b
|
提交次数比较多的项目数据迁移
|
10 years ago |
|
yuanke
|
1aba4394e9
|
Merge branch 'weixin_guange' into develop
|
10 years ago |
|
guange
|
080b2ac2fa
|
兼容ruby2.3.1
|
10 years ago |
|
huang
|
4e4ff4958f
|
修改changeset触发事件
|
10 years ago |
|
huang
|
466a25c121
|
提交后更新项目动态表update时间
|
10 years ago |
|
huang
|
3fb5322b03
|
版本库历史数据处理
|
10 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
|
10 years ago |
|
yuanke
|
f0840d0f31
|
Merge branch 'develop' into weixin_guange
|
10 years ago |
|
huang
|
f979e80f24
|
Gitlab数据清理及迁移，主要是历史数据
|
10 years ago |
|
cxt
|
7853b8aa54
|
班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复， 二级回复代码的整合
|
10 years ago |
|
huang
|
14e6db457b
|
rake
|
10 years ago |
|
huang
|
0c0dfbd093
|
changeset关联
|
10 years ago |
|
huang
|
cf04bb5ec6
|
迁移上线
|
10 years ago |
|
huang
|
04fe06eff9
|
gitlab数据迁移
|
10 years ago |
|
huang
|
facf3ae8f8
|
提交次数写入动态中
|
10 years ago |
|
yuanke
|
f3d74fcd55
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
10 years ago |
|
guange
|
51692eadd6
|
改进上线流程
|
10 years ago |
|
cxt
|
c9e0143fe8
|
作业动态的时间
|
10 years ago |
|
huang
|
87e1e0c4b1
|
rake任务，课程作业关联项目后获取最新版本库提交时间
|
10 years ago |
|
huang
|
3485d48163
|
Merge branch 'develop' into rep_quality
Conflicts:
app/controllers/quality_analysis_controller.rb
|
10 years ago |
|
huang
|
e766adf087
|
add delete to qa
|
10 years ago |
|
cxt
|
66c40ba139
|
动态的更新时间
|
10 years ago |
|
cxt
|
5d9bde3c95
|
课程发送资源到课程
|
10 years ago |
|
huang
|
6b8b20e127
|
logger to puts
|
10 years ago |
|
huang
|
b0aa3c18c3
|
Merge branch 'rep_quality' into develop
|
10 years ago |
|
huang
|
8916cc7730
|
update homeworkcommon time
|
10 years ago |
|
cxt
|
cc4b24cdb9
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
13bae8f8a5
|
线下作业
|
10 years ago |
|
huang
|
ef8b127225
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
public/javascripts/application.js
|
10 years ago |
|
cxt
|
a99b03ff76
|
管理员界面增加配置课程
|
10 years ago |
|
huang
|
f50c4a879b
|
modified total commits
|
10 years ago |
|
huang
|
74ee3205bd
|
淘宝源
|
10 years ago |
|
cxt
|
7b7f9cf8f2
|
删除wechat无用代码
|
10 years ago |
|
huang
|
4857769c49
|
Merge branch 'yuanke' into develop
|
10 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
|
10 years ago |
 txz
|
1b3bc38f8e
|
拖代码改动
|
10 years ago |
