 z9hang
|
bf5c99321e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-21 16:37:40 +08:00 |
|
z9hang
|
799fa776ee
|
#2091 测试版--课程/项目--资源库：上传资源后 后缀无论是大写还是小写，点击返回的都是下载
|
2015-03-21 16:37:16 +08:00 |
 huang
|
75ae68ffc8
|
项目邀请用户邮箱为空的提示语！
|
2015-03-21 16:33:46 +08:00 |
|
huang
|
f1b8d74a07
|
修改加入项目字体大小、宽度
|
2015-03-21 14:17:29 +08:00 |
|
huang
|
1e1ee9a248
|
修改邮箱匹配错误后提示语
|
2015-03-21 13:54:16 +08:00 |
|
huang
|
9e297609fd
|
项目邮件邀请：正则匹配触发事件改成失去鼠标焦点
（否则输入一个字母也会触发，给人感觉邮箱已经错误）
|
2015-03-21 10:53:06 +08:00 |
|
z9hang
|
808d56d47b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-21 10:20:27 +08:00 |
|
z9hang
|
f0bc0b2e93
|
项目关注、取消关注、申请加入、取消申请加入返回js修改
|
2015-03-21 10:20:04 +08:00 |
|
huang
|
65bf98016a
|
新建git添加导航条
|
2015-03-21 10:15:35 +08:00 |
|
z9hang
|
5deca84c12
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-20 17:26:51 +08:00 |
|
z9hang
|
bcfdac37a7
|
课程资源中的图片点击下载有弹框改为预览图片
|
2015-03-20 17:26:31 +08:00 |
|
huang
|
5b050b1037
|
解决上传文件名过长问题（作业中部分文件名超出边框）
|
2015-03-20 17:04:04 +08:00 |
|
huang
|
72d41fd07a
|
修改邮件邀请提示信息！
|
2015-03-20 16:17:48 +08:00 |
|
huang
|
ec8b7e4128
|
修改项目tag删除判断错误
|
2015-03-20 16:12:46 +08:00 |
|
huang
|
99dd66d8de
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-20 16:08:11 +08:00 |
|
huang
|
e171f7b249
|
项目标签添加删除功能
|
2015-03-20 16:07:52 +08:00 |
whimlex
|
d73d842e31
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-20 15:59:53 +08:00 |
|
z9hang
|
5e8f29eb5a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-20 15:59:44 +08:00 |
|
whimlex
|
34579e395f
|
附件上传bug修改；意见反馈收拉一致
|
2015-03-20 15:59:30 +08:00 |
|
z9hang
|
473a8805e2
|
发布取消发布问卷时提示信息有下拉框问题
|
2015-03-20 15:59:16 +08:00 |
|
huang
|
885b2092e4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-20 15:52:49 +08:00 |
|
huang
|
83d63bf479
|
修改竞赛关注中关注项目读取错误
|
2015-03-20 15:52:32 +08:00 |
|
z9hang
|
eebcccd4bb
|
编辑贴吧等不显示附件问题
|
2015-03-20 15:20:11 +08:00 |
|
huang
|
cea43cb045
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-20 15:03:24 +08:00 |
|
huang
|
69eb7fbd77
|
关注、加入项目样式，处理样式冲突
|
2015-03-20 15:02:20 +08:00 |
|
whimlex
|
93838f604d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-20 11:35:18 +08:00 |
|
whimlex
|
3837e1fcf5
|
申请加入：附件上传
|
2015-03-20 11:34:59 +08:00 |
 guange
|
92b72c995a
|
纠正合并
|
2015-03-19 17:47:51 +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 |
|
whimlex
|
6995ead66c
|
项目ID
|
2015-03-19 17:28:12 +08:00 |
|
whimlex
|
b400c9bb11
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
2015-03-19 17:22:25 +08:00 |
|
whimlex
|
b95852dfcd
|
附件上传国际化：修改页面一些bug：用户主页个人得分身份信息修改
|
2015-03-19 17:21:11 +08:00 |
 dingxu
|
7b3af413cd
|
邮件邀请加入项目:如果邮箱已被注册或为空时给出提示
|
2015-03-19 16:51:07 +08:00 |
|
dingxu
|
79588489e2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-19 16:25:38 +08:00 |
|
dingxu
|
440855c0e6
|
修改项目tag样式
|
2015-03-19 16:25:18 +08:00 |
 lizanle
|
0424fc55db
|
项目资源数显示错误
|
2015-03-19 11:26:31 +08:00 |
|
lizanle
|
966f93012d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-03-19 11:16:11 +08:00 |
|
lizanle
|
c209bccba0
|
项目资源数显示错误
|
2015-03-19 11:15:58 +08:00 |
|
huang
|
371f25b61f
|
修改邀请页面分页异常（冲突引起）
|
2015-03-19 10:44:03 +08:00 |
 alan
|
cf3d836cf3
|
删除邮件发送时出现《"亲爱的Trustie用户，您好！"》
Signed-off-by: alan <547533434@qq.com>
|
2015-03-19 09:37:37 +08:00 |
|
huang
|
7e40ea7604
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-18 21:18:31 +08:00 |
|
huang
|
1cdf397bc0
|
修改关注、申请方法中样式
|
2015-03-18 20:04:59 +08:00 |
|
whimlex
|
3faec141ce
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-18 18:03:17 +08:00 |
|
whimlex
|
7e8ee49298
|
资源库国际化
|
2015-03-18 18:02:54 +08:00 |
|
z9hang
|
52f2a31b84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-18 17:21:44 +08:00 |
|
z9hang
|
fd2c3e8201
|
修改课程动态接口
|
2015-03-18 17:21:19 +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 |
|
whimlex
|
85c51cac21
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-17 18:04:56 +08:00 |
|
whimlex
|
cfaf788e37
|
新版项目成员，关注者，资源库国际化；修改国际化缺失的bug
|
2015-03-17 18:04:35 +08:00 |