 lizanle
|
0c86ba210d
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
lizanle
|
4817b3106e
|
kindeditor资源类
|
11 years ago |
|
lizanle
|
a0e8abb5ea
|
kindeditor配置文件
|
11 years ago |
|
lizanle
|
5c4a62dcc4
|
DiscussDemo代码
|
11 years ago |
|
lizanle
|
8ad4dba8c2
|
kindeditor资源文件
|
11 years ago |
|
lizanle
|
48b08a20ee
|
增加gem包
|
11 years ago |
|
lizanle
|
6bafec03e9
|
添加路由
|
11 years ago |
|
lizanle
|
a9cafb2241
|
新建DiscussDemo表
|
11 years ago |
 sw
|
3b0a229c43
|
1.修改意见反馈框默认关闭
2、FIle--->资源库
|
11 years ago |
|
sw
|
e4895731ae
|
Merge branch 'develop' into szzh
|
11 years ago |
whimlex
|
aee987d634
|
邀请Trustie用户
|
11 years ago |
|
sw
|
e4e56e01b1
|
修改项目邀请用户失败时的提示
|
11 years ago |
|
sw
|
ca7c970094
|
修改意见反馈框位置
|
11 years ago |
 z9hang
|
da23b4fd21
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
ff65bf4ba5
|
app自动更新功能功能，无法下载问题修正
|
11 years ago |
 huang
|
cc5a22f2c6
|
修改新建按钮样式
|
11 years ago |
|
sw
|
aa8d1741f9
|
修改项目发送邮箱时的正则验证
|
11 years ago |
|
huang
|
da02f3fbb4
|
去掉项目标签为空提示
|
11 years ago |
|
sw
|
368a3ce1fa
|
修改项目创建时间显示不正确
|
11 years ago |
|
huang
|
1ed542af09
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
huang
|
a010c800d6
|
修改权限库为空情况下403问题
修改项目标题样式
确认发送国际化
添加小图标
|
11 years ago |
|
sw
|
7894ceb50e
|
Merge branch 'szzh' into develop
|
11 years ago |
|
z9hang
|
e165dd6572
|
修改编码
|
11 years ago |
|
z9hang
|
2ccb7ff387
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
ed674d960c
|
课程动态国际化问题
|
11 years ago |
|
whimlex
|
be75bcef47
|
项目得分国际化
|
11 years ago |
|
whimlex
|
baa854c5a9
|
公共标签
|
11 years ago |
|
whimlex
|
cef923b8a8
|
邮件邀请用户国际化
|
11 years ago |
|
huang
|
fb907094f8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
47e1427ead
|
左侧工具栏添加功能：左侧统计数目为零的手不显示
|
11 years ago |
|
whimlex
|
28321deeb5
|
邮件邀请用户
|
11 years ago |
|
sw
|
c52eebe6f4
|
Merge branch 'szzh' into develop
|
11 years ago |
|
whimlex
|
18422ecf6a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/projects/invite_members_by_mail.html.erb
|
11 years ago |
|
whimlex
|
1e5fac32b4
|
添加邮箱验证
|
11 years ago |
|
sw
|
fd8edc9a02
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
2b28448397
|
Merge branch 'guange_dev' into szzh
|
11 years ago |
|
huang
|
ab57e7e432
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
96b2627fda
|
修改邮件居中样式及提示
|
11 years ago |
|
sw
|
3fd94ce243
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/projects/invite_members_by_mail.html.erb
|
11 years ago |
|
sw
|
362bad594f
|
修改项目发送邮件邀请页面样式，以及提示
|
11 years ago |
|
whimlex
|
3a1f0aec55
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
5f88ffc5d0
|
项目邀请用户国际化，js判断邮件格式
|
11 years ago |
|
sw
|
7dc6f76060
|
Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev
|
11 years ago |
|
sw
|
78039a726e
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
|
sw
|
ceb6ccf908
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
971c278de5
|
#2026 作业创建时间->截至时间
|
11 years ago |
|
huang
|
77bf3be20d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_users.html.erb
|
11 years ago |
|
huang
|
b809e8844c
|
修改项目中添加标签按钮显示异常
|
11 years ago |
|
z9hang
|
2d05c3273f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
8190403380
|
app添加忘记密码接口，课程动态接口代码优化（去掉其中的中文）
|
11 years ago |
