 huang
|
c07677ef99
|
项目邀请框架 拒绝消息
|
9 years ago |
 cxt
|
a1a2b3dd33
|
Merge branch 'rep_quality' into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
848c56d54e
|
班级主页身份切换、成员管理页面的多重身份
|
9 years ago |
 daiao
|
6bd9f47222
|
Merge branch 'dev_shcool' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
daiao
|
50ec127c5b
|
单位名称列表功能
|
9 years ago |
|
huang
|
a8fa4a55e3
|
项目申请消息发送
|
9 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
|
9 years ago |
|
yuanke
|
6d594cfcbe
|
git pull后重新commit
|
9 years ago |
|
huang
|
4a9eec0cce
|
完成项目邀请及公共弹框的封装
|
9 years ago |
|
huang
|
c6bc5c9cb8
|
Merge branch 'dev_shcool' into rep_quality
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
0dfc887f74
|
复制班级中资源的提示修改
|
9 years ago |
|
huang
|
2f79e521ca
|
单位批准发送消息；申请单位给系统每位管理员发送消息
|
9 years ago |
|
huang
|
29edd60ce6
|
Merge branch 'daiao_dev' into dev_shcool
|
9 years ago |
|
daiao
|
9e788c9b6f
|
单位批准及消息框架搭建
|
9 years ago |
 Tim
|
82ae7310dc
|
rake db生成文件
|
9 years ago |
guange
|
c5dd2eaf41
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
daiao
|
5886a9898a
|
在单位名称列表的数据库表中，增加用户字段
|
9 years ago |
|
daiao
|
5883b451ca
|
在管理员界面添加单位名称列表
|
9 years ago |
|
guange
|
6a871e2116
|
.
|
9 years ago |
|
txz
|
12e845c3ab
|
课程列表与项目列表样式统一
|
9 years ago |
|
huang
|
84d1adbf25
|
生成邀请码
|
9 years ago |
|
huang
|
0e1a52726f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/base_syllabus.html.erb
|
9 years ago |
|
huang
|
160b05ae89
|
组织匿名数据处理
|
9 years ago |
|
huang
|
4e4ff4958f
|
修改changeset触发事件
|
9 years ago |
|
huang
|
472eb4736e
|
修改数据类型
|
9 years ago |
|
huang
|
246923a335
|
版本库新增提交次数表，增加至项目动态
|
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 |
|
cxt
|
f3c95906d8
|
项目缺陷的二级回复
|
9 years ago |
|
cxt
|
7853b8aa54
|
班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复， 二级回复代码的整合
|
9 years ago |
|
huang
|
facf3ae8f8
|
提交次数写入动态中
|
9 years ago |
|
cxt
|
7725db9c69
|
题库报500
|
9 years ago |
|
cxt
|
f7942e4d3c
|
Merge branch 'yuanke' of https://git.trustie.net/jacknudt/trustieforge into yuanke
Conflicts:
db/schema.rb
|
9 years ago |
|
guange
|
8279d9385c
|
区分是课程邀请，还是意见反馈
|
9 years ago |
|
guange
|
7c98e0f392
|
merge
|
9 years ago |
|
guange
|
5c0468f8fd
|
二维码过期改为一个月有效期
|
9 years ago |
|
cxt
|
c224f97905
|
样式调整、线下作业的作品评分、导出作业成绩报500
|
9 years ago |
|
cxt
|
cc4b24cdb9
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
13bae8f8a5
|
线下作业
|
9 years ago |
|
txz
|
ed39b4b4f1
|
动态：创建班级；学生进入资源也显示课件；已有班级和新增班级颜色区分
|
9 years ago |
|
daiao
|
87d99a1908
|
数据迁移
|
9 years ago |
|
huang
|
b90c90bc60
|
add model error_list
|
9 years ago |
|
daiao
|
cc72ca8473
|
Merge branch 'develop' into daiao_dev
Conflicts:
db/schema.rb
|
9 years ago |
|
daiao
|
261f440b3d
|
迁移
|
9 years ago |
|
guange
|
60367415fa
|
新建课程功能完成
|
9 years ago |
|
huang
|
e74a2ba275
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
18d677c5eb
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/courses.css
|
9 years ago |
|
cxt
|
bdaa9983e3
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
a50e15b2ab
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/users/_user_syllabus_list.html.erb
db/schema.rb
|
9 years ago |
|
cxt
|
2c1e0f534c
|
课程大纲
|
9 years ago |
|
yuanke
|
dfd381fc99
|
Merge branch 'yuanke_org' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
txz
|
db1ad932c6
|
Function : update jenkins job
|
9 years ago |
|
Tim
|
10f52f110f
|
课程大纲列表点击展开收起，配置按钮链接跳转实现
|
9 years ago |
|
yuanke
|
397c4cc2a5
|
1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮
|
9 years ago |
|
cxt
|
4314f6e36a
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
ebb697a49f
|
班级列表、课程大纲的编辑、回复、课程列表
|
9 years ago |
|
Tim
|
590b879f02
|
追加附件弹框不固定bug修复
|
9 years ago |
|
huang
|
2105d2bbdb
|
Merge branch 'develop' into rep_quality
Conflicts:
app/views/repositories/show.html.erb
db/migrate/20160624103411_add_name_to_quality_analyses.rb
db/schema.rb
|
9 years ago |
|
cxt
|
383483de26
|
课程大纲的左侧栏base，新建课程大纲、新建班级的调整
|
9 years ago |
Your Name
|
e5b93ac7ed
|
modified main method
|
9 years ago |
|
huang
|
5aa79defbe
|
迁移问题
|
9 years ago |
|
huang
|
46cde061a6
|
Merge branch 'rep_quality' into develop
Conflicts:
db/schema.rb
public/stylesheets/project.css
public/stylesheets/public.css
|
9 years ago |
|
Your Name
|
537f152562
|
0
|
9 years ago |
|
cxt
|
afc8fad7fd
|
通过邀请码加入课程
|
9 years ago |
|
guange
|
da09983f9e
|
Merge branch 'weixin_guange' into cxt_course
|
9 years ago |
|
Your Name
|
06fe02890f
|
index for sonar result
|
9 years ago |
|
guange
|
d348981721
|
加入邀请码
|
9 years ago |
|
Your Name
|
ce6e6116b5
|
get data from sonar API
|
9 years ago |
|
Your Name
|
9e7cde6056
|
stable version for sonar
|
9 years ago |
|
Your Name
|
d5631defb5
|
added xml to jenkins and added some gems
|
9 years ago |
|
huang
|
88b838a89a
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
guange
|
8fd4d518b2
|
添加邀请码
|
9 years ago |
|
cxt
|
6100abe0da
|
课程大纲
|
9 years ago |
|
guange
|
d3d31ca3a2
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
txz
|
719774f159
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
9 years ago |
|
txz
|
b57f6fbc65
|
微信回复框增加padding
|
9 years ago |
|
huang
|
78b445a7ae
|
组织历史数据迁移 模式术语修改， 配置页面域名长度问题
|
9 years ago |
|
huang
|
4ea12a6dc5
|
删除匿名用户数据迁移
|
9 years ago |
|
huang
|
27a9170318
|
组织添加设为精品项目，热门课程
|
9 years ago |
|
huang
|
91ae3d8b39
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
c333a0c55d
|
组织管理员提供学霸功能
|
9 years ago |
|
cxt
|
b065184754
|
删除机器人组织的匿名评论
|
9 years ago |
|
huang
|
61eeee702c
|
migrate
|
9 years ago |
|
huang
|
ed7c6cbcfe
|
组织新建帖子增减status状态
|
9 years ago |
|
huang
|
1c400669aa
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
5cefedd20a
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
b03b9a3c27
|
课程：问卷导入时显示的数据未进行过滤
|
9 years ago |
|
huang
|
faf5e89cc2
|
Merge branch 'weixin_guange' into develop
Conflicts:
1234567
app/views/blogs/_article.html.erb
db/schema.rb
|
9 years ago |
|
huang
|
3985c190bf
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
6517f23f03
|
首页不显示项目的创建动态
|
9 years ago |
|
txz
|
e2f3ba8e7d
|
微信问题修改
|
9 years ago |
|
txz
|
278ee66368
|
系统冲突
|
9 years ago |
|
txz
|
1b3bc38f8e
|
拖代码改动
|
9 years ago |
|
huang
|
658ea0cf1e
|
资源引用 结构搭建 数据创建
|
9 years ago |
|
cxt
|
357e143c9a
|
Merge branch 'develop' into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
9b6c629d10
|
学生列表增加活跃度的统计
|
9 years ago |
|
cxt
|
baaff3f988
|
数据迁移
|
9 years ago |
|
cxt
|
90a9472e30
|
删除空数据
|
9 years ago |
|
huang
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
9 years ago |
|
Tim
|
dc92e821a3
|
名师榜样式调整
|
9 years ago |
|
huang
|
83ac35cc94
|
不同的组织定制是否允许设置名师榜
|
9 years ago |
