whimlex
|
1e5fac32b4
|
添加邮箱验证
|
2015-03-12 17:48:31 +08:00 |
|
whimlex
|
3a1f0aec55
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-12 17:14:12 +08:00 |
|
whimlex
|
5f88ffc5d0
|
项目邀请用户国际化，js判断邮件格式
|
2015-03-12 17:13:46 +08:00 |
 sw
|
ceb6ccf908
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-12 17:06:04 +08:00 |
|
sw
|
971c278de5
|
#2026 作业创建时间->截至时间
|
2015-03-12 17:02:47 +08:00 |
 huang
|
77bf3be20d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_users.html.erb
|
2015-03-12 16:49:42 +08:00 |
|
huang
|
b809e8844c
|
修改项目中添加标签按钮显示异常
|
2015-03-12 16:42:18 +08:00 |
 z9hang
|
2d05c3273f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-12 16:33:43 +08:00 |
|
z9hang
|
8190403380
|
app添加忘记密码接口，课程动态接口代码优化（去掉其中的中文）
|
2015-03-12 16:33:31 +08:00 |
|
sw
|
d18e9ff66b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-12 16:32:31 +08:00 |
|
sw
|
312d7660b2
|
增加邀请成功后的提示
邀请成功后跳转页面修改
调整翻页控件的样式
|
2015-03-12 16:32:20 +08:00 |
|
huang
|
4bfc72dc28
|
用新表统计动态
修改关注样式
|
2015-03-12 15:56:03 +08:00 |
|
sw
|
2ee04d55f2
|
修改项目邀请用户的界面
|
2015-03-12 15:46:24 +08:00 |
|
huang
|
6fa5863665
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-12 15:14:16 +08:00 |
|
huang
|
0ba7ef0560
|
修改邮箱邀请时，邮件为空时提示错误
|
2015-03-12 15:13:41 +08:00 |
|
z9hang
|
7e7da7e445
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-12 11:18:00 +08:00 |
|
z9hang
|
a05061af73
|
#1859 课程--资源库：全站搜索中“选入我的其他课程”弹出的课程列表中包括当前课程
|
2015-03-12 11:17:36 +08:00 |
|
sw
|
717be2b045
|
修改部分用户的用户首页报错
|
2015-03-12 10:29:19 +08:00 |
|
sw
|
5340ad7fc1
|
修改组织首页不显示私有项目
|
2015-03-12 10:20:28 +08:00 |
|
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 |
|
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
|
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
|
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 |
|
huang
|
cbfb72bd5b
|
修改新建资源库显示
|
2015-03-11 14:32:29 +08:00 |
|
huang
|
aa2a41d368
|
修改文档 从项目动态点入后导航栏显示错误
|
2015-03-11 11:55:55 +08:00 |