 sw
|
747a109638
|
1、添加CSS文件
2、调整首页HTML
3、去掉base_header中没用的erb语句
|
11 years ago |
|
sw
|
88d6b25ace
|
1、修改意见反馈图片
2、去掉个人首页权限判断
|
11 years ago |
guange
|
e798b7242b
|
Merge remote branch 'remotes/origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
f3d6d7c384
|
#2037 issue列表默认显示顺序改为最后更新的倒序
|
11 years ago |
|
guange
|
366fbcd4d4
|
#2105 fixed ie8下新建帖子时上传附件导致不能发表问题
|
11 years ago |
|
guange
|
bcb162c600
|
#1968 解决IE8不能上传的问题， 只是解决，体验还是没有chrome,firefox的好
|
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 |
|
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 |
|
guange
|
08eae0e5eb
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
whimlex
|
cef923b8a8
|
邮件邀请用户国际化
|
11 years ago |
|
guange
|
ab6c21314d
|
#1503 老师发布的作业可以在课程动态中显示了
|
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 |
|
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
|
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 |
|
sw
|
d18e9ff66b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
312d7660b2
|
增加邀请成功后的提示
邀请成功后跳转页面修改
调整翻页控件的样式
|
11 years ago |
|
huang
|
4bfc72dc28
|
用新表统计动态
修改关注样式
|
11 years ago |
|
sw
|
2ee04d55f2
|
修改项目邀请用户的界面
|
11 years ago |
|
huang
|
6fa5863665
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
0ba7ef0560
|
修改邮箱邀请时，邮件为空时提示错误
|
11 years ago |
|
z9hang
|
7e7da7e445
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
a05061af73
|
#1859 课程--资源库：全站搜索中“选入我的其他课程”弹出的课程列表中包括当前课程
|
11 years ago |
|
sw
|
717be2b045
|
修改部分用户的用户首页报错
|
11 years ago |
|
sw
|
5340ad7fc1
|
修改组织首页不显示私有项目
|
11 years ago |
|
sw
|
69eecf49d1
|
还原冲突
|
11 years ago |
|
sw
|
2ac2c1848c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
11 years ago |
|
whimlex
|
6f4ef81eb9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
65ee3fdc74
|
项目主页国际化，项目主页JS冲突解决
|
11 years ago |
|
sw
|
5258b7585b
|
处理冲突还原代码
|
11 years ago |
|
huang
|
64bbbff879
|
添加里程碑
|
11 years ago |
|
sw
|
b27bb34662
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
11 years ago |
|
huang
|
c773e0fd39
|
JS冲突，去掉多余标点
|
11 years ago |
|
huang
|
29655838f0
|
项目超过的部分用“展示更多信息”拉开
|
11 years ago |
|
huang
|
c36db9fd63
|
项目左侧按钮实现配置-模块进行显示/隐藏管理
|
11 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
|
11 years ago |
|
whimlex
|
57c8575470
|
新版项目模块国际化，目前完成各项目主页，项目动态，项目评分
|
11 years ago |
|
sw
|
4b831c9e65
|
#2001 项目--工具集中wiki-“查看差别”中有html标签
|
11 years ago |
|
huang
|
3ee9ac2b50
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
11 years ago |
|
huang
|
8f0af4c00d
|
修改了未登陆情况下通过URL访问不允访问的
|
11 years ago |
|
sw
|
04e5aee3c2
|
版本库和新建版本库两个不同的权限
|
11 years ago |
 lizanle
|
d7c550b15b
|
给projects项目新建的时候添加创建人
|
11 years ago |
|
sw
|
4d58116da5
|
#1997 项目--工具集中的“创建版本库”和配置中“新建版本库”打开的窗口不一样
|
11 years ago |
|
sw
|
1e262ec731
|
修改项目上传资源链接
|
11 years ago |
|
lizanle
|
88ee202a4c
|
issue2012,分页显示方式修改
|
11 years ago |
|
lizanle
|
8f3f9ea2ed
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
a8a62ab750
|
issue2012,分页显示方式修改
|
11 years ago |
|
sw
|
52dfb0b0ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
27e72c1f39
|
#2000 增加项目每个模块的访问控制
|
11 years ago |
|
huang
|
078d2fa488
|
解决项目中文档为空情况显示异常
新建文件文件术语改变
|
11 years ago |
|
z9hang
|
ec455de3d4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
11c8c0510a
|
app版本管理报错问题
|
11 years ago |
|
z9hang
|
c552a22fb2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
14fe487835
|
将app个人课程动态接口中作业留言归类到更新了作业中
|
11 years ago |
|
huang
|
cbfb72bd5b
|
修改新建资源库显示
|
11 years ago |
|
huang
|
aa2a41d368
|
修改文档 从项目动态点入后导航栏显示错误
|
11 years ago |
|
whimlex
|
93df92e660
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
540ddd4a1b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
whimlex
|
0eafbb92d5
|
意见反馈模块国际化
|
11 years ago |
|
huang
|
49cf6e1319
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
32a2e7ae1f
|
修改默认情况下 用户反馈框处于关闭状态
|
11 years ago |
|
z9hang
|
743a642cf1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
eec155f077
|
课程资源页面app自动登陆处理
|
11 years ago |
|
sw
|
b0eba062a8
|
修复项目、课程留言不正确的BUG
|
11 years ago |
|
guange
|
38c3b40ca1
|
#1701 修复在编辑作业时，删附件会导致名称编辑内容丢失
|
11 years ago |
|
sw
|
9060c9acbc
|
#1977 项目发布新贴跳转有问题
|
11 years ago |
|
sw
|
aa3ab86fb0
|
#2013 个人主页--留言--留言输入框不见了
|
11 years ago |
|
guange
|
e5e46819b4
|
#867 新建缺陷：校验失败也要保存上传文件信息
|
11 years ago |
|
guange
|
fd676f13b5
|
#994 作品下载：资源排序修正
|
11 years ago |
|
z9hang
|
57ba46ff00
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
z9hang
|
43e9a9a495
|
1、完成手机app版本管理，上传客户端功能。2、手机app检查更新接口完成
|
11 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
|
11 years ago |
|
lizanle
|
87394fe4ce
|
issue2626，建议什么时候创建工程的信息也要加进来。
|
11 years ago |
|
lizanle
|
58cbfa6af7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
383d90bb12
|
issue2626，建议什么时候创建工程的信息也要加进来。
|
11 years ago |
|
guange
|
31351bc9e8
|
#1095 在issue主题下，输1个字符可以进行搜索，500错误解决
|
11 years ago |
|
z9hang
|
87f0d73ac0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
803f4a3eaf
|
1、部分页面根据apptoken参数自动登录功能添加token是否过期判断。2、版本管理发布新版本信息功能添加
|
11 years ago |
|
sw
|
4034e3565a
|
修改新建项目html代码不争取
修改新建项目提示信息有两个
|
11 years ago |
|
sw
|
8a7fc85e8b
|
系统中部分回复的本地化文件缺失
|
11 years ago |
|
guange
|
5d1a5a0b11
|
#1738 修复图片下载次数不正确问题
|
11 years ago |
|
sw
|
bdd1980876
|
修复个人动态首页报错
|
11 years ago |
|
whimlex
|
57c97f3dc8
|
层级回复留言标签修改
|
11 years ago |
|
z9hang
|
08f625446e
|
app版本管理功能新建版本界面
|
11 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
|
11 years ago |
|
whimlex
|
115eb38a02
|
完善用户资料模块，用户主页课程栏、留言栏、项目栏和标签模块国际化；对一些存储在数据表中的固定的中文属性，比如学期，职称，在helper和model中定义方法封装；平台导航模块，包括各模块内部导航的国际化；课程平台模块国际化整理和修改，去除重复功能标签
|
11 years ago |
|
sw
|
61167e55c9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
052afefa5e
|
用户课程动态按更新时间倒序排列
|
11 years ago |
|
z9hang
|
6ca853edc7
|
1、课程首页2、用户首页3、课程留言页4、发布作业页5、用户的留言页6、为课程作业创建作品页传递apptoken参数时自动登录功能
|
11 years ago |
|
z9hang
|
26adc13ca2
|
修改用户课程动态接口
|
11 years ago |
|
sw
|
81b58e5c87
|
修改base_project中代码错误
|
11 years ago |
|
z9hang
|
83cc1b41f3
|
修正api配置
|
11 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
|
11 years ago |
|
z9hang
|
d96b87cf42
|
修改用户课程动态接口返回数据
|
11 years ago |
|
sw
|
d1912865d3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
0402fee6de
|
修改邮件邀请
|
11 years ago |
|
huang
|
402f3701da
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
d947ebff0c
|
添加国际化
|
11 years ago |
|
sw
|
8c44d25750
|
处理资源标签搜索中标签丢失的问题
|
11 years ago |
|
sw
|
659a87ef60
|
修复部分本地化标签丢失
|
11 years ago |
|
lizanle
|
bd9a645c2c
|
project动态分页页码数显示个数减少
|
11 years ago |
|
lizanle
|
53d144e8d2
|
project动态当前页在最后。
|
11 years ago |
|
sw
|
7c03b03fa9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
b0897638d9
|
修改进入问卷结果页面描述样式显示不正确的BUG
|
11 years ago |
|
sw
|
6a7c7a732c
|
修改首页报500
|
11 years ago |
|
z9hang
|
610746301f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
5a3d324ce4
|
添加课程留言列表接口
|
11 years ago |
|
sw
|
3af9c63ae0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 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
|
11 years ago |
|
alan
|
48ac3dbea8
|
修改《测试版--注册时返回500错误》以及项目邀请时邮箱验证功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
0f2ded4d25
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
782071ab64
|
显示接口不能用问题，app版本管理部分代码
|
11 years ago |
|
huang
|
ba09213023
|
添加新闻模块、部分样式
|
11 years ago |
|
sw
|
b292df42d7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
c6788e2f40
|
修复首页报错
|
11 years ago |
|
huang
|
eb6deed682
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
749e10592d
|
修改邮件页面样式
|
11 years ago |
|
sw
|
fea7bd6ad1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
3f3bb62678
|
非项目成员添加新闻、添加讨论区按钮不可见
|
11 years ago |
|
lizanle
|
a701eb91a2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
e8bdc13f24
|
缺陷1975，打开project 330的时候报错
|
11 years ago |
|
sw
|
945b9ff9cf
|
修复进入我的动态，关注人没有进行权限过滤的BUG
|
11 years ago |
|
alan
|
6cf7e156d1
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
5c1a6f7754
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
sw
|
3e3cde0805
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
alan
|
151fc561ac
|
修改邮件样式，增加相应的提示
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
ff2b4c610c
|
1、修改用户动态每页显示条目不正确
2、用户动态增加新闻、留言等权限判断的补全，以及部分权限判断不正确
|
11 years ago |
|
huang
|
e22b389971
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
b043d07d61
|
修改发布新贴显示问题
|
11 years ago |
|
alan
|
5ff43fdea7
|
项目添加新用户邮件发送功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
ce792f6ce8
|
修改邮件发送界面
|
11 years ago |
|
huang
|
b3cbfd39ca
|
修改一些缺陷，删掉多余的文件
|
11 years ago |
|
huang
|
f898e2aa91
|
16:22
|
11 years ago |
|
z9hang
|
6e7b294452
|
注释掉不用的ＡＰＩ
|
11 years ago |
|
z9hang
|
c1c05067e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/admin_controller.rb
db/schema.rb
|
11 years ago |
|
z9hang
|
754acc6945
|
移动端版本管理
|
11 years ago |
|
huang
|
b2b978d540
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
c159bb2c48
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/projects_controller.rb
app/views/issues/show.html.erb
app/views/layouts/base_projects.html.erb
app/views/projects/_form.html.erb
app/views/projects/new.html.erb
app/views/projects/show.html.erb
|
11 years ago |
|
sw
|
a6b3ddcfcb
|
Merge branch 'szzh' into dev_zanle
|
11 years ago |
|
sw
|
e58f5d4af5
|
#1941 问卷描述，当编辑时有输入空格行时，点击确定js不会刷新，而且不会对剪辑的格式进行存储
|
11 years ago |
|
huang
|
beac15475d
|
新项目及用户反馈框的修改！！
|
11 years ago |
|
lizanle
|
10faab0129
|
新建的项目发布新问题报500
|
11 years ago |
|
lizanle
|
140cb81748
|
测试版发布课程通知和讨论区发布新帖报500
|
11 years ago |
|
sw
|
e326934027
|
调整组织首页缺少项目时的显示样式
|
11 years ago |
|
sw
|
5692cbf202
|
#1965 公共贴吧取消软件创客入口
|
11 years ago |
|
sw
|
3c1f1d8bad
|
修改部分浏览器下发布问卷、取消发布问卷样式显示不正确
|
11 years ago |
|
sw
|
26081c6120
|
新建项目时增加不选择所属组织
|
11 years ago |
|
sw
|
1f2b5eedb8
|
Merge branch 'dev_zanle' into szzh
Conflicts:
app/views/projects/show.html.erb
db/schema.rb
|
11 years ago |
|
sw
|
d947a914cc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
e2307366f6
|
实现组织的增、删、改、查功能及相关界面
|
11 years ago |
|
z9hang
|
3334299808
|
app版本管理功能（表添加，页面部分添加）
|
11 years ago |
|
lizanle
|
8d322edb90
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/views/projects/show.html.erb
|
11 years ago |
|
sw
|
3c4b502e97
|
1、修改进入组织主页项目列表显示不正确的问题
2、admin页面增加组织列表显示
|
11 years ago |
|
sw
|
5f8595d874
|
admin页面增加组织列表
|
11 years ago |
|
sw
|
45fe622f26
|
1、修改进入系统首页报错
2、增加组织的默认图片
|
11 years ago |
|
sw
|
3b4bf8b99d
|
增加组织的index界面，以及index界面到组织首页的跳转
|
11 years ago |
|
sw
|
dead08a0d6
|
添加、修改项目增加所属组织的选择
|
11 years ago |
|
sw
|
d1edd86e11
|
1、修改组织首页项目获取
2、修改此组织没有项目时的样式
|
11 years ago |
|
z9hang
|
04dea372c5
|
添加意见反馈接口
|
11 years ago |
|
sw
|
a64671f9de
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
bcc8abdee9
|
1、增加组织相关数据表
2、增加组织和项目的关联关系
|
11 years ago |
|
z9hang
|
d1651f7252
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
d01aa5f15c
|
关注接口限制不能关注自己
|
11 years ago |
|
sw
|
ef5b7c9fca
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
7f249d29f4
|
修整页面代码
|
11 years ago |
|
z9hang
|
199ef4ebe6
|
匿评作品详情列表补上cur_page字段
|
11 years ago |
|
z9hang
|
509a37a575
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
411d201fc3
|
作业详情接口添加留言列表
|
11 years ago |
|
sw
|
a2d986f70c
|
修改页面代码
|
11 years ago |
|
lizanle
|
7ee58d1d44
|
项目动态重写，并去掉首页缓存
|
11 years ago |
|
sw
|
032e28067d
|
#1959 项目评分是0的，就不显示了！
|
11 years ago |
|
sw
|
33e9a3e326
|
#1958 关注有用户0个后边取消冒号
|
11 years ago |
|
sw
|
5bba54432d
|
#1930 项目缺陷显示个数修改
|
11 years ago |
|
sw
|
2c4e864080
|
#1949 学生可以通过url访问老师并未发布的问卷并进行作答
|
11 years ago |
|
sw
|
da21e61afd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
451a022d5f
|
作业详情、作业列表返回数据修改
|
11 years ago |
|
sw
|
9233213127
|
修复未登录时进入指定学校课程列表显示却是国防科大课程列表的BUG
|
11 years ago |
|
z9hang
|
7b5eb9db8b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
32264fb4a6
|
课程动态接口修改为用户所有课程动态接口
|
11 years ago |
|
sw
|
bbeaa6e80c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
90d9e77b32
|
修复课程主页没有2015年课程
|
11 years ago |
|
alan
|
22ac578ede
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
alan
|
f374bfd7e2
|
修复《窗口跳转问题》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
d999a9f4a6
|
修复新建课程时报错的BUG
|
11 years ago |
|
z9hang
|
18271946d7
|
作业详情，课程作业列表接口返回数据格式修改（增加了作业作者相关信息）
|
11 years ago |
|
z9hang
|
2f762973b4
|
课程动态接口返回数据格式修改
|
11 years ago |
|
z9hang
|
196ceff138
|
返回课程的接口补上当前用户是否为课程成员，课程老师信息
|
11 years ago |
|
alan
|
c00deabf75
|
修改《邮件样式》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
aa8f58530c
|
给黄总提供接口
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
4bfc4493eb
|
添加《邮件周日发送》功能，修改《贴吧》邮件发送策略
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
a6882d0f88
|
获取所有课程及显示课程接口返回数据中添加当前用户是否是课程成员、及是否是课程教师字段
|
11 years ago |
|
z9hang
|
e4442bfe04
|
用户课程、搜索课程接口返回数据添加当前用户是否是课程成员、及是否是课程老师两字段
|
11 years ago |
|
z9hang
|
85782cdb8d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
3018ee206c
|
修改时间格式解析
|
11 years ago |
|
sw
|
5ef1bc1d02
|
修改本地登录后报错
修改zh.yml文件异常
|
11 years ago |
|
sw
|
73d2e2e5e2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
22aae1910b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/_search_project.html.erb
config/locales/en.yml
config/locales/zh.yml
|
11 years ago |
|
whimlex
|
59a2c8283a
|
国际化结构调整
|
11 years ago |
|
z9hang
|
103a411b40
|
修改用户搜索接口
|
11 years ago |
|
sw
|
f380d781e7
|
增加根据已有课程复制成新课程的路由以及方法实现
|
11 years ago |
|
sw
|
2ceb21b83b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
alan
|
7442cc1ca4
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into email_verify
|
11 years ago |
|
alan
|
6e72e07028
|
Merge branch 'szzh' into email_verify
Conflicts:
Gemfile
Gemfile.lock
|
11 years ago |
|
alan
|
6f9e2bad63
|
mail weekly
|
11 years ago |
|
z9hang
|
d913f89a82
|
添加课程动态接口
|
11 years ago |
|
z9hang
|
cc83b30fc6
|
修正搜索用户接口，添加课程动态接口
|
11 years ago |
|
sw
|
859889b750
|
简化查询匿评数量的代码
|
11 years ago |
|
sw
|
3c8f851c37
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
4cdb3c83dd
|
增加获取用户在指定课程内作业数量的接口
|
11 years ago |
|
sw
|
0b41afa571
|
修改作业匿评界面，左侧附件名显示混乱
|
11 years ago |
|
z9hang
|
cd25628208
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
b1903dba11
|
添加课程留言接口
|
11 years ago |
|
lizanle
|
d902d76ae2
|
将google统计换为了百度统计
|
11 years ago |
|
sw
|
50244e6860
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
95b757ba09
|
修改问卷发布成功和取消发布成功后弹框提示样式
|
11 years ago |
|
z9hang
|
0dfa428377
|
手机ＡＰＩ添加回复留言接口
|
11 years ago |
|
z9hang
|
ef203ff40c
|
修正作业留言接口
|
11 years ago |
|
z9hang
|
d6813e5996
|
项目新闻报错问题，作业留言接口
|
11 years ago |
|
z9hang
|
d6b82c3549
|
修正课程通知评论接口
|
11 years ago |
|
z9hang
|
4fdc1b97a5
|
配置API comment接口，修正显示课程通知接口未判断权限问题
|
11 years ago |
|
z9hang
|
3cd97f8a70
|
API添加comment模块
|
11 years ago |
|
z9hang
|
d1e2bfd6c4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
6d79c2cf83
|
手机端ＡＰＩ添加新闻评论实体Comment，新闻实体中引用Comment,课程新闻列表添加权限判断，并修正该接口不可用问题
|
11 years ago |
|
sw
|
da56477ed0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
7e6d4e6215
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
8216453a02
|
匿评作品详情返回结果中添加comment_status字段 0:所属作业尚未开启匿评，1：匿评中 2：匿评结束
|
11 years ago |
|
z9hang
|
87e658a0f1
|
修改评论接口，匿评结束后依然可以评论（属于留言）
|
11 years ago |
|
huang
|
59e7f2f28b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
8bef9420cf
|
修改企业版中自己能看到自己的私有项目
|
11 years ago |
|
z9hang
|
9708c50899
|
添加作品评分接口
|
11 years ago |
|
sw
|
a752ade770
|
#1922 测试版--平台上传附件功能，附件显示问题
|
11 years ago |
|
sw
|
6226974f0b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
56fa330fed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
26b1f9f433
|
修改企业版中存在的一些bug
最多只显示十个项目
提示的样式
代码优化
|
11 years ago |
|
sw
|
7ab5eeab65
|
#1839上传附件名延后省略号显示
|
11 years ago |
|
sw
|
320ee9289a
|
#1897 修改点击DTS测试之后，TAB页背景色变化
|
11 years ago |
|
alan
|
44c783a61b
|
帖子的邮件通知改成只有版主收到
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
93410e0d57
|
#1919 取消作业留言的动态显示
|
11 years ago |
|
alan
|
646678c9db
|
修改《课程--学生列表：输入有效条件获得搜索结果，对搜索结果按积分排序，却自动返回对所有学生排序》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
858b5ea97c
|
修改《讨论吧发帖发送邮件错误问题》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
lizanle
|
fa8475387a
|
Merge branch 'szzh' into dev_zanle
|
11 years ago |
|
lizanle
|
8f5e613477
|
添加一些对代码理解的注释
|
11 years ago |
|
sw
|
a29887cfed
|
关闭问卷后，发布问卷和其他的发布问卷框框未对齐
|
11 years ago |
|
sw
|
78d8a0a1c6
|
修改意见反馈折叠后背景为透明
|
11 years ago |
|
sw
|
6261d95eba
|
首页显示异常
|
11 years ago |
|
z9hang
|
944dc33212
|
注释掉API文档
|
11 years ago |
|
z9hang
|
836be8c75e
|
添加企业首页配置功能
|
11 years ago |
|
alan
|
9681e08600
|
Merge branch 'szzh' into email_verify
Conflicts:
Gemfile.lock
|
11 years ago |
|
sw
|
79d1a069c2
|
修改公司名字过长首页显示有问题
|
11 years ago |
|
huang
|
2a65ba3af8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
1dd8724656
|
修改样式
|
11 years ago |
|
alan
|
1010003737
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
alan
|
134f0d5557
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
huang
|
3350bb98b6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
alan
|
9e36f9264c
|
修改《竞赛作业评分》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
523af8b2a9
|
修改企业版结构及列表页面
|
11 years ago |
|
alan
|
48cb0e0450
|
email verify
|
11 years ago |
|
sw
|
2cc31e5c72
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
c413ce1405
|
项目企业模块国际化修改
|
11 years ago |
|
sw
|
f3b99ec045
|
修改项目首页搜索按钮移位
|
11 years ago |
|
sw
|
9b854f4264
|
修改编辑作业列表显示异常
|
11 years ago |
|
sw
|
d76c0a5365
|
修改新建作业界面显示异常
|
11 years ago |
|
sw
|
8289ca6c89
|
11111
|
11 years ago |
|
whimlex
|
6a22e47b0a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
57237c76d8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
whimlex
|
3e1d90630e
|
找回密码，邮件激活国际化
|
11 years ago |
|
alan
|
3484fd34bb
|
merge dev_zanle branch
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
7710af316d
|
Merge remote-tracking branch 'remotes/origin/dev_zanle' into szzh
|
11 years ago |
|
alan
|
b5e49e2e1c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
huang
|
768e06ea8a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
be9ff9b4bb
|
修改控制器名
解决列表中企业重名的bug
|
11 years ago |
|
alan
|
e34e87bb82
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
2f168dd4d7
|
修改《课程动态》样式
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
lizanle
|
999b395763
|
添加Kaminari分页样式文件，
_paginator.html.erb 这是总的入口文件，可以通过修改它来调整显示的整体结构
比如我不需要“首页”，”末页“这两个链接，那么我就在这个文件里面将对应的代码删除
_page.html.erb 对应页码链接
_first_page.html.erb / _last_page.html.erb 对应“首页”和“末页”的链接
_prev_page.html.erb / _next_page.html.erb 对应“上一页”和“下一页”的链接
_gap.html.erb 空隙的显示，默认是中间的省略号(...)
|
11 years ago |
|
lizanle
|
a47cb8eb65
|
去掉原有的样式分页样式
|
11 years ago |
|
z9hang
|
d8571ac931
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
6bd202e80a
|
课程作业列表当当前用户为课程学生时，输出分配给改学生匿评的作业集合
|
11 years ago |
|
sw
|
269f1835b0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
34c68a59fc
|
关闭问卷之后老师容许查看统计结果
|
11 years ago |
|
alan
|
f2a3ce0ece
|
修改《网页标题显示为“中国高校”不合适》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
661dbe5219
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
a467736a5e
|
修改《多字段唯一性判断》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
666ebf9b5b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
9e470fa25c
|
meigia
|
11 years ago |
|
sw
|
0d6261dfa7
|
Merge branch 'dev_zanle' into szzh
Conflicts:
app/controllers/projects_controller.rb
app/helpers/projects_helper.rb
|
11 years ago |
|
sw
|
31c78279ea
|
删除多余的一个end
|
11 years ago |
|
huang
|
d91c0442d1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
29df528af1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/index.html.erb
config/locales/zh.yml
config/routes.rb
|
11 years ago |
|
sw
|
36c07f9664
|
修改拒绝项目成员加入后，页面不会刷新的BUG
|
11 years ago |
|
huang
|
d0a675f2b8
|
企业版模块
|
11 years ago |
|
lizanle
|
22dd4981c0
|
修改分页函数
|
11 years ago |
|
lizanle
|
b453d16228
|
将controller里的两个方法挪到helper
|
11 years ago |
|
lizanle
|
90649209ca
|
封装，简化，重新编排代码格式，并删掉了一些无用的方法代码
|
11 years ago |
|
lizanle
|
abc5dd1c74
|
添加表格样式
|
11 years ago |
|
lizanle
|
0232826a6e
|
上次修改引入bug:关键字查询不到任何东西
|
11 years ago |
|
lizanle
|
e761cd5f22
|
关键字查询会丢失样式
|
11 years ago |
|
sw
|
87fdd840ec
|
首页加入项目增加已是当前项目的判断
|
11 years ago |
|
lizanle
|
852bb940a2
|
过滤掉日志中日志分析的请求
|
11 years ago |
|
sw
|
a265556cfe
|
搜索项目时增加js验证增加
|
11 years ago |
|
sw
|
0d5384c6d8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
97ec208b1a
|
Merge branch 'dev_zanle' into szzh
Conflicts:
config/routes.rb
|
11 years ago |
|
whimlex
|
deadea81fa
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
617107f0cb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/index.html.erb
config/locales/zh.yml
|
11 years ago |
|
lizanle
|
f3f590a834
|
# 这写变量发现没有用而且拖慢速度
#@teachers= searchTeacherAndAssistant(@course)
#@canShowRealName = isCourseTeacher(User.current.id,@course)
|
11 years ago |
|
whimlex
|
f05e046751
|
首页国际化
|
11 years ago |
|
sw
|
6bca666f08
|
#1896 课程--问卷调查--新建题目时点击确定按钮无反应
|
11 years ago |
|
sw
|
c56f641163
|
修改首页加入项目按钮没反应
|
11 years ago |
|
sw
|
ce526fde77
|
Merge branch 'dev_zanle' into szzh
Conflicts:
config/routes.rb
|
11 years ago |
|
sw
|
2978d9020f
|
Merge branch 'develop' into szzh
|
11 years ago |
|
sw
|
c366cc90e7
|
修改删除问卷后相关BUG
|
11 years ago |
|
sw
|
a772ef329d
|
修改问卷时增加问卷标题不能为空的提示
|
11 years ago |
|
sw
|
108435f933
|
新增题目时，增加标题不能为空的js验证
|
11 years ago |
|
sw
|
b71d714103
|
#1887 用户职称显示问题
|
11 years ago |
|
sw
|
bf75f32903
|
修改个人留言界面，左侧个人信息样式显示不正确
|
11 years ago |
|
sw
|
af7e605f76
|
添加新闻时，“提交”按钮和“取消”按钮之间有一竖
|
11 years ago |
|
lizanle
|
3637d1906d
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
config/routes.rb
|
11 years ago |
|
lizanle
|
87b230623b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
b7c7cc4c64
|
意见反馈栏实现cookie缓存收拉属性，实现页面刷新跳转，意见反馈栏收拉一致
|
11 years ago |
|
z9hang
|
a6488da7fa
|
修改ＡＰＩ上线问题
|
11 years ago |
|
z9hang
|
f7dbb24d35
|
修改测试版上线问题
|
11 years ago |
