 cxt
|
27ed6df9d6
|
Merge branch 'szzh' into develop
|
2015-12-11 14:59:52 +08:00 |
|
cxt
|
a3715051b1
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-11 14:59:13 +08:00 |
|
cxt
|
c27a2a541b
|
Merge branch 'cxt_course' into szzh
|
2015-12-11 14:59:00 +08:00 |
|
cxt
|
f880ccd749
|
分组作业
|
2015-12-11 14:57:09 +08:00 |
 lizanle
|
ec79ed04ee
|
Merge branch 'szzh' into dev_zanle
|
2015-12-11 14:47:32 +08:00 |
|
lizanle
|
b6607f7418
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-11 14:46:48 +08:00 |
|
cxt
|
ba5d72b315
|
管理员查看在线测验的权限
|
2015-12-11 09:18:12 +08:00 |
|
cxt
|
4e04df7a8a
|
分组作业的动态显示及关联项目
|
2015-12-09 16:33:48 +08:00 |
|
lizanle
|
2fbad38522
|
优化排序参数
用于排序的字段最好不要分词
不然就是多值字段的排序会浪费大量的内存
|
2015-12-09 12:57:25 +08:00 |
|
cxt
|
f2f81d5243
|
作品列表的代码缩进
|
2015-12-09 10:52:56 +08:00 |
|
cxt
|
53f9141cf1
|
分组作业动态
|
2015-12-09 10:29:54 +08:00 |
|
lizanle
|
6c02115f3f
|
不允许修改登录名
|
2015-12-09 10:17:30 +08:00 |
|
lizanle
|
c1d82d6348
|
输入框 和 ke对齐
|
2015-12-09 09:39:07 +08:00 |
|
cxt
|
a9f6e817b4
|
分组作业关联项目
|
2015-12-08 17:37:15 +08:00 |
|
cxt
|
c26778b41c
|
分组作业关联项目
|
2015-12-08 17:36:35 +08:00 |
 huang
|
319ced51a0
|
Merge branch 'gitlab_guange' into develop
|
2015-12-08 17:16:50 +08:00 |
|
huang
|
ac9f13c842
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
Conflicts:
app/views/repositories/show.html.erb
db/schema.rb
处理冲突
|
2015-12-08 17:13:50 +08:00 |
|
huang
|
20eb88b6e2
|
Merge branch 'gitlab_guange' into develop
|
2015-12-08 16:54:51 +08:00 |
|
huang
|
da04607859
|
Merge branch 'gitlab_guange' of http://git.trustie.net/jacknudt/trustieforge into gitlab_guange
|
2015-12-08 16:53:56 +08:00 |
|
huang
|
99c5a19ff9
|
Merge branch 'develop' into gitlab_guange
|
2015-12-08 16:53:43 +08:00 |
 houxiang
|
56cb83ffba
|
版本库首页没有统计commit_count，具体的详情页在开始统计
|
2015-12-08 15:56:31 +08:00 |
|
lizanle
|
92bc3361fe
|
匿评失败消息改变
|
2015-12-08 15:33:17 +08:00 |
Gan Yi.ang
|
58c76e7c1c
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-12-08 10:15:09 +08:00 |
|
huang
|
19472f4ae5
|
Merge branch 'dev_hjq' into develop
|
2015-12-07 17:31:53 +08:00 |
|
huang
|
07e414a2cd
|
Merge branch 'develop' into dev_hjq
|
2015-12-07 17:31:03 +08:00 |
|
lizanle
|
5fcbde2ff1
|
资源库监听回车键
|
2015-12-07 17:29:14 +08:00 |
|
huang
|
298bf037ad
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-12-07 17:25:51 +08:00 |
|
huang
|
3459164e64
|
过滤条件样式
|
2015-12-07 17:25:32 +08:00 |
 ouyangxuhua
|
8b14e7c549
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-12-07 17:19:52 +08:00 |
|
ouyangxuhua
|
5198f4dde4
|
Merge branch 'dev_hjq' into develop
|
2015-12-07 17:19:26 +08:00 |
|
ouyangxuhua
|
9d6b4783df
|
删除组织配置栏目的组织首页项
|
2015-12-07 17:18:46 +08:00 |
|
huang
|
5f6d9f2425
|
项目动态新样式
|
2015-12-07 17:14:13 +08:00 |
|
ouyangxuhua
|
a8b7d1b81f
|
回复项目里的message,不增加项目动态及组织动态
|
2015-12-07 17:11:30 +08:00 |
|
huang
|
91fa3f6fab
|
解决项目样式冲突问题
|
2015-12-07 16:52:23 +08:00 |
|
lizanle
|
ee661bb6d4
|
input光光标到最后的折中解决方案
|
2015-12-07 16:21:00 +08:00 |
|
ouyangxuhua
|
e45ce0fb95
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-12-07 15:52:32 +08:00 |
|
lizanle
|
9e01f02a66
|
作业题目统一改为作业标题
作业匿评截止消息改造
|
2015-12-07 15:52:22 +08:00 |
|
ouyangxuhua
|
76db95aa03
|
1.组织页面中，退出后刷新组织页面；
2.组织页面中，点击“个人主页”，打开新的页面；
3.组织页面页首部分，用户名不链接用户页面。
|
2015-12-07 15:52:13 +08:00 |
|
lizanle
|
ad2d9fa374
|
添加对帖子的全文搜索
|
2015-12-07 15:32:57 +08:00 |
|
cxt
|
cb7ad682cf
|
Merge branch 'develop' into cxt_course
|
2015-12-07 15:21:43 +08:00 |
|
cxt
|
c8f4149206
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-12-07 15:18:43 +08:00 |
|
cxt
|
8e999ed9f0
|
作业动态的回复删除功能只在鼠标进入时显示
|
2015-12-07 15:18:32 +08:00 |
|
huang
|
5eb249515c
|
版本库显示样式
|
2015-12-07 15:12:30 +08:00 |
|
huang
|
a5b9927365
|
Merge branch 'dev_hjq' into develop
|
2015-12-07 14:40:53 +08:00 |
|
huang
|
9ff41c214b
|
Merge branch 'develop' into dev_hjq
|
2015-12-07 14:40:25 +08:00 |
|
ouyangxuhua
|
9f30c7a44e
|
如果用户没有登陆，不能在组织页面中，增加项目或课程。
|
2015-12-07 14:37:35 +08:00 |
|
ouyangxuhua
|
7057a4cfea
|
组织页首增加退出功能
|
2015-12-07 14:31:08 +08:00 |
|
lizanle
|
ef2ef7111c
|
添加对帖子的全文搜索
|
2015-12-07 14:31:05 +08:00 |
|
ouyangxuhua
|
c229104d78
|
修改编辑组织标题
|
2015-12-07 13:03:21 +08:00 |
|
ouyangxuhua
|
5034ddb4b6
|
修复组织的bug
|
2015-12-07 12:53:51 +08:00 |