 z9hang
|
ddecd61926
|
课程资源添加标签时无样式问题
|
11 years ago |
 sw
|
cba678a357
|
课程是否启用匿评
课程作业列表样式
加入与退出课程按钮样式
|
11 years ago |
|
sw
|
ed92faaedd
|
关闭课程与重开课程js
|
11 years ago |
|
sw
|
0d04eb745f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
z9hang
|
35eb7e80af
|
讨论区留言分页
|
11 years ago |
 lizanle
|
5f203ec8c0
|
新建论坛或者回复,如果传图了，要更新资源的owner
|
11 years ago |
|
z9hang
|
57dad3f3c7
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
z9hang
|
8ef9779b46
|
修正课程讨论区样式。修正项目讨论区被影响的样式
|
11 years ago |
|
sw
|
53eef164c9
|
新建课程时layout修改
|
11 years ago |
|
sw
|
2bb7153131
|
去掉作业打包下载功能
|
11 years ago |
|
sw
|
ab7d12e514
|
1、修改、删除分班是js方法重构
2、验证分班名是否重复重构
|
11 years ago |
whimlex
|
4de0255ce6
|
邀请邮件国际化；js冲突
|
11 years ago |
|
sw
|
cfe487e217
|
搜素学生后内容清空
|
11 years ago |
|
sw
|
ab3a3a8573
|
学生收索功能
|
11 years ago |
|
sw
|
92808fe8ea
|
完成学生列表界面
|
11 years ago |
|
sw
|
5f41c92cb3
|
学生列表界面静态显示
|
11 years ago |
guange
|
4b636d8be6
|
#1801 打包上传分个数下载完成
|
11 years ago |
|
guange
|
15accd7d9f
|
下载功能优化, 功能已实现
|
11 years ago |
|
z9hang
|
be46142b3c
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/javascripts/course.js
|
11 years ago |
|
z9hang
|
19eaa012b7
|
讨论区样式调整
|
11 years ago |
|
sw
|
2ef10e89ac
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
sw
|
f5059147d2
|
修改学生提交作业界面的layout
|
11 years ago |
|
sw
|
c4cd61c71b
|
修改学生提交作业界面的layout
|
11 years ago |
|
sw
|
0496c33378
|
添加部分方法的注释
|
11 years ago |
|
z9hang
|
a2ec9c661a
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
sw
|
584dcabeaa
|
修改学生作业列表弹出框不正确
|
11 years ago |
|
sw
|
221276ba1f
|
增加老师布置作业学生访问的列表
|
11 years ago |
|
sw
|
0408cc5150
|
去除无用代码
|
11 years ago |
|
sw
|
37bd338311
|
1、老师修改作业增加默认值显示
2、学生提交作业列表修改layout
|
11 years ago |
|
z9hang
|
cb278e65a2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/javascripts/course.js
public/stylesheets/courses.css
|
11 years ago |
|
sw
|
5139ac30dc
|
修改老师新建作业界面
|
11 years ago |
|
z9hang
|
aaf14d5d1a
|
修改课程通知页面
|
11 years ago |
 huang
|
dc0c9417e3
|
修改新提交的作业显示在前面
|
11 years ago |
|
z9hang
|
5278d4dd2b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
4ca5687b3b
|
#2072测试版--项目--问题跟踪：成功新建问题后建议提示信息为“问题已创建”就好
|
11 years ago |
|
lizanle
|
cdad43fdfc
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
a4567396e4
|
如果没有上传图片就会报空指针
|
11 years ago |
|
sw
|
0c4f88ca29
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
|
guange
|
e007920cb6
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
Gemfile
app/views/attachments/_form.html.erb
|
11 years ago |
|
sw
|
6edbb3c7ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
3418c9ccee
|
1、修改course/homewrok方法
2、修改course的作业列表显示
|
11 years ago |
 dingxu
|
073cb07f70
|
邀请平台用户：角色、用户都为空添加提示、单一角色提示信息修改、
展开条样式修改
|
11 years ago |
|
dingxu
|
7b3af413cd
|
邮件邀请加入项目:如果邮箱已被注册或为空时给出提示
|
11 years ago |
|
sw
|
46410c8e8d
|
1、修改删除TAG后js刷新页面
2、删除课程TAG时增加提示
|
11 years ago |
|
z9hang
|
2a3a70b7d5
|
app接口部分信息国际化
|
11 years ago |
|
sw
|
258d9bf33a
|
1、调整分页控件显示样式
2、修改课程动态分页算法
3、更新样式文件
|
11 years ago |
|
huang
|
4ae5e2af7c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
6498002c71
|
修改项目文档中附件上传无法保存、附件编辑的时候无法显示的bug
原因：里面逻辑判断错误
|
11 years ago |
|
guange
|
c45850eb8a
|
git hook改为异步
|
11 years ago |
|
guange
|
dc29ccf3b7
|
1. git仓库新建时加入hook代码
2. 对现有的旧hook代码进行更新的rake任务
|
11 years ago |
|
lizanle
|
b4f99c75da
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
e49bb18b62
|
cotroller修改：删除记录的同时删除对应的文件
|
11 years ago |
|
z9hang
|
86c4a7f45d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
930486d21e
|
#2024 course主页：点击进入非当前用户的所在学校，如图，不显示“我的课程”了
|
11 years ago |
|
lizanle
|
41f302c467
|
cotroller修改
|
11 years ago |
|
guange
|
6c87cd40c1
|
加入git回调接口
|
11 years ago |
|
sw
|
1e897687d0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
36554aa90a
|
#2041 项目--问题跟踪：成功新建缺陷给出的提示信息错误
|
11 years ago |
|
lizanle
|
86020804c9
|
ok
|
11 years ago |
|
lizanle
|
33669017bf
|
controller
|
11 years ago |
|
lizanle
|
0c86ba210d
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
lizanle
|
5c4a62dcc4
|
DiscussDemo代码
|
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 |
|
sw
|
e4895731ae
|
Merge branch 'develop' into szzh
|
11 years ago |
|
sw
|
e4e56e01b1
|
修改项目邀请用户失败时的提示
|
11 years ago |
|
z9hang
|
ff65bf4ba5
|
app自动更新功能功能，无法下载问题修正
|
11 years ago |
|
guange
|
08eae0e5eb
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
ab6c21314d
|
#1503 老师发布的作业可以在课程动态中显示了
|
11 years ago |
|
whimlex
|
28321deeb5
|
邮件邀请用户
|
11 years ago |
|
sw
|
fd8edc9a02
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
96b2627fda
|
修改邮件居中样式及提示
|
11 years ago |
|
sw
|
78039a726e
|
Merge branch 'szzh' into guange_dev
|
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 |
|
sw
|
2ee04d55f2
|
修改项目邀请用户的界面
|
11 years ago |
|
huang
|
0ba7ef0560
|
修改邮箱邀请时，邮件为空时提示错误
|
11 years ago |
|
sw
|
5340ad7fc1
|
修改组织首页不显示私有项目
|
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
|
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 |
|
lizanle
|
d7c550b15b
|
给projects项目新建的时候添加创建人
|
11 years ago |
|
sw
|
1e262ec731
|
修改项目上传资源链接
|
11 years ago |
|
z9hang
|
eec155f077
|
课程资源页面app自动登陆处理
|
11 years ago |
|
sw
|
9060c9acbc
|
#1977 项目发布新贴跳转有问题
|
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 |
|
z9hang
|
803f4a3eaf
|
1、部分页面根据apptoken参数自动登录功能添加token是否过期判断。2、版本管理发布新版本信息功能添加
|
11 years ago |
|
guange
|
5d1a5a0b11
|
#1738 修复图片下载次数不正确问题
|
11 years ago |
|
sw
|
bdd1980876
|
修复个人动态首页报错
|
11 years ago |
|
z9hang
|
6ca853edc7
|
1、课程首页2、用户首页3、课程留言页4、发布作业页5、用户的留言页6、为课程作业创建作品页传递apptoken参数时自动登录功能
|
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 |
|
sw
|
c6788e2f40
|
修复首页报错
|
11 years ago |
