 lizanle
|
39cbeced87
|
model类
|
10 years ago |
|
lizanle
|
0c86ba210d
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
lizanle
|
4817b3106e
|
kindeditor资源类
|
10 years ago |
|
lizanle
|
5c4a62dcc4
|
DiscussDemo代码
|
10 years ago |
 sw
|
88d6b25ace
|
1、修改意见反馈图片
2、去掉个人首页权限判断
|
10 years ago |
guange
|
e798b7242b
|
Merge remote branch 'remotes/origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
f3d6d7c384
|
#2037 issue列表默认显示顺序改为最后更新的倒序
|
10 years ago |
|
guange
|
366fbcd4d4
|
#2105 fixed ie8下新建帖子时上传附件导致不能发表问题
|
10 years ago |
|
guange
|
bcb162c600
|
#1968 解决IE8不能上传的问题， 只是解决，体验还是没有chrome,firefox的好
|
10 years ago |
|
sw
|
3b0a229c43
|
1.修改意见反馈框默认关闭
2、FIle--->资源库
|
10 years ago |
|
sw
|
e4895731ae
|
Merge branch 'develop' into szzh
|
10 years ago |
whimlex
|
aee987d634
|
邀请Trustie用户
|
10 years ago |
|
sw
|
e4e56e01b1
|
修改项目邀请用户失败时的提示
|
10 years ago |
|
sw
|
ca7c970094
|
修改意见反馈框位置
|
10 years ago |
 z9hang
|
da23b4fd21
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
ff65bf4ba5
|
app自动更新功能功能，无法下载问题修正
|
10 years ago |
 huang
|
cc5a22f2c6
|
修改新建按钮样式
|
10 years ago |
|
sw
|
aa8d1741f9
|
修改项目发送邮箱时的正则验证
|
10 years ago |
|
huang
|
da02f3fbb4
|
去掉项目标签为空提示
|
10 years ago |
|
sw
|
368a3ce1fa
|
修改项目创建时间显示不正确
|
10 years ago |
|
huang
|
1ed542af09
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
10 years ago |
|
huang
|
a010c800d6
|
修改权限库为空情况下403问题
修改项目标题样式
确认发送国际化
添加小图标
|
10 years ago |
|
z9hang
|
e165dd6572
|
修改编码
|
10 years ago |
|
z9hang
|
2ccb7ff387
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
ed674d960c
|
课程动态国际化问题
|
10 years ago |
|
guange
|
08eae0e5eb
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
whimlex
|
cef923b8a8
|
邮件邀请用户国际化
|
10 years ago |
|
guange
|
ab6c21314d
|
#1503 老师发布的作业可以在课程动态中显示了
|
10 years ago |
|
huang
|
fb907094f8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
47e1427ead
|
左侧工具栏添加功能：左侧统计数目为零的手不显示
|
10 years ago |
|
whimlex
|
28321deeb5
|
邮件邀请用户
|
10 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
|
10 years ago |
|
whimlex
|
1e5fac32b4
|
添加邮箱验证
|
10 years ago |
|
sw
|
fd8edc9a02
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
2b28448397
|
Merge branch 'guange_dev' into szzh
|
10 years ago |
|
huang
|
ab57e7e432
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
96b2627fda
|
修改邮件居中样式及提示
|
10 years ago |
|
sw
|
362bad594f
|
修改项目发送邮件邀请页面样式，以及提示
|
10 years ago |
|
whimlex
|
3a1f0aec55
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
5f88ffc5d0
|
项目邀请用户国际化，js判断邮件格式
|
10 years ago |
|
sw
|
7dc6f76060
|
Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev
|
10 years ago |
|
sw
|
78039a726e
|
Merge branch 'szzh' into guange_dev
|
10 years ago |
|
sw
|
ceb6ccf908
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
971c278de5
|
#2026 作业创建时间->截至时间
|
10 years ago |
|
huang
|
77bf3be20d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_users.html.erb
|
10 years ago |
|
huang
|
b809e8844c
|
修改项目中添加标签按钮显示异常
|
10 years ago |
|
z9hang
|
2d05c3273f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
8190403380
|
app添加忘记密码接口，课程动态接口代码优化（去掉其中的中文）
|
10 years ago |
|
sw
|
d18e9ff66b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
312d7660b2
|
增加邀请成功后的提示
邀请成功后跳转页面修改
调整翻页控件的样式
|
10 years ago |
|
huang
|
4bfc72dc28
|
用新表统计动态
修改关注样式
|
10 years ago |
|
sw
|
2ee04d55f2
|
修改项目邀请用户的界面
|
10 years ago |
|
huang
|
6fa5863665
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
0ba7ef0560
|
修改邮箱邀请时，邮件为空时提示错误
|
10 years ago |
|
z9hang
|
7e7da7e445
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
a05061af73
|
#1859 课程--资源库：全站搜索中“选入我的其他课程”弹出的课程列表中包括当前课程
|
10 years ago |
|
sw
|
717be2b045
|
修改部分用户的用户首页报错
|
10 years ago |
|
sw
|
5340ad7fc1
|
修改组织首页不显示私有项目
|
10 years ago |
|
sw
|
69eecf49d1
|
还原冲突
|
10 years ago |
|
sw
|
2ac2c1848c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
10 years ago |
|
whimlex
|
6f4ef81eb9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
65ee3fdc74
|
项目主页国际化，项目主页JS冲突解决
|
10 years ago |
|
sw
|
5258b7585b
|
处理冲突还原代码
|
10 years ago |
|
huang
|
64bbbff879
|
添加里程碑
|
10 years ago |
|
sw
|
b27bb34662
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
10 years ago |
|
huang
|
c773e0fd39
|
JS冲突，去掉多余标点
|
10 years ago |
|
huang
|
29655838f0
|
项目超过的部分用“展示更多信息”拉开
|
10 years ago |
|
huang
|
c36db9fd63
|
项目左侧按钮实现配置-模块进行显示/隐藏管理
|
10 years ago |
|
whimlex
|
11da65c9ad
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
config/locales/en.yml
config/locales/zh.yml
|
10 years ago |
|
whimlex
|
57c8575470
|
新版项目模块国际化，目前完成各项目主页，项目动态，项目评分
|
10 years ago |
|
sw
|
4b831c9e65
|
#2001 项目--工具集中wiki-“查看差别”中有html标签
|
10 years ago |
|
huang
|
3ee9ac2b50
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
10 years ago |
|
huang
|
8f0af4c00d
|
修改了未登陆情况下通过URL访问不允访问的
|
10 years ago |
|
sw
|
04e5aee3c2
|
版本库和新建版本库两个不同的权限
|
10 years ago |
|
lizanle
|
d7c550b15b
|
给projects项目新建的时候添加创建人
|
10 years ago |
|
sw
|
4d58116da5
|
#1997 项目--工具集中的“创建版本库”和配置中“新建版本库”打开的窗口不一样
|
10 years ago |
|
sw
|
1e262ec731
|
修改项目上传资源链接
|
10 years ago |
|
lizanle
|
88ee202a4c
|
issue2012,分页显示方式修改
|
10 years ago |
|
lizanle
|
8f3f9ea2ed
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
a8a62ab750
|
issue2012,分页显示方式修改
|
10 years ago |
|
sw
|
52dfb0b0ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
27e72c1f39
|
#2000 增加项目每个模块的访问控制
|
10 years ago |
|
huang
|
078d2fa488
|
解决项目中文档为空情况显示异常
新建文件文件术语改变
|
10 years ago |
|
z9hang
|
ec455de3d4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
11c8c0510a
|
app版本管理报错问题
|
10 years ago |
|
z9hang
|
c552a22fb2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
14fe487835
|
将app个人课程动态接口中作业留言归类到更新了作业中
|
10 years ago |
|
huang
|
cbfb72bd5b
|
修改新建资源库显示
|
10 years ago |
|
huang
|
aa2a41d368
|
修改文档 从项目动态点入后导航栏显示错误
|
10 years ago |
|
whimlex
|
93df92e660
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
540ddd4a1b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
10 years ago |
|
whimlex
|
0eafbb92d5
|
意见反馈模块国际化
|
10 years ago |
|
huang
|
49cf6e1319
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
32a2e7ae1f
|
修改默认情况下 用户反馈框处于关闭状态
|
10 years ago |
|
z9hang
|
743a642cf1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
eec155f077
|
课程资源页面app自动登陆处理
|
10 years ago |
|
sw
|
b0eba062a8
|
修复项目、课程留言不正确的BUG
|
10 years ago |
|
guange
|
38c3b40ca1
|
#1701 修复在编辑作业时，删附件会导致名称编辑内容丢失
|
10 years ago |
|
sw
|
9060c9acbc
|
#1977 项目发布新贴跳转有问题
|
10 years ago |
|
sw
|
aa3ab86fb0
|
#2013 个人主页--留言--留言输入框不见了
|
10 years ago |
|
guange
|
e5e46819b4
|
#867 新建缺陷：校验失败也要保存上传文件信息
|
10 years ago |
|
guange
|
fd676f13b5
|
#994 作品下载：资源排序修正
|
10 years ago |
|
z9hang
|
57ba46ff00
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
10 years ago |
|
z9hang
|
43e9a9a495
|
1、完成手机app版本管理，上传客户端功能。2、手机app检查更新接口完成
|
10 years ago |
|
sw
|
138fac9509
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/homework_attach/_jour.html.erb
app/views/homework_attach/_journal_reply_items.html.erb
app/views/homework_attach/_showjour.html.erb
app/views/words/_feedback.html.erb
app/views/words/_journal_reply_items.html.erb
app/views/words/_message.html.erb
|
10 years ago |
|
lizanle
|
87394fe4ce
|
issue2626，建议什么时候创建工程的信息也要加进来。
|
10 years ago |
|
lizanle
|
58cbfa6af7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
383d90bb12
|
issue2626，建议什么时候创建工程的信息也要加进来。
|
10 years ago |
|
guange
|
31351bc9e8
|
#1095 在issue主题下，输1个字符可以进行搜索，500错误解决
|
10 years ago |
|
z9hang
|
87f0d73ac0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
803f4a3eaf
|
1、部分页面根据apptoken参数自动登录功能添加token是否过期判断。2、版本管理发布新版本信息功能添加
|
10 years ago |
|
sw
|
4034e3565a
|
修改新建项目html代码不争取
修改新建项目提示信息有两个
|
10 years ago |
|
sw
|
8a7fc85e8b
|
系统中部分回复的本地化文件缺失
|
10 years ago |
|
guange
|
5d1a5a0b11
|
#1738 修复图片下载次数不正确问题
|
10 years ago |
|
sw
|
bdd1980876
|
修复个人动态首页报错
|
10 years ago |
|
whimlex
|
57c97f3dc8
|
层级回复留言标签修改
|
10 years ago |
|
z9hang
|
08f625446e
|
app版本管理功能新建版本界面
|
10 years ago |
|
whimlex
|
4b19463db7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
app/views/users/show.html.erb
config/locales/zh.yml
|
10 years ago |
|
whimlex
|
115eb38a02
|
完善用户资料模块，用户主页课程栏、留言栏、项目栏和标签模块国际化；对一些存储在数据表中的固定的中文属性，比如学期，职称，在helper和model中定义方法封装；平台导航模块，包括各模块内部导航的国际化；课程平台模块国际化整理和修改，去除重复功能标签
|
10 years ago |
|
sw
|
61167e55c9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
052afefa5e
|
用户课程动态按更新时间倒序排列
|
10 years ago |
|
z9hang
|
6ca853edc7
|
1、课程首页2、用户首页3、课程留言页4、发布作业页5、用户的留言页6、为课程作业创建作品页传递apptoken参数时自动登录功能
|
10 years ago |
|
z9hang
|
26adc13ca2
|
修改用户课程动态接口
|
10 years ago |
|
sw
|
81b58e5c87
|
修改base_project中代码错误
|
10 years ago |
|
z9hang
|
83cc1b41f3
|
修正api配置
|
10 years ago |
|
z9hang
|
d634532789
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/en.yml
config/locales/zh.yml
|
10 years ago |
|
z9hang
|
d96b87cf42
|
修改用户课程动态接口返回数据
|
10 years ago |
|
sw
|
d1912865d3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
0402fee6de
|
修改邮件邀请
|
10 years ago |
|
huang
|
402f3701da
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
d947ebff0c
|
添加国际化
|
10 years ago |
|
sw
|
8c44d25750
|
处理资源标签搜索中标签丢失的问题
|
10 years ago |
|
sw
|
659a87ef60
|
修复部分本地化标签丢失
|
10 years ago |
|
lizanle
|
bd9a645c2c
|
project动态分页页码数显示个数减少
|
10 years ago |
|
lizanle
|
53d144e8d2
|
project动态当前页在最后。
|
10 years ago |
|
sw
|
7c03b03fa9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
b0897638d9
|
修改进入问卷结果页面描述样式显示不正确的BUG
|
10 years ago |
|
sw
|
6a7c7a732c
|
修改首页报500
|
10 years ago |
|
z9hang
|
610746301f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
5a3d324ce4
|
添加课程留言列表接口
|
10 years ago |
|
sw
|
3af9c63ae0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
 alan
|
838c39da69
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
app/views/projects/_invite_members_by_mail.html.erb
|
10 years ago |
|
alan
|
48ac3dbea8
|
修改《测试版--注册时返回500错误》以及项目邀请时邮箱验证功能
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
z9hang
|
0f2ded4d25
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
782071ab64
|
显示接口不能用问题，app版本管理部分代码
|
10 years ago |
|
huang
|
ba09213023
|
添加新闻模块、部分样式
|
10 years ago |
|
sw
|
b292df42d7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
c6788e2f40
|
修复首页报错
|
10 years ago |
|
huang
|
eb6deed682
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
749e10592d
|
修改邮件页面样式
|
10 years ago |
