 yuanke
|
86731c34d5
|
单个课程作业不显示的BUG修改，加入班级时如果班级已被删除需要提示!
|
2016-07-21 15:21:09 +08:00 |
|
yuanke
|
f0840d0f31
|
Merge branch 'develop' into weixin_guange
|
2016-07-21 14:29:04 +08:00 |
|
yuanke
|
7cd505ea4b
|
博客详情动态加入二级回复的展开功能一级一级回复的更多功能。
|
2016-07-21 14:03:04 +08:00 |
 Tim
|
635b3beb32
|
新建issue版本图标问题
|
2016-07-20 16:46:58 +08:00 |
|
Tim
|
5adc4e1e5a
|
项目issue上传附件与填写正确加间距
|
2016-07-20 16:41:53 +08:00 |
|
Tim
|
bf87ffb992
|
组织历史版本弹框文件夹图标问题
|
2016-07-20 16:21:58 +08:00 |
|
Tim
|
f3494489c2
|
Merge branch 'develop' into cs_optimize_txz
|
2016-07-20 15:14:32 +08:00 |
|
Tim
|
78e4d37d8b
|
大纲base页引入弹框样式；作业列表调整
|
2016-07-20 15:09:01 +08:00 |
|
yuanke
|
67e87df4d5
|
微信动态详情回复显示修改
|
2016-07-20 13:34:58 +08:00 |
|
yuanke
|
1ce7b22c0e
|
博客动态回复二级回复修改
|
2016-07-20 10:09:27 +08:00 |
 guange
|
674c45f1d9
|
去掉上传的csrf报错
|
2016-07-19 17:44:27 +08:00 |
|
Tim
|
eb503cc3e8
|
Merge branch 'develop' into cs_optimize_txz
|
2016-07-19 16:50:30 +08:00 |
 huang
|
26d4be6518
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2016-07-19 15:25:54 +08:00 |
|
huang
|
1a129722eb
|
Merge branch 'rep_quality' into develop
|
2016-07-19 15:25:13 +08:00 |
|
huang
|
4e3bfd9254
|
some bugs for sonar show
|
2016-07-19 11:17:54 +08:00 |
|
yuanke
|
ea88c92d31
|
测试用
|
2016-07-19 10:54:04 +08:00 |
|
yuanke
|
bc1b4c1b85
|
班级邀请码弹框修改，我的动态回复数计算修改
|
2016-07-19 10:50:36 +08:00 |
|
huang
|
c50ca34b0e
|
代码质量分析部分数据转换成整型
|
2016-07-19 09:48:02 +08:00 |
|
huang
|
04fe06eff9
|
gitlab数据迁移
|
2016-07-19 09:39:47 +08:00 |
|
Tim
|
1fc2bbd56a
|
作业资源库弹框，资源名称与上传者栏增加宽度限制
|
2016-07-19 09:17:20 +08:00 |
|
huang
|
facf3ae8f8
|
提交次数写入动态中
|
2016-07-18 16:45:49 +08:00 |
|
Tim
|
e966972750
|
Merge branch 'develop' into cs_optimize_txz
Conflicts:
app/views/versions/index.html.erb
|
2016-07-18 14:32:17 +08:00 |
|
yuanke
|
ff13d2e572
|
微信增加作业发送，修改发送的权限，修改菜单
|
2016-07-18 14:24:59 +08:00 |
|
huang
|
412d74e295
|
优化最近动态获取方法
|
2016-07-18 13:57:00 +08:00 |
|
huang
|
5c046f922e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-18 11:25:57 +08:00 |
|
huang
|
097374df14
|
去掉全局变量，通过filter获取
|
2016-07-18 11:25:45 +08:00 |
|
huang
|
3198f8a473
|
解决版本库提交记录中：上传图片或者非可以预览文件 显示详情500问题
|
2016-07-18 11:17:22 +08:00 |
|
yuanke
|
f3d74fcd55
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-18 11:08:09 +08:00 |
|
yuanke
|
8968c991ff
|
微信：作业增加发送功能
|
2016-07-18 11:08:02 +08:00 |
|
guange
|
51692eadd6
|
改进上线流程
|
2016-07-17 00:49:35 +08:00 |
|
guange
|
c14979d878
|
assets
|
2016-07-15 19:53:38 +08:00 |
|
yuanke
|
6ae57ef23a
|
Merge branch 'weixin_guange' into develop
|
2016-07-15 19:53:33 +08:00 |
 cxt
|
c9e0143fe8
|
作业动态的时间
|
2016-07-15 19:36:46 +08:00 |
|
yuanke
|
596bfe4bfc
|
邀请码分享问题修改
|
2016-07-15 19:08:05 +08:00 |
|
guange
|
82aa369687
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-15 18:11:01 +08:00 |
|
guange
|
c02245adfb
|
邀请码分享
|
2016-07-15 18:08:19 +08:00 |
|
yuanke
|
ba1af901ad
|
强制更新myresource.js
|
2016-07-15 17:39:21 +08:00 |
|
cxt
|
48e5a0be7e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2016-07-15 17:38:56 +08:00 |
|
cxt
|
fcc8a08138
|
课程列表的样式问题
|
2016-07-15 17:38:10 +08:00 |
|
huang
|
4c5052dce2
|
作业按更新时间排序
|
2016-07-15 17:28:57 +08:00 |
|
cxt
|
5b070b6acc
|
消息列表的html标签
|
2016-07-15 16:52:18 +08:00 |
|
huang
|
f9e03434c2
|
Merge branch 'develop' into rep_quality
|
2016-07-15 16:51:31 +08:00 |
|
yuanke
|
60dc0e72cf
|
微信我我的资源更多按钮显示
|
2016-07-15 16:46:27 +08:00 |
|
huang
|
2af3c50dbc
|
里程碑区分issue状态“已解决”“已关闭” 对应不同样式
|
2016-07-15 16:43:07 +08:00 |
|
yuanke
|
0a1ecd65e8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2016-07-15 16:31:42 +08:00 |
|
huang
|
b2a8a0fed6
|
修复里程碑进度条数据显示错误的问题
|
2016-07-15 16:28:33 +08:00 |
|
yuanke
|
9b17724ebf
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-15 16:08:42 +08:00 |
|
yuanke
|
c476dae15b
|
微信我的资源中 更多按钮暂时隐藏
|
2016-07-15 16:08:04 +08:00 |
|
cxt
|
dbc8f87346
|
Merge branch 'yuanke' into develop
|
2016-07-15 15:56:37 +08:00 |
|
cxt
|
1c967ce569
|
Merge branch 'rep_quality' into develop
Conflicts:
app/views/users/_user_message_system.html.erb
app/views/users/_user_message_userfeedaback.html.erb
|
2016-07-15 15:53:32 +08:00 |