 daiao
|
6a4f239961
|
Merge branch 'develop' into dev_shcool
|
2016-08-25 15:55:37 +08:00 |
|
daiao
|
758aaca12a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-25 15:29:19 +08:00 |
|
daiao
|
a466fdd64e
|
强制修改基本资料：申请单位点击确定后，进入主页面；提问按钮不可用
|
2016-08-25 15:29:04 +08:00 |
 huang
|
799c451921
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-25 09:20:46 +08:00 |
 cxt
|
21c48ea383
|
at所有人
|
2016-08-24 17:46:18 +08:00 |
|
huang
|
80c6132ba5
|
Merge branch 'rep_quality' into develop
|
2016-08-24 17:39:44 +08:00 |
|
huang
|
7493de1334
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-08-24 17:38:40 +08:00 |
|
huang
|
0cc59260cd
|
modified sonar list form of language
|
2016-08-24 17:35:04 +08:00 |
|
huang
|
8cc60ef1e8
|
delete some language of quality_analysis
|
2016-08-24 17:28:55 +08:00 |
 Tim
|
7682a4d45d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-24 17:03:11 +08:00 |
|
Tim
|
a13ec60173
|
修复无效的css
|
2016-08-24 17:02:59 +08:00 |
|
cxt
|
ea7f65308e
|
at所有人后不应带有用户登录名
|
2016-08-24 16:02:02 +08:00 |
|
daiao
|
a3ec35c008
|
个人主页报500
|
2016-08-24 15:56:03 +08:00 |
|
huang
|
f0ed380002
|
Merge branch 'rep_quality' into develop
|
2016-08-24 15:13:37 +08:00 |
|
huang
|
ba6d0e6926
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-08-24 15:13:00 +08:00 |
|
huang
|
bafb3e98a7
|
tip for sonar results
|
2016-08-24 15:05:10 +08:00 |
|
daiao
|
90803fbb2a
|
Merge branch 'dev_shcool' into develop
|
2016-08-24 14:53:31 +08:00 |
|
daiao
|
8b0c0925dd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-08-24 14:52:10 +08:00 |
|
daiao
|
078900088a
|
修复：新建组织关联trustie-forge项目，点击组织动态的论坛动态报500
|
2016-08-24 14:41:26 +08:00 |
|
cxt
|
5d5bd88c88
|
个人主页：用户不应有修改他人头像的权限
|
2016-08-24 09:30:57 +08:00 |
|
daiao
|
5088770214
|
修复：文章附件和资源栏目下载权限一致
|
2016-08-23 16:34:11 +08:00 |
|
daiao
|
7e34062435
|
Merge branch 'dev_shcool' into develop
|
2016-08-23 09:43:38 +08:00 |
|
huang
|
ea6b928188
|
Merge branch 'rep_quality' of https://git.trustie.net/jacknudt/trustieforge into rep_quality
|
2016-08-22 17:19:48 +08:00 |
 yuanke
|
864c6c821f
|
Merge branch 'weixin_guange' into develop
|
2016-08-22 16:50:13 +08:00 |
|
huang
|
5e98884801
|
tip for sonar
|
2016-08-22 16:32:32 +08:00 |
|
yuanke
|
c275557fa7
|
调试
|
2016-08-22 15:44:20 +08:00 |
|
cxt
|
f5cbdf11bc
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-22 15:24:18 +08:00 |
|
cxt
|
06361246c7
|
作品列表中的已提交人数无法自动刷新
|
2016-08-22 15:24:12 +08:00 |
|
yuanke
|
7f8a6f931b
|
调试
|
2016-08-22 15:23:34 +08:00 |
|
yuanke
|
d5a7d10f5d
|
调试
|
2016-08-22 14:59:50 +08:00 |
|
yuanke
|
9e4aaa767c
|
调试
|
2016-08-22 14:57:28 +08:00 |
|
yuanke
|
0c381ad53d
|
调试
|
2016-08-22 14:42:04 +08:00 |
|
huang
|
af079a1cc3
|
Merge branch 'develop' into rep_quality
|
2016-08-22 14:37:51 +08:00 |
|
yuanke
|
19c48fa617
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-22 14:35:07 +08:00 |
|
yuanke
|
d9e031c314
|
调试
|
2016-08-22 14:34:42 +08:00 |
|
Tim
|
4f3f6358fc
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-22 14:30:00 +08:00 |
|
Tim
|
a846eda77b
|
输入框padding调整；发帖样式新增
|
2016-08-22 14:29:43 +08:00 |
|
huang
|
f8fc656920
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-08-22 14:22:31 +08:00 |
|
huang
|
300dab5fa1
|
版本库更新时间提交
|
2016-08-22 14:20:59 +08:00 |
|
yuanke
|
75d81d5dba
|
前端判断是否绑定屏蔽
|
2016-08-22 14:09:29 +08:00 |
|
yuanke
|
53bca5c006
|
调试
|
2016-08-22 13:52:40 +08:00 |
|
yuanke
|
0412009182
|
调试
|
2016-08-22 11:13:14 +08:00 |
|
yuanke
|
a38d4f15a6
|
调试
|
2016-08-22 10:50:22 +08:00 |
|
cxt
|
572ad5a162
|
个人主页的课程和项目展开出现重复数据
|
2016-08-22 10:49:46 +08:00 |
|
yuanke
|
2e86738fd2
|
调试
|
2016-08-22 10:42:40 +08:00 |
|
yuanke
|
42c6e4c5c5
|
调试
|
2016-08-22 10:26:57 +08:00 |
|
yuanke
|
be95b3990d
|
调试
|
2016-08-22 10:04:31 +08:00 |
|
yuanke
|
96ce09ede3
|
Merge branch 'weixin_guange' into develop
|
2016-08-14 16:32:28 +08:00 |
|
yuanke
|
eaf6706e34
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-08-14 16:21:03 +08:00 |
|
yuanke
|
8a94d205f4
|
.
|
2016-08-14 16:20:53 +08:00 |