 sw
|
69eecf49d1
|
还原冲突
|
2015-03-12 09:52:57 +08:00 |
|
sw
|
2ac2c1848c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
2015-03-12 09:52:50 +08:00 |
whimlex
|
6f4ef81eb9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-12 09:48:09 +08:00 |
|
whimlex
|
65ee3fdc74
|
项目主页国际化，项目主页JS冲突解决
|
2015-03-12 09:47:42 +08:00 |
|
sw
|
5258b7585b
|
处理冲突还原代码
|
2015-03-12 09:36:03 +08:00 |
 huang
|
64bbbff879
|
添加里程碑
|
2015-03-12 09:03:25 +08:00 |
|
sw
|
b27bb34662
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
2015-03-12 09:00:12 +08:00 |
|
huang
|
c773e0fd39
|
JS冲突，去掉多余标点
|
2015-03-12 08:42:39 +08:00 |
|
huang
|
29655838f0
|
项目超过的部分用“展示更多信息”拉开
|
2015-03-11 23:50:37 +08:00 |
|
huang
|
c36db9fd63
|
项目左侧按钮实现配置-模块进行显示/隐藏管理
|
2015-03-11 22:42:42 +08:00 |
|
whimlex
|
11da65c9ad
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
config/locales/en.yml
config/locales/zh.yml
|
2015-03-11 17:27:02 +08:00 |
|
whimlex
|
57c8575470
|
新版项目模块国际化，目前完成各项目主页，项目动态，项目评分
|
2015-03-11 17:23:38 +08:00 |
|
sw
|
4b831c9e65
|
#2001 项目--工具集中wiki-“查看差别”中有html标签
|
2015-03-11 17:22:23 +08:00 |
|
huang
|
3ee9ac2b50
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
2015-03-11 16:44:54 +08:00 |
|
huang
|
8f0af4c00d
|
修改了未登陆情况下通过URL访问不允访问的
|
2015-03-11 16:42:02 +08:00 |
|
sw
|
04e5aee3c2
|
版本库和新建版本库两个不同的权限
|
2015-03-11 16:07:42 +08:00 |
 lizanle
|
d7c550b15b
|
给projects项目新建的时候添加创建人
|
2015-03-11 15:51:25 +08:00 |
|
lizanle
|
437fc243ad
|
给每个项目添加一条初始创建信息，如果有menber，最早加进来的就算创始人,并给projects表的更新创建人
|
2015-03-11 15:47:10 +08:00 |
|
sw
|
4d58116da5
|
#1997 项目--工具集中的“创建版本库”和配置中“新建版本库”打开的窗口不一样
|
2015-03-11 15:44:22 +08:00 |
|
sw
|
1e262ec731
|
修改项目上传资源链接
|
2015-03-11 15:32:50 +08:00 |
|
lizanle
|
88ee202a4c
|
issue2012,分页显示方式修改
|
2015-03-11 15:30:36 +08:00 |
|
lizanle
|
de233cb52a
|
issue2012,分页显示方式修改
|
2015-03-11 15:30:24 +08:00 |
|
lizanle
|
8f3f9ea2ed
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-03-11 15:30:17 +08:00 |
|
lizanle
|
a8a62ab750
|
issue2012,分页显示方式修改
|
2015-03-11 15:30:00 +08:00 |
|
sw
|
52dfb0b0ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-11 15:16:43 +08:00 |
|
sw
|
9e896118e9
|
项目模块配置：作品下载->资源库
|
2015-03-11 15:16:20 +08:00 |
|
sw
|
27e72c1f39
|
#2000 增加项目每个模块的访问控制
|
2015-03-11 15:14:23 +08:00 |
|
huang
|
078d2fa488
|
解决项目中文档为空情况显示异常
新建文件文件术语改变
|
2015-03-11 15:14:13 +08:00 |
 z9hang
|
ec455de3d4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-11 15:14:04 +08:00 |
|
z9hang
|
11c8c0510a
|
app版本管理报错问题
|
2015-03-11 15:13:41 +08:00 |
|
z9hang
|
c552a22fb2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-11 14:52:36 +08:00 |
|
z9hang
|
14fe487835
|
将app个人课程动态接口中作业留言归类到更新了作业中
|
2015-03-11 14:52:07 +08:00 |
|
sw
|
0525b03e65
|
zh.yml删除重复的
|
2015-03-11 14:50:06 +08:00 |
|
huang
|
cbfb72bd5b
|
修改新建资源库显示
|
2015-03-11 14:32:29 +08:00 |
|
huang
|
aa2a41d368
|
修改文档 从项目动态点入后导航栏显示错误
|
2015-03-11 11:55:55 +08:00 |
|
whimlex
|
93df92e660
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-11 11:55:42 +08:00 |
|
whimlex
|
540ddd4a1b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
2015-03-11 11:55:13 +08:00 |
|
whimlex
|
0eafbb92d5
|
意见反馈模块国际化
|
2015-03-11 11:53:42 +08:00 |
|
huang
|
49cf6e1319
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-11 11:38:42 +08:00 |
|
huang
|
32a2e7ae1f
|
修改默认情况下 用户反馈框处于关闭状态
|
2015-03-11 11:38:09 +08:00 |
|
z9hang
|
743a642cf1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-11 11:23:23 +08:00 |
|
sw
|
c411d1f3d1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-11 11:23:09 +08:00 |
|
z9hang
|
eec155f077
|
课程资源页面app自动登陆处理
|
2015-03-11 11:22:58 +08:00 |
|
sw
|
4d9d45f25a
|
Merge branch 'sw_new_course' into szzh
|
2015-03-11 11:22:53 +08:00 |
|
sw
|
b0eba062a8
|
修复项目、课程留言不正确的BUG
|
2015-03-11 11:20:43 +08:00 |
|
huang
|
b10cb7836c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
2015-03-11 11:19:38 +08:00 |
|
sw
|
d177f1ae89
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-11 10:16:23 +08:00 |
|
sw
|
9060c9acbc
|
#1977 项目发布新贴跳转有问题
|
2015-03-11 10:16:06 +08:00 |
|
whimlex
|
12c72308f0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-11 10:11:15 +08:00 |
|
whimlex
|
5732f0ed03
|
国际化问题修改，新添加en.yml存在中文字符，格式问题
|
2015-03-11 10:10:54 +08:00 |