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 |
|
whimlex
|
e8da6ef871
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-17 15:07:51 +08:00 |
|
whimlex
|
50fe8f2bb7
|
项目配置模块
|
2015-03-17 15:06:15 +08:00 |
 z9hang
|
274295c948
|
#2033 项目--更多--新闻：编辑新闻相关问题
|
2015-03-17 14:55:21 +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
|
c77c1a81a4
|
html
|
2015-03-17 09:41:10 +08:00 |
|
lizanle
|
f94222cac7
|
html
|
2015-03-17 09:40:45 +08:00 |
|
lizanle
|
33669017bf
|
controller
|
2015-03-17 09:40:31 +08:00 |
|
lizanle
|
39cbeced87
|
model类
|
2015-03-17 09:39:12 +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
|
4817b3106e
|
kindeditor资源类
|
2015-03-17 09:36:20 +08:00 |
|
lizanle
|
5c4a62dcc4
|
DiscussDemo代码
|
2015-03-16 15:29:13 +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
|
e4e56e01b1
|
修改项目邀请用户失败时的提示
|
2015-03-13 17:46:09 +08:00 |
|
sw
|
ca7c970094
|
修改意见反馈框位置
|
2015-03-13 17:27:24 +08:00 |
|
z9hang
|
da23b4fd21
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-13 17:10:43 +08:00 |
|
z9hang
|
ff65bf4ba5
|
app自动更新功能功能，无法下载问题修正
|
2015-03-13 17:10:22 +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 |
|
z9hang
|
e165dd6572
|
修改编码
|
2015-03-13 13:41:26 +08:00 |
|
z9hang
|
2ccb7ff387
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-13 11:56:13 +08:00 |
|
z9hang
|
ed674d960c
|
课程动态国际化问题
|
2015-03-13 11:55:57 +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 |
|
whimlex
|
28321deeb5
|
邮件邀请用户
|
2015-03-12 18:04:12 +08:00 |
|
whimlex
|
18422ecf6a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/projects/invite_members_by_mail.html.erb
|
2015-03-12 17:50:15 +08:00 |
|
whimlex
|
1e5fac32b4
|
添加邮箱验证
|
2015-03-12 17:48:31 +08:00 |
|
sw
|
fd8edc9a02
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-12 17:34:25 +08:00 |
|
sw
|
2b28448397
|
Merge branch 'guange_dev' into szzh
|
2015-03-12 17:33:18 +08:00 |
|
huang
|
ab57e7e432
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-12 17:23:28 +08:00 |
|
huang
|
96b2627fda
|
修改邮件居中样式及提示
|
2015-03-12 17:22:52 +08:00 |
|
sw
|
362bad594f
|
修改项目发送邮件邀请页面样式，以及提示
|
2015-03-12 17:18:18 +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
|
7dc6f76060
|
Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev
|
2015-03-12 17:09:32 +08:00 |
|
sw
|
78039a726e
|
Merge branch 'szzh' into guange_dev
|
2015-03-12 17:09:20 +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 |