 guange
|
c5fec1dcdf
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-21 17:21:17 +08:00 |
|
guange
|
080b2ac2fa
|
兼容ruby2.3.1
|
2016-07-21 17:21:02 +08:00 |
 Tim
|
efd452db2c
|
Merge branch 'cs_optimize_txz' into develop
|
2016-07-20 17:13:40 +08:00 |
|
Tim
|
dcb541e889
|
资源库资源列表取消虚线
|
2016-07-20 17:10:51 +08:00 |
|
Tim
|
2850fe1b2b
|
预览图片边框阴影效果
|
2016-07-20 17:08:31 +08:00 |
|
Tim
|
85c9fb5dce
|
二级回复图片超出显示
|
2016-07-20 17:00:54 +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
|
525169fa4a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-20 15:12:44 +08:00 |
|
Tim
|
78e4d37d8b
|
大纲base页引入弹框样式；作业列表调整
|
2016-07-20 15:09:01 +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 |
|
Tim
|
ce5cf8bf4f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-19 16:44:14 +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
|
25da65d565
|
恢复gemfile
|
2016-07-19 15:24:50 +08:00 |
|
Tim
|
10871d26a2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-19 11:21:06 +08:00 |
|
huang
|
4e3bfd9254
|
some bugs for sonar show
|
2016-07-19 11:17:54 +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 |
|
Tim
|
73401d6b41
|
下拉图标等显示
|
2016-07-19 09:09:13 +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 |
|
Tim
|
76555680e0
|
项目css统一
|
2016-07-18 14:30:01 +08:00 |
|
Tim
|
3940d8f558
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-07-18 14:18:18 +08:00 |
|
huang
|
412d74e295
|
优化最近动态获取方法
|
2016-07-18 13:57:00 +08:00 |
|
huang
|
d94f9762ce
|
Merge branch 'develop' into rep_quality
|
2016-07-18 11:27:41 +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
|
cb060e518e
|
正式版配置
|
2016-07-15 20:25:08 +08:00 |
|
yuanke
|
6ae57ef23a
|
Merge branch 'weixin_guange' into develop
|
2016-07-15 19:53:33 +08:00 |
|
guange
|
c14979d878
|
assets
|
2016-07-15 19:53:38 +08:00 |
|
yuanke
|
552f1a2709
|
正式版配置
|
2016-07-15 19:47:33 +08:00 |
 cxt
|
c9e0143fe8
|
作业动态的时间
|
2016-07-15 19:36:46 +08:00 |
|
yuanke
|
67fa6da8ae
|
我的资源界面加载前 不显示暂无数据
|
2016-07-15 19:18:30 +08:00 |
|
yuanke
|
596bfe4bfc
|
邀请码分享问题修改
|
2016-07-15 19:08:05 +08:00 |
|
yuanke
|
7dd26bb5d9
|
邀请码BUG修改
|
2016-07-15 18:19:37 +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
|
69009122e6
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-15 17:39:28 +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
|
7725db9c69
|
题库报500
|
2016-07-15 17:38:32 +08:00 |
|
cxt
|
fcc8a08138
|
课程列表的样式问题
|
2016-07-15 17:38:10 +08:00 |
|
txz
|
b7477a73e4
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-07-15 17:31:36 +08:00 |
|
txz
|
6491e16c64
|
微信课程列表底边重合问题
|
2016-07-15 17:31:33 +08:00 |