 huang
|
dc0c9417e3
|
修改新提交的作业显示在前面
|
2015-03-21 10:19:58 +08:00 |
 z9hang
|
5278d4dd2b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-20 11:37:22 +08:00 |
|
z9hang
|
4ca5687b3b
|
#2072测试版--项目--问题跟踪：成功新建问题后建议提示信息为“问题已创建”就好
|
2015-03-20 11:37:09 +08:00 |
 lizanle
|
cdad43fdfc
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-03-20 11:08:47 +08:00 |
|
lizanle
|
a4567396e4
|
如果没有上传图片就会报空指针
|
2015-03-20 11:08:27 +08:00 |
 sw
|
0c4f88ca29
|
Merge branch 'szzh' into guange_dev
|
2015-03-19 17:43:56 +08:00 |
 guange
|
e007920cb6
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
Gemfile
app/views/attachments/_form.html.erb
|
2015-03-19 17:41:45 +08:00 |
|
sw
|
6edbb3c7ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-19 17:29:17 +08:00 |
 dingxu
|
073cb07f70
|
邀请平台用户：角色、用户都为空添加提示、单一角色提示信息修改、
展开条样式修改
|
2015-03-19 17:23:53 +08:00 |
|
dingxu
|
7b3af413cd
|
邮件邀请加入项目:如果邮箱已被注册或为空时给出提示
|
2015-03-19 16:51:07 +08:00 |
|
z9hang
|
2a3a70b7d5
|
app接口部分信息国际化
|
2015-03-19 14:41:31 +08:00 |
|
huang
|
4ae5e2af7c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-18 15:50:34 +08:00 |
|
huang
|
6498002c71
|
修改项目文档中附件上传无法保存、附件编辑的时候无法显示的bug
原因：里面逻辑判断错误
|
2015-03-18 15:50:00 +08:00 |
|
guange
|
c45850eb8a
|
git hook改为异步
|
2015-03-18 14:42:11 +08:00 |
|
guange
|
dc29ccf3b7
|
1. git仓库新建时加入hook代码
2. 对现有的旧hook代码进行更新的rake任务
|
2015-03-18 11:22:05 +08:00 |
|
lizanle
|
b4f99c75da
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-03-18 10:17:33 +08:00 |
|
lizanle
|
e49bb18b62
|
cotroller修改：删除记录的同时删除对应的文件
|
2015-03-18 10:17:22 +08:00 |
|
z9hang
|
86c4a7f45d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-18 09:25:46 +08:00 |
|
z9hang
|
930486d21e
|
#2024 course主页：点击进入非当前用户的所在学校，如图，不显示“我的课程”了
|
2015-03-18 09:25:26 +08:00 |
|
lizanle
|
41f302c467
|
cotroller修改
|
2015-03-18 08:53:36 +08:00 |
|
guange
|
6c87cd40c1
|
加入git回调接口
|
2015-03-17 20:52:12 +08:00 |
|
sw
|
1e897687d0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-17 16:01:45 +08:00 |
|
z9hang
|
36554aa90a
|
#2041 项目--问题跟踪：成功新建缺陷给出的提示信息错误
|
2015-03-17 10:11:38 +08:00 |
|
lizanle
|
86020804c9
|
ok
|
2015-03-17 09:42:04 +08:00 |
|
lizanle
|
33669017bf
|
controller
|
2015-03-17 09:40:31 +08:00 |
|
lizanle
|
0c86ba210d
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
db/schema.rb
|
2015-03-17 09:38:24 +08:00 |
|
lizanle
|
5c4a62dcc4
|
DiscussDemo代码
|
2015-03-16 15:29:13 +08:00 |
|
sw
|
88d6b25ace
|
1、修改意见反馈图片
2、去掉个人首页权限判断
|
2015-03-16 09:28:18 +08:00 |
|
guange
|
e798b7242b
|
Merge remote branch 'remotes/origin/szzh' into guange_dev
|
2015-03-15 23:10:48 +08:00 |
|
guange
|
f3d6d7c384
|
#2037 issue列表默认显示顺序改为最后更新的倒序
|
2015-03-15 16:02:49 +08:00 |
|
sw
|
e4895731ae
|
Merge branch 'develop' into szzh
|
2015-03-13 17:48:12 +08:00 |
|
sw
|
e4e56e01b1
|
修改项目邀请用户失败时的提示
|
2015-03-13 17:46:09 +08:00 |
|
z9hang
|
ff65bf4ba5
|
app自动更新功能功能，无法下载问题修正
|
2015-03-13 17:10:22 +08:00 |
|
guange
|
08eae0e5eb
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-03-13 11:30:25 +08:00 |
|
guange
|
ab6c21314d
|
#1503 老师发布的作业可以在课程动态中显示了
|
2015-03-12 21:57:35 +08:00 |
whimlex
|
28321deeb5
|
邮件邀请用户
|
2015-03-12 18:04:12 +08:00 |
|
sw
|
fd8edc9a02
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-12 17:34:25 +08:00 |
|
huang
|
96b2627fda
|
修改邮件居中样式及提示
|
2015-03-12 17:22:52 +08:00 |
|
sw
|
78039a726e
|
Merge branch 'szzh' into guange_dev
|
2015-03-12 17:09:20 +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 |
|
sw
|
2ee04d55f2
|
修改项目邀请用户的界面
|
2015-03-12 15:46:24 +08:00 |
|
huang
|
0ba7ef0560
|
修改邮箱邀请时，邮件为空时提示错误
|
2015-03-12 15:13:41 +08:00 |
|
sw
|
5340ad7fc1
|
修改组织首页不显示私有项目
|
2015-03-12 10:20:28 +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
|
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 |
|
lizanle
|
d7c550b15b
|
给projects项目新建的时候添加创建人
|
2015-03-11 15:51:25 +08:00 |
|
sw
|
1e262ec731
|
修改项目上传资源链接
|
2015-03-11 15:32:50 +08:00 |
|
z9hang
|
eec155f077
|
课程资源页面app自动登陆处理
|
2015-03-11 11:22:58 +08:00 |