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 |
|
huang
|
216bc57004
|
1、进入项目子讨论区之后的页面
2、修改火狐浏览器“展开信息”异常
|
2015-03-17 17:21:49 +08:00 |
|
huang
|
003b088091
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-17 17:03:57 +08:00 |
|
huang
|
4111e2a940
|
1、讨论区新子界面
2、项目右侧优化
|
2015-03-17 17:02:32 +08:00 |
|
z9hang
|
274295c948
|
#2033 项目--更多--新闻：编辑新闻相关问题
|
2015-03-17 14:55:21 +08:00 |
|
lizanle
|
86020804c9
|
ok
|
2015-03-17 09:42:04 +08:00 |
|
lizanle
|
c77c1a81a4
|
html
|
2015-03-17 09:41:10 +08:00 |
|
lizanle
|
f94222cac7
|
html
|
2015-03-17 09:40:45 +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 |
|
guange
|
e798b7242b
|
Merge remote branch 'remotes/origin/szzh' into guange_dev
|
2015-03-15 23:10:48 +08:00 |
|
guange
|
366fbcd4d4
|
#2105 fixed ie8下新建帖子时上传附件导致不能发表问题
|
2015-03-14 12:29:09 +08:00 |
|
guange
|
bcb162c600
|
#1968 解决IE8不能上传的问题， 只是解决，体验还是没有chrome,firefox的好
|
2015-03-14 12:01:08 +08:00 |
 sw
|
3b0a229c43
|
1.修改意见反馈框默认关闭
2、FIle--->资源库
|
2015-03-13 18:01:16 +08:00 |
|
sw
|
e4895731ae
|
Merge branch 'develop' into szzh
|
2015-03-13 17:48:12 +08:00 |
|
whimlex
|
aee987d634
|
邀请Trustie用户
|
2015-03-13 17:47:58 +08:00 |
|
sw
|
ca7c970094
|
修改意见反馈框位置
|
2015-03-13 17:27:24 +08:00 |
|
huang
|
cc5a22f2c6
|
修改新建按钮样式
|
2015-03-13 16:16:38 +08:00 |
|
sw
|
aa8d1741f9
|
修改项目发送邮箱时的正则验证
|
2015-03-13 15:46:00 +08:00 |
|
huang
|
da02f3fbb4
|
去掉项目标签为空提示
|
2015-03-13 15:45:10 +08:00 |
|
sw
|
368a3ce1fa
|
修改项目创建时间显示不正确
|
2015-03-13 15:40:19 +08:00 |
|
huang
|
1ed542af09
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
2015-03-13 15:40:06 +08:00 |
|
huang
|
a010c800d6
|
修改权限库为空情况下403问题
修改项目标题样式
确认发送国际化
添加小图标
|
2015-03-13 15:37:54 +08:00 |
|
whimlex
|
cef923b8a8
|
邮件邀请用户国际化
|
2015-03-13 09:46:05 +08:00 |
|
huang
|
fb907094f8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-12 19:32:51 +08:00 |
|
huang
|
47e1427ead
|
左侧工具栏添加功能：左侧统计数目为零的手不显示
|
2015-03-12 19:29:44 +08:00 |