 z9hang
|
2a3a70b7d5
|
app接口部分信息国际化
|
11 years ago |
 huang
|
1cdf397bc0
|
修改关注、申请方法中样式
|
11 years ago |
 sw
|
d92ac2d909
|
1、课程跳到其他页面后没有分块
2、修改course_show界面
|
11 years ago |
|
sw
|
423849ca84
|
加入课程、退出课程、配置、关闭、复制等按钮
|
11 years ago |
|
sw
|
1c30b8c81c
|
1、增加获取某个课程动态数的方法
2、修改首页配置、关闭、复制课程等按钮的样式
|
11 years ago |
|
sw
|
8f5d8c86a3
|
新版样式header调整
|
11 years ago |
|
sw
|
64b0646281
|
base_course基本完成
|
11 years ago |
|
sw
|
e4c0c840bf
|
1、完成课程模块导航栏样式调整
2、修改意见反馈默认在右下角位置
3、调整我的课程、我的项目js
4、ruby生成的菜单栏添加样式及部分方法重写
5、封装部分页面的ruby代码到helper
|
11 years ago |
whimlex
|
e8da6ef871
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
50fe8f2bb7
|
项目配置模块
|
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 |
guange
|
bcb162c600
|
#1968 解决IE8不能上传的问题， 只是解决，体验还是没有chrome,firefox的好
|
11 years ago |
|
sw
|
d18e9ff66b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
2ee04d55f2
|
修改项目邀请用户的界面
|
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
|
b27bb34662
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
11 years ago |
|
whimlex
|
57c8575470
|
新版项目模块国际化，目前完成各项目主页，项目动态，项目评分
|
11 years ago |
|
sw
|
4b831c9e65
|
#2001 项目--工具集中wiki-“查看差别”中有html标签
|
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 |
|
huang
|
ce792f6ce8
|
修改邮件发送界面
|
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 |
|
huang
|
beac15475d
|
新项目及用户反馈框的修改！！
|
11 years ago |
|
sw
|
5692cbf202
|
#1965 公共贴吧取消软件创客入口
|
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
|
dead08a0d6
|
添加、修改项目增加所属组织的选择
|
11 years ago |
|
lizanle
|
7ee58d1d44
|
项目动态重写，并去掉首页缓存
|
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 |
|
sw
|
2ceb21b83b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
d913f89a82
|
添加课程动态接口
|
11 years ago |
|
sw
|
859889b750
|
简化查询匿评数量的代码
|
11 years ago |
|
sw
|
4cdb3c83dd
|
增加获取用户在指定课程内作业数量的接口
|
11 years ago |
|
huang
|
523af8b2a9
|
修改企业版结构及列表页面
|
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 |
|
z9hang
|
d8571ac931
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
6bd202e80a
|
课程作业列表当当前用户为课程学生时，输出分配给改学生匿评的作业集合
|
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 |
|
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 |
|
huang
|
d0a675f2b8
|
企业版模块
|
11 years ago |
|
lizanle
|
b453d16228
|
将controller里的两个方法挪到helper
|
11 years ago |
|
lizanle
|
0232826a6e
|
上次修改引入bug:关键字查询不到任何东西
|
11 years ago |
|
lizanle
|
e761cd5f22
|
关键字查询会丢失样式
|
11 years ago |
|
lizanle
|
852bb940a2
|
过滤掉日志中日志分析的请求
|
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 |
|
whimlex
|
f05e046751
|
首页国际化
|
11 years ago |
|
sw
|
ce526fde77
|
Merge branch 'dev_zanle' into szzh
Conflicts:
config/routes.rb
|
11 years ago |
|
sw
|
b71d714103
|
#1887 用户职称显示问题
|
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 |
|
sw
|
950d831108
|
Merge branch 'api' into szzh
|
11 years ago |
|
lizanle
|
ff23ecb9a8
|
Merge branch 'szzh' into dev_zanle
|
11 years ago |
|
lizanle
|
fd42af1ac4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
lizanle
|
d8b5252279
|
调整了注释
|
11 years ago |
|
sw
|
5950f0404b
|
#1832 不显示无数据的字段，字段名
|
11 years ago |
|
sw
|
649c65fbe2
|
国际化部分代码
|
11 years ago |
|
z9hang
|
db1cd8851c
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
db/schema.rb
|
11 years ago |
|
whimlex
|
38157e560e
|
课程--资源库--上传资源：当变化屏幕分辨率时，“上传文件”字样显示异常;添加用户或组没有链接;新建课程中，平台按钮样式调整成统一风格;课程主页，竞赛
|
11 years ago |
|
lizanle
|
90661374a5
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
app/controllers/projects_controller.rb
config/locales/zh.yml
|
11 years ago |
|
lizanle
|
0147b30133
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
Gemfile
|
11 years ago |
|
lizanle
|
27fde6c641
|
添加注释
|
11 years ago |
|
sw
|
a0e6b9c2fe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
z9hang
|
f1693e237b
|
修改匿评作品详情接口，输出匿评作品详情的同时还输出对该作品的评论（包括，教师评分，匿评及留言）
|
11 years ago |
|
sw
|
54c8ee9d4d
|
增加学生答完问卷之后。能看到自己答题结果的功能
|
11 years ago |
|
lizanle
|
59a47002ae
|
重构，修正了许多的空指针异常
|
11 years ago |
|
z9hang
|
89e0f98034
|
启动匿评接口
|
11 years ago |
 alan
|
f01d164295
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
6ccb154cc3
|
课程留言，发邮件给课程所有人
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
b949f70c64
|
修改数据格式转换方法
|
11 years ago |
|
z9hang
|
abcf06ccc7
|
课程资源不能引用问题。原因：15年1-3月能属于2014年秋季学期，代码却将其判断为15年秋季学期了
|
11 years ago |
|
lizanle
|
2431fea63e
|
日志查看Helper
|
11 years ago |
|
sw
|
1e8c6374d7
|
Merge branch 'szzh' into Poll
Conflicts:
app/views/layouts/_base_feedback.html.erb
|
11 years ago |
|
huang
|
e8cca08f40
|
多选查询去重，修改样式
|
11 years ago |
|
huang
|
6bba6b2b76
|
weiwan
|
11 years ago |
|
huang
|
6e698d45bb
|
修改了html边界超出问题
|
11 years ago |
|
huang
|
0f5c3c5f4c
|
添加主观题统计页面及样式
|
11 years ago |
|
huang
|
3acec4b7c1
|
修改了总统计数
|
11 years ago |
|
huang
|
59c21d81e9
|
修改了分母不能为0的bug
统计结果精确到两位
|
11 years ago |
|
huang
|
7177303eeb
|
问卷统计最终效果
|
11 years ago |
|
z9hang
|
dc2c96f59a
|
提交后的问卷禁止查看与编辑
|
11 years ago |
|
alan
|
5191411508
|
<邮件加密自动登录功能，邮件附件下载功能>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
77dc9607df
|
简答题答题
|
11 years ago |
|
z9hang
|
d684acf527
|
多选题答题功能
|
11 years ago |
|
z9hang
|
6d82e79e7f
|
答题相关方法添加
|
11 years ago |
|
lizanle
|
aca74bf937
|
Merge remote-tracking branch 'origin/dev_zanle' into szzh
Conflicts:
Gemfile
app/views/welcome/index.html.erb
|
11 years ago |
|
z9hang
|
0f9915fc2a
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
Gemfile.lock
app/controllers/bids_controller.rb
app/controllers/users_controller.rb
db/schema.rb
|
11 years ago |
|
huang
|
293b3a3b42
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
f7c1b76b3d
|
用户反馈弹框模块！
|
11 years ago |
|
alan
|
fb6c297a37
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
575b641e25
|
merge dev_chuangbin
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
lizanle
|
3047b523b0
|
add expire_helper and change the code way of set cache expire!
|
11 years ago |
|
alan
|
9bbc8d64eb
|
课程母版页加载缓慢
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
2262997c31
|
修改《新建课程时：课程名中有空格或者特殊符号会提示名称无效,》
《 缺陷 Trustie-Forge#1782 (已解决): lable标签和对应的显示值之间间距过大的问题，例如个人主页左侧的信息，具体如图所示》
《本地版中关于学生列表的分组出现的问题：当前已存在A组，再次添加A组应给出提示“A组已存在”，该功能目前只有在学生列表首次加载时才正常》
《托管，课程，竞赛主页中任意点击某一项目，进入该项目主页，右上角的搜索按钮风格和大小不统一。》
《进入某竞赛主页，点击创新竞赛链接没反应》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
b17d4840b1
|
《作业优化》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
0e7f7a4254
|
优化《作业评分》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
819c4c0bc1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/users_controller.rb
|
11 years ago |
|
alan
|
2a94c61a3e
|
修改bug(项目--缺陷：更新图片时在历史记录中没有相关记录，删除图片只显示一个更新时间也不合理)
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
f834759d84
|
#1709测试版--课程--加入课程：成功加入课程，还是显示为“加入”，需手动刷新页面
|
11 years ago |
|
alan
|
683acfcafc
|
优化《学生列表作业评分查询太慢》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
1965b75d92
|
添加《学生列表按作业评分排序》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
7c1b86556d
|
增加《作业评分弹窗》《学生列表增加作业评分》两项功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
=
|
bb23468c7d
|
Merge branch 'szzh' into api
Conflicts:
app/controllers/account_controller.rb
app/controllers/courses_controller.rb
db/schema.rb
|
11 years ago |
|
z9hang
|
36967eeec0
|
修改注册接口、添加作业列表接口
|
11 years ago |
|
z9hang
|
9abe730dff
|
恢复私有课程的公开资源不能引用问题（导致搜索速度慢）
|
11 years ago |
|
z9hang
|
e4439daf3b
|
全站搜索bug
|
11 years ago |
|
z9hang
|
c0a0c41e14
|
私有课程的公开资源能下载bug
|
11 years ago |
|
sw
|
cf5b03a379
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/courses/_member_list.html.erb
|
11 years ago |
|
sw
|
d9250231e5
|
#1698 1.修改标签查询结果中点击课程/项目列表报错的BUG
2.修改页面代码
|
11 years ago |
|
alan
|
90a01c8d84
|
对新增功能《添加学生列表班内搜索和课内搜索》样式微调
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
d8a568e685
|
增加《分班搜索学生》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
fbe6ce16d7
|
修改《分组界面》样式
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
d5de3dcb56
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/courses_controller.rb
|
11 years ago |
|
sw
|
f2cfa6d4a1
|
修改课程老师、学生数量显示为实际数字，而不是+
|
11 years ago |
|
alan
|
078639b35a
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group
|
11 years ago |
|
alan
|
cfb8edbfe2
|
分组功能样式微调
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
a64cae5da3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
2b3edbc8fb
|
#1663 课程资源库--全站搜索：老师不能引用其他资源至我的课程了
|
11 years ago |
|
alan
|
c9b84d0a35
|
增加《学生加入，退出分组》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
66f93150f6
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group
|
11 years ago |
|
alan
|
9765f11f7e
|
增加<修改，添加分组>功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
4bbc76a217
|
1.重写homework_attach的show方法，优化弹出框的弹出效率
2.修改相关的view层代码
3.增加获取指定评分的评论的方法
|
11 years ago |
|
z9hang
|
2a7e0365b8
|
注册修改
|
11 years ago |
|
alan
|
3d12d6f0e8
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group
Conflicts:
db/schema.rb
|
11 years ago |
|
alan
|
615bc7d444
|
增加课程分组的功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
19b61118ac
|
修改加入按钮失败后变为加入课程按钮
|
11 years ago |
|
sw
|
f934824175
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
d9c3103e6e
|
1.修改留言列表得分显示样式
2.修改获取指定用户对作业评分的方法
|
11 years ago |
|
z9hang
|
29d4266c6c
|
引用次数的统计修改及按引用排序
|
11 years ago |
|
alan
|
63c9804da8
|
添加course_group表单到数据库中，并建立对应于members和courses之间的关联，
对相应页面的修改
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
298b767fc4
|
资源显示，对于课程外人员不在显示私有资源
|
11 years ago |
|
z9hang
|
514dcb97a0
|
完成资源按时间、下载次数排序功能
|
11 years ago |
|
z9hang
|
c2d618ce9c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
71e7d2c872
|
修改全站搜索结果显示策略：私有资源属于当前课程，且当前用户为当前课程的成员时可见，其他情况私有资源不可见
|
11 years ago |
|
sw
|
cd3f4ef8d3
|
修改标签的显示js
|
11 years ago |
|
sw
|
2b5160f2d9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
9898e1650b
|
1、学生看不到私有资源bug。2、引用资源弹框中无课程可显示时不显示引入我的课程按钮。3、引用资源时提示信息样式修改
|
11 years ago |
|
z9hang
|
b0db7dfece
|
添加判断课程是否为当前学期或下一学期方法
|
11 years ago |
|
z9hang
|
f267a3daf8
|
引用课程中已有的资源时提示资源已存在
|
11 years ago |
|
sw
|
e68900b9a0
|
#1616 修改课程时开课日期选项错误
|
11 years ago |
|
z9hang
|
8a3669ba3b
|
引用次数统计包括多级引用
|
11 years ago |
|
z9hang
|
5a20945e0d
|
选入我得课程列表中添加课程学期的显示
|
11 years ago |
|
sw
|
5bcc76d399
|
修改作业提交项目第一项为请选择
|
11 years ago |
|
sw
|
23da0a6dad
|
修改作业提交项目时默认问空
|
11 years ago |
|
z9hang
|
feccad8fa5
|
用户为创建课程，或没有作为教师的课程时，不显示引入我的课程按钮
|
11 years ago |
|
sw
|
d788e46546
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
z9hang
|
436cf1175f
|
修改课程资源模块相关问题
|
11 years ago |
|
sw
|
06a513b2ee
|
修改不选择项目时的<<NULL>>为 NO PROJECT
|
11 years ago |
|
z9hang
|
36e7b222bb
|
课程资源修改为公开的也需登录才能下载
|
11 years ago |
moon
|
600afdc6e0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
moon
|
e4e4c94d53
|
封掉所有列表入口，及页面中更多入口
|
11 years ago |
|
z9hang
|
2348e063d1
|
调整选入课程弹框中列表的显示策略
|
11 years ago |
|
sw
|
f9b3cc6588
|
Merge branch 'szzh' into CouerseResources
Conflicts:
db/schema.rb
|
11 years ago |
|
sw
|
3215786538
|
修改非课程成员能看到提交作业按钮
|
11 years ago |
|
z9hang
|
f2da5704ef
|
课程应用的功能实现
|
11 years ago |
|
sw
|
80e3e44f13
|
修复学生不能退出私有课程的BUG
|
11 years ago |
|
sw
|
9d971069b5
|
Merge branch 'Homework' into szzh
|
11 years ago |
|
sw
|
e3d735ecfc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
9bd1af9541
|
#1480 项目留言区回复时间显示问题
|
11 years ago |
|
alan
|
1468f4a8df
|
修改《修改资料》页面
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
54aae26cbe
|
被除数为0时弹框报错
|
11 years ago |
|
sw
|
b8c9651079
|
111
|
11 years ago |
|
sw
|
14db93c10a
|
教师作业列表增加当前作业提交信息,匿评信息提示
|
11 years ago |
|
sw
|
7d97889261
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
Conflicts:
app/views/bids/_bid_homework_show.html.erb
app/views/layouts/base_homework.html.erb
|
11 years ago |
 gonglexin
|
c52e87c74f
|
统计数据
|
11 years ago |
|
sw
|
6178919735
|
修改创建课程时当前学期的默认选择设置
|
11 years ago |
|
sw
|
e5874283f1
|
1.修改课程实践列表提交作业按钮链接
2.增加提交作业的控制
3.修改获取在指定课程提交作业的集合的方法判断
|
11 years ago |
|
sw
|
2f8f8593eb
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
sw
|
13c362b08d
|
1.作业排序按钮显示顺序
2.配置课程->配置 关闭课程 -> 关闭 加入课程->加入
|
11 years ago |
|
z9hang
|
fced7dcb91
|
进入自己的作业不让评分
|
11 years ago |
|
z9hang
|
c2fe1b7c72
|
修正评分不能点问题，作品留言
|
11 years ago |
|
z9hang
|
2628ab4808
|
修改评分列表获取方式
|
11 years ago |
|
z9hang
|
47c8ffd22a
|
作业修改
|
11 years ago |
|
z9hang
|
96626eeb6b
|
恢复respond_path路由并修改部分respond_path
恢复homework_list.html.erb文件
|
11 years ago |
|
sw
|
8a7757f3c2
|
1.整理踩、赞页面代码
2.增加作业点赞功能
3.作业列表界面增加是否已经点赞判断
|
11 years ago |
|
sw
|
58d32bcf2b
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
z9hang
|
f5e9528b12
|
修改base_homework界面
|
11 years ago |
|
sw
|
e6fdda1702
|
修改未批、已批、全部作业、留言action的路由
|
11 years ago |
|
gonglexin
|
811b6383f7
|
初次加载页面时给定一个默认排序
|
11 years ago |
|
gonglexin
|
b2f75d5826
|
给时间和分数排序增加顺序和倒序排序功能
|
11 years ago |
|
gonglexin
|
bb642d320d
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
gonglexin
|
f3d8aebfe4
|
给排序设置正确的路径
|
11 years ago |
|
sw
|
fe65e3619c
|
点击评分增加弹出框
|
11 years ago |
|
z9hang
|
7c331cf49c
|
还原对tags做的修改(上次的修改对一个系统文件做了修改，无法应用到本系统)
|
11 years ago |
|
sw
|
435e5a4d51
|
项目首页用户动态增加悬浮框显示动态所有内容
|
11 years ago |
|
z9hang
|
8cbc4eb938
|
#1318 课程/项目，点击打开该标签，不显示对应的课程/项目名称,原实现逻辑与现存的数据有冲突，扩展了其实现方式，使之兼容现有的数据
|
11 years ago |
|
z9hang
|
0a1713da20
|
课程列表中，自己的课程没星号标志问题
|
11 years ago |
|
z9hang
|
ef15c15605
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
30e355fa35
|
#948 admin配置管理--用户列表--项目列表：如图下拉框显示超出边框且项目问题，解决，说小选项长度，添加title属性，鼠标悬停时显示选项的完整信息
|
11 years ago |
|
sw
|
782098c6e7
|
修改测试版个人修改学校、学校列表跨域访问的问题
|
11 years ago |
|
alan
|
e044f5b615
|
修改contest中出现的逻辑错误
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
gonglexin
|
1abcd2a43e
|
#1275 修正课程列表中的动态数
|
11 years ago |
|
sw
|
3a48034fca
|
#1387修复课程--资源库-关联资源查询出来的结果是整个项目中资源的集合的BUG
|
11 years ago |
|
sw
|
87788ab34c
|
代码优化
|
11 years ago |
|
z9hang
|
57776d67c5
|
优化代码
|
11 years ago |
|
sw
|
7729a2739f
|
修复课程首页SQL不正确的BUG
|
11 years ago |
|
sw
|
062a1a4879
|
龚乐鑫修改意见1：去除无用文件
|
11 years ago |
|
sw
|
97f66a2b08
|
Merge branch 'develop' into szzh
|
11 years ago |
|
z9hang
|
f957666b25
|
部分网页标题不标准问题，补交之前漏掉未添加的文件
|
11 years ago |
|
sw
|
7529a944cf
|
修改课程首页显示课程：
1.3-8月份为显示春季课程，9-2月份为显示秋季课程
1.当前用户未登录：显示系统中在当前年度、季度中人数最多的10个公开课程
2.当前用户以登录，或者选择指定学校：显示该用户所在学校/指定学校在当前年度、季度中人数最多的10门该用户可见的课程(包括该用户可见的私有课程)，如果该学校课程数量不足，向用户推荐其他课程补充数量
|
11 years ago |
|
sw
|
0f492047a5
|
修复项目首页的用户动态会显示私有项目中的动态的BUG
|
11 years ago |
|
sw
|
2e3ff531f6
|
1.#1181课程描述显示的问题
2.修改项目首页用户动态显示按字符长度截取导致页面不协调的BUG
|
11 years ago |
|
sw
|
ecfcbf1078
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
8ac2640a09
|
#1293修复用户可以通过课程实践页面url进入加入私有课程界面的BUG
解决方案：加入课程按钮增加权限判断；课程实践界面增加权限判断
|
11 years ago |
|
z9hang
|
d1b20dddef
|
添加非空判断
|
11 years ago |
|
alan
|
43e940eb1d
|
修复竞赛作品附件删除报错的bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
57835abb37
|
1.增加管理员不能退出项目
2.增加退出项目时的提示
|
11 years ago |
|
sw
|
8aec3fe8f5
|
新建、修改课程年份从当前年份开始
|
11 years ago |
|
sw
|
ef78066f3e
|
公共贴吧，回复帖子上传附件时回复信息显示不完整:还有一点点被遮住。。
|
11 years ago |
|
sw
|
5a14798290
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
0a02fbf10e
|
修复资源搜索，资源列表显示错误 #1262
链接解析方法不对
|
11 years ago |
|
sw
|
0ab7bfcda9
|
限制上传文件名、文件描述长度 #1252
|
11 years ago |
linhk
|
5824f70fe3
|
输出日志代码
|
11 years ago |
|
sw
|
7c97c0391b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
c10eeb1c01
|
项目首页增加新建项目按钮
|
11 years ago |
|
linhk
|
185bbf3cf7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
linhk
|
56c31d6e2f
|
解决版本库网页标题Bug
|
11 years ago |
|
sw
|
5f7052a348
|
修复forge和course网站的讨论区的帖子内容超出边界的BUG
解决方案：强制限制文件名显示最大长度
|
11 years ago |
|
z9hang
|
8cc14546f8
|
公共贴吧附件资源修改为未登录也可以下载，项目列表私有标签错误
|
11 years ago |
|
alan
|
64eb4d362c
|
将contest主页中通知公告的颜色改成蓝色
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
70b079041c
|
修改contests_controller.rb，contest.rb, contest_project.rb,contests_helper.rb,
attachments_helper.rb, application_helper.rb.
主要修改内容: 书写规范， for循环用 each 代替， if 语句的合并， unless 转换成if,
函数名称拼写错误。
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
8a6e19bcad
|
修正项目列表中私有标签国际化丢失问题
|
11 years ago |
|
z9hang
|
e0cdcc0211
|
课程讨论区发帖，添加附件，admin帐户删除附件报错，原因：判断attachment的containers是否为课程的时候少判断了课程讨论区的附件这种情况，解决：加上该判断。问题2 #1002 forge网站的主页项目列表登录前和登陆后，显示的不一样。 解决方法：项目列表、课程列表中的私有项目、私有课程添加私有标志
|
11 years ago |
|
z9hang
|
8fc9e65e66
|
wiki编辑控件粘贴进去的截图不能显示问题
|
11 years ago |
|
sw
|
c614734768
|
#1508 修复课程、项目列表中，点击标签的更多按钮，报错的BUG
|
11 years ago |
|
sw
|
c7caa08c70
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
5afcb73624
|
1.修改中英提示
2.修改查看差别页面会超出界面的BUG
|
11 years ago |
|
z9hang
|
cb8b0e0f41
|
admin页面中问题追踪项相关错误（课程、项目分离此处代码未改导致的问题）、项目列表中项目提交次数改为从数据库中读取（运行bundle exec rake project_score:calculate统计项目提交次数）
|
11 years ago |
 zhanghaitao
|
0e84982203
|
开始日期、计划完成日期不合法已发异常判断修改
|
11 years ago |
|
zhanghaitao
|
b1048074ef
|
#1072 发布作业：截止日期不能手动输入修改
|
11 years ago |
|
zhanghaitao
|
5b85aa0961
|
限制日期控件的不可编辑性，解决输入不正确日期返回异常的问题
|
11 years ago |
|
zhanghaitao
|
2be1ac0dbd
|
修改日期选择控件当日操作日期不可以选择的Bug
|
11 years ago |
|
sw
|
7ec103e135
|
#1457 修复课程开课日期无法修改的BUG
优化选择开课时间代码
|
11 years ago |
|
sw
|
d608d092da
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
d1d2dd0e4b
|
undefined m_coumt问题修正
|
11 years ago |
|
sw
|
f41d3f8b6a
|
修改作业显示真实名字不正确的问题
|
11 years ago |
|
sw
|
234a781342
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
5482ba3207
|
后台统计所有用户分数算法优化
|
11 years ago |
|
sw
|
50e1f41345
|
#1307修复作业列表真实姓名只显示名不显示姓的BUG
|
11 years ago |
|
z9hang
|
1e234a9adf
|
优化积分计算速度问题
|
11 years ago |
|
z9hang
|
ed3e9e3a03
|
项目成员列表积分计算的初步优化（降低访问速度）
|
11 years ago |
|
linhk
|
ecae8d1f35
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
linhk
|
4f0817a146
|
项目--文档--文件--代码评审 中用户头像显示错误
|
11 years ago |
|
z9hang
|
378c06379e
|
项目文档得分计算错误问题
|
11 years ago |
|
z9hang
|
a3fb08817c
|
分数不能为0、更新readme
|
11 years ago |
|
linhk
|
fcaeb86687
|
项目‘课程 添加成员显示Bug修改
|
11 years ago |
 chenmin
|
19c5ebf450
|
修复贴吧标签有删除标识后删除失败的bug；
修复删除后没刷新的bug；
|
11 years ago |
|
sw
|
08115c9de4
|
1.修复文本格式化报错的问题
2.修改作业留言清除按钮描述不正确的问题
|
11 years ago |
|
sw
|
f99543ab4b
|
#1294
1.修改缺陷列表中缺陷描述样式
2.修改缺陷、日历查询时，Closed->关闭于，角色成员减少学生、老师、助教等3个角色
|
11 years ago |
|
zhanghaitao
|
ce7d91d164
|
#932 输入主题为非汉字类型且字数较多时，显示超出边框Bug修改
|
11 years ago |
|
sw
|
a54676c583
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
sw
|
582ccd2ecf
|
添加wiki插件，修改项目讨论区模块回去格式化字符串不正确的BUG
|
11 years ago |
|
z9hang
|
56aa2fb8dc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
z9hang
|
caed78327a
|
积分计算修改
|
11 years ago |
|
zhanghaitao
|
d7bfdc8de4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
zhanghaitao
|
b9ee7fe00d
|
1.#878 缺陷输入计划完成时间小于开始时时间修改
2.修改时间选择的最小默认值
|
11 years ago |
|
sw
|
33855f721d
|
优化课程首页效率
|
11 years ago |
|
sw
|
f7635370d7
|
优化课程首页效率
|
11 years ago |
|
linhk
|
044bba4d0d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
linhk
|
0028c11426
|
退出项目功能
|
11 years ago |
|
z9hang
|
683cd9f918
|
个人积分修改
|
11 years ago |
|
z9hang
|
96fa28f70d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
b0b3f257a4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
56a06c4a04
|
修复git说明页面导航丢失问题
修改个人得分
|
11 years ago |
|
z9hang
|
eacc0fdf53
|
修复编辑作业提交时的bug
修改个人得分
|
11 years ago |
|
sw
|
34af8053cc
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
z9hang
|
17e6f0ee4f
|
部分私有的项目提交次数显示问题
|
11 years ago |
|
z9hang
|
c6271e2aa9
|
修复由项目积分改动引起的一个页面无法查看bug、添加项目得分统计任务
|
11 years ago |
|
sw
|
22335b23a6
|
修复新建账号申请项目时在申请列表无法显示的BUG #1180
|
11 years ago |
|
z9hang
|
05186c8590
|
项目积分存数据库
有项目积分引起的系列bug
|
11 years ago |
|
z9hang
|
7907edf168
|
更新项目得分规则
调整项目列表显示样式
|
11 years ago |
|
z9hang
|
2c77d1b4cf
|
访问资源库问题
|
11 years ago |
|
z9hang
|
80b2a2dc45
|
修正公共贴吧新建帖子问题
修正课程列表错误
|
11 years ago |
|
z9hang
|
ff02c4f9f2
|
修正课程显示老师、学生人数与课程中老师、学生数量不一致问题
修正学校主页课程推荐中显示的课程人数与课程总人数不一致问题
|
11 years ago |
|
z9hang
|
0d46c63c54
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
2ad51d7afe
|
修改引用的留言为不能修改
|
11 years ago |
|
sw
|
8b80d99a70
|
修复资源标记搜索不正确的BUG issues#1089
|
11 years ago |
|
z9hang
|
03b212e363
|
首页定制，是否显示课程，竞赛
|
11 years ago |
|
z9hang
|
c60188038e
|
得分机制修改
|
11 years ago |
|
z9hang
|
225e3c396a
|
个人得相关分方法添加
|
11 years ago |
|
sw
|
a39672dd14
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
sw
|
18ddb8604b
|
取消参赛作品名称、描述的字数限制
|
11 years ago |
 nwb
|
74de064cca
|
1.文件删除权限判断优化
2.课程通知附件删除BUG修改
|
11 years ago |
|
z9hang
|
673ffb1819
|
提交次数刷新问题
|
11 years ago |
|
z9hang
|
f83336aed0
|
修改首页定制中热门项目排序方式的实现
|
11 years ago |
|
z9hang
|
4542b9e21a
|
积分修改
|
11 years ago |
|
z9hang
|
6b441760c4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
80b5871756
|
竞赛首页定制中添加编辑通知通告的编辑框并存入数据库
添加新的表记录个人得分相关细节，及各种得分更新方法
|
11 years ago |
 yanxd
|
9c3ff51633
|
remove useless navbar method called
|
11 years ago |
|
sw
|
6e954d314f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
b1251db30c
|
1.修改竞赛作品时增加作品类别下拉框选择
2.修改竞赛作品时增加获取选择其他时作品类别
|
11 years ago |
|
nwb
|
d8d8473811
|
优化课程列表成员数计算
|
11 years ago |
|
sw
|
ba66cde840
|
1.优化作业显示界面加载效率
2.修复获取作业的互评得分、综评得分、教师评分不准确的问题
|
11 years ago |
|
sw
|
93d8fd31a0
|
增加作品分类下拉框
|
11 years ago |
|
nwb
|
6bced5106e
|
调整课程列表视图
|
11 years ago |
|
sw
|
46c7a4bb9f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
5272a90227
|
修改人数显示
|
11 years ago |
|
yanxd
|
df848ca756
|
print tag exception, course name valid test.
|
11 years ago |
|
nwb
|
a4d06fbb12
|
课程成员设置为只能使用单一权限
|
11 years ago |
|
sw
|
bcaaa02bed
|
取消已完成课程在软件创客列表的显示
|
11 years ago |
|
nwb
|
6968039c87
|
修改课程学生计算函数
|
11 years ago |
|
nwb
|
f4d6696d2e
|
优化资源搜索界面
|
11 years ago |
|
nwb
|
6a65b2a84b
|
去掉测试代码
|
11 years ago |
|
nwb
|
b60a0ddf59
|
1.添加给gitlab项目新增用户及赋权限接口
2.添加给gitlab项目删除用户接口
|
11 years ago |
|
nwb
|
3d8571b59e
|
1.实现新增gitlab用户接口
2.实现删除gitlab用户接口
|
11 years ago |
|
nwb
|
6dcc50e60b
|
添加gitlab创建项目(版本库)接口
|
11 years ago |
|
nwb
|
36ab954cf9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
nwb
|
297fe9a3f4
|
添加gitlab远程登录接口
|
11 years ago |
|
z9hang
|
cc4bf3b328
|
添加超级管理员控制首页热门项目排序问题
|
11 years ago |
|
z9hang
|
53ff6ea335
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
z9hang
|
6a45a0287d
|
添加删除图片功能，修复用户修改资料界面form.quene undefine的js错误（导致加载中不消失的原因）
|
11 years ago |
|
sw
|
31245f6fb2
|
修复软件创客列表中某些用户的用户名显示不为超链接(未激活账户)
|
11 years ago |
|
sw
|
59a5541e45
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
fcdfeae326
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
z9hang
|
3dfcc90574
|
课程、竞赛首页定制
超级管理员账户中首页定制界面优化
|
11 years ago |
|
sw
|
4f2298fd22
|
修复个人动态首页中留言等动态显示有误的问题
|
11 years ago |
|
nwb
|
9b3ffc90ba
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/repositories_controller.rb
db/schema.rb
|
11 years ago |
|
nwb
|
6688ba61dd
|
1.用户申请加入项目向管理员发送邮件
2.资源文件添加文件密级设置
|
11 years ago |
|
z9hang
|
b4dd8409eb
|
添加项目托管平台首页定制功能
|
11 years ago |
|
sw
|
a5518363c3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
65c137e617
|
修复进入课程作业报错的问题
|
11 years ago |
|
yanxd
|
2b57e170ef
|
want that image popup in html when user click on thumbnail.
|
11 years ago |
|
z9hang
|
9634046d11
|
权限管理机制优化
|
11 years ago |
|
z9hang
|
b87abf1f68
|
权限管理优化
|
11 years ago |
xianbo
|
25ee1d8672
|
for adjust test domain and give a setting reposwq
|
11 years ago |
|
yanxd
|
ab03962e9a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
yanxd
|
aca63146e9
|
搜索文件归属，课程相关逻辑修改，查询把过滤去掉了。暂时没想有什么过滤的好办法
|
11 years ago |
|
nwb
|
bc179fbc39
|
右上角菜单增加二级菜单
|
11 years ago |
|
nwb
|
c927bb6fd6
|
首页课程列表修改
|
11 years ago |
|
sw
|
1e6693cdcf
|
1.取消软件创客界面2个个人得分显示
2.修复软件创客界面用户参与课程显示不正确的BUG
3.添加获取用户参与的未过期的项目列表
|
11 years ago |
|
nwb
|
dc0180988f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
d001b4416a
|
1.优化课程首页
2.优化课程首页搜索逻辑
|
11 years ago |
|
sw
|
2bdb0e20e9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/course.html.erb
|
11 years ago |
|
nwb
|
98ba57b819
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
4d25ec1623
|
1.添加课程垃圾数据清理迁移文件
2.课程首页逻辑更改
|
11 years ago |
|
yanxd
|
0e2b7ba362
|
tag search fix
|
11 years ago |
|
sw
|
5abee0a06c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
nwb
|
2a6cbe28f0
|
修正课程首页错误
|
11 years ago |
|
sw
|
3c7e680b1b
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
nwb
|
31e338f1e5
|
修正http://127.0.0.1:3000/?course.trustie.net链接跳转问题
|
11 years ago |
|
sw
|
967c377191
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
898ecb443a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
e8705bccb1
|
修改文件上传界面样式
|
11 years ago |
|
z9hang
|
54a2fb8a9c
|
主页项目得分与项目页面的项目得分保持一致
|
11 years ago |
|
sw
|
4470f0dd73
|
添加作业时增加教师评分所占比例设置
|
11 years ago |
|
sw
|
12b6525cc6
|
t
|
11 years ago |
|
sw
|
ed9b97f987
|
增加访问作业显示列表的权限
|
11 years ago |
|
nwb
|
7425178419
|
Merge branch 'CourseModify' into szzh
Conflicts:
app/views/layouts/base_courses.html.erb
app/views/layouts/base_homework.html.erb
app/views/projects/_course.html.erb
db/schema.rb
lib/redmine/activity/fetcher.rb
|
11 years ago |
|
sw
|
358d4a53b8
|
修复未公开项目动态仍在主页最新动态显示的问题
|
11 years ago |
|
sw
|
0dce86d47e
|
修改首页项目显示为按活跃度排名的前10个项目
|
11 years ago |
|
sw
|
18762e2da7
|
增加、修改作业时提交项目增加空值选择，即不选定任何关联项目
|
11 years ago |
|
sw
|
5277eddb95
|
封装获取一个作业参与人员方法
|
11 years ago |
|
sw
|
989407dad2
|
12
|
11 years ago |
|
sw
|
09eae9e253
|
1.作业列表增加项目得分显示
2.封装获取指定项目得分的方法，并保留2位有效数字
|
11 years ago |
|
sw
|
463edeee71
|
1.修复未开启互评功能作业总评得分计算不正确的问题
2.修复未选择项目新建、修改有误的BUG
|
11 years ago |
|
sw
|
59e6433938
|
修复获取当前用户建立项目不正确的问题
|
11 years ago |
|
sw
|
f3f303e6e2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
ef234d8c50
|
1.按照新的评分规则修改作业得分
2.修改作业列表显示界面
3.增加获取作业的互评得分、教师评分、最终评分方法
|
11 years ago |
|
nwb
|
0736dd1254
|
课程讨论区回复权限和界面BUG修正
|
11 years ago |
|
z9hang
|
f2cb1390da
|
修复带pre标签缺陷留言的显示问题
|
11 years ago |
|
nwb
|
0480405afb
|
1.修改原课程各数据迁移文件BUG
2.迁移课程学生数据
|
11 years ago |
|
sw
|
97a4aaf8ab
|
homework_attach增加列project_id及相关数据迁移
编辑作业页面增加选择关联项目，以及数据更新项目的实现
|
11 years ago |
|
nwb
|
3afb70bf84
|
主讲教师修改为不允许退出课程
|
11 years ago |
|
nwb
|
78612488e5
|
1.修改新建作业及视图
2.修改编辑作业及视图
|
11 years ago |
|
nwb
|
099e8a0912
|
Merge branch 'szzh' into CourseModify
Conflicts:
app/controllers/application_controller.rb
app/views/attachments/upload.js.erb
app/views/courses/_homework_form.html.erb
app/views/layouts/base_courses.html.erb
app/views/users/_my_joinedcourse.html.erb
db/schema.rb
lib/redmine.rb
lib/redmine/access_control.rb
|
11 years ago |
|
nwb
|
9c3605320e
|
加入、退出课程逻辑优化
|
11 years ago |
|
nwb
|
b4e78d2b0c
|
课程添加成员逻辑更改
|
11 years ago |
|
nwb
|
2a4486bf0d
|
修改迁移文件
|
11 years ago |
|
yanxd
|
47e6c3eedd
|
home cache
|
11 years ago |
|
yanxd
|
93d13c8867
|
system bin, 坑
|
11 years ago |
|
yanxd
|
70abac4c1e
|
Merge branch 'competition' into develop
Conflicts:
app/controllers/application_controller.rb
config/locales/en.yml
config/locales/zh.yml
db/schema.rb
|
11 years ago |
|
nwb
|
c8900c279c
|
课程标签增加、删除
|
11 years ago |
|
sw
|
a100193373
|
1.作业参与人员可以对作业进行修改，但不能进行删除
2.作业成员(发布人员和参与人员)不能对作业进行评分
3.修改进行作业删除、添加、修改、添加成员等方法的权限判断
|
11 years ago |
|
nwb
|
70901832a8
|
1.修改课程讨论区control index、show方法及路由
2.BoardsHelper添加课程相关方法
|
11 years ago |
|
sw
|
a681aa76cb
|
1.修复进入互评界面的报错
2.互评界面增加参与人员显示
3.添加成员页面开发人员改为参与人员
|
11 years ago |
|
sw
|
d0dd6eb781
|
1.修改作业时实现作业添加参与人员与删除参与人员
2.homework_attach、homework_user、users关系添加
3.优化页面显示
|
11 years ago |
|
sw
|
130f9f87c2
|
1.实现作业添加成员的翻页功能
2.美化作业成员界面显示
|
11 years ago |
|
nwb
|
a793b8923d
|
1.Non member角色添加add_couese权限
2.course_helper优化排序等相关函数
3.课程index界面修改
|
11 years ago |
|
sw
|
cbb348dc0e
|
实现给作业增加用户页面相关js代码及css代码
|
11 years ago |
|
sw
|
67c9fefba6
|
增加tab页切换的js
|
11 years ago |
|
sw
|
787e043650
|
1.修改下载作业时的错误
2.修改判断是不是为当前课程学生、老师的方法
|
11 years ago |
|
sw
|
26b933dddb
|
t
|
11 years ago |
|
sw
|
e5fec207aa
|
1.修改判断当前用户是否为指定课程成员、学生、老师的方法
2.新建作业时获取当前项目学生方法
3.增加checkbox生成方法
|
11 years ago |
|
nwb
|
2f3d9b1795
|
1.修改资源文件类index方法
2.添加课程资源文件index视图
|
11 years ago |
|
z9hang
|
f383f501ec
|
修改权限代码:判断用户是否为项目的管理员、判断用户是否为课程的老师、学生由根据role_id判断改为根据其权限判断
|
11 years ago |
|
nwb
|
59742b9ddb
|
1.给各角色添加项目相关的权限
2.添加课程权限解析系统
|
11 years ago |
|
sw
|
8f94985186
|
1.添加作业时权限判断
2.增加作业成员tab页
|
11 years ago |
|
yanxd
|
174c5556a0
|
减少sql查询， logger ===> Rails.logger
|
11 years ago |
|
yanxd
|
1c7923e5bd
|
sql
|
11 years ago |
|
sw
|
8e2288a362
|
1.封装获取作业平均评分方法
2.优化作业列表界面效率
|
11 years ago |
 wanglinchun
|
0255a61d2f
|
dfg
|
11 years ago |
|
sw
|
81a97f6a5e
|
1.老师创建作业增加功能：是否启用互评，以及该功能的修改。对不启用互评的作业，学生不可下载作业，不可互相打分，但可以留言；老师可以进行评分、下载作业等操作。启用互评作业功能和现在一样
2.对启用互评的作业，每个用户只可以进行一次打分，打分后不可修改
|
11 years ago |
|
wanglinchun
|
d06488c10d
|
为竞赛通知添加评论
|
11 years ago |
|
nwb
|
0d99644fa7
|
1.用户课程表逻辑修改
2.添加link_to_course相关逻辑
|
11 years ago |
|
sw
|
78ac974a75
|
1.修改课程作业列表界面提交作业
2.修复获取当前用户在指定作业下提交作业方法不正确的问题
|
11 years ago |
|
nwb
|
4404222437
|
0604
|
11 years ago |
|
sw
|
29ac5ff12a
|
如果当前用户已经提交过作业就不显示新增作业按钮
|
11 years ago |
|
sw
|
50171ad0f8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
wanglinchun
|
6a8d697582
|
Merge branch 'develop' into competition
Conflicts:
config/routes.rb
lib/redmine.rb
|
11 years ago |
|
sw
|
9bfe9ba1b2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
27be52e58d
|
老师的邮件中增加取消邮件通知链接
修复主页文件上传动态中点击进入附件跳转错误问题
|
11 years ago |
|
nwb
|
cd10dd5433
|
课程权限判断变更，从项目权限分离
|
11 years ago |
|
nwb
|
7d3d406c00
|
新增部分课程所需的解析函数
|
11 years ago |
|
nwb
|
9f948c971f
|
添加课程排序方法
|
11 years ago |
|
wanglinchun
|
528af32f91
|
修改forge，localhost首页不能显示的问题
|
11 years ago |
|
wanglinchun
|
bf71a38608
|
竞赛通知相关文件修改
|
11 years ago |
|
z9hang
|
2e9251530c
|
修改缺陷状态留言处引用的链接被遮住问题
|
11 years ago |
|
yanxd
|
b33ee17343
|
Merge remote-tracking branch 'remotes/origin/develop' into szzh
Conflicts:
Gemfile
app/controllers/users_controller.rb
db/schema.rb
|
11 years ago |
|
sw
|
22688dd5da
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
xianbo
|
7d1327ad2a
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
 fanqiang
|
150bb1ba1e
|
修改开源社区主页中的漏洞展示部分
|
11 years ago |
|
sw
|
96504d6806
|
1.修改作业提交流程，
2.增加修改作业、删除作业方法
3.修改作业页面显示
|
11 years ago |
|
yanxd
|
006e4ae45e
|
user tab bar
|
11 years ago |
|
nwb
|
f936c30ec9
|
添加与course.index相关的control、view、help等实现
|
11 years ago |
|
sw
|
218fb3f831
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
nwb
|
b52690adc2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
61135a352a
|
上传文件表单支持添加文件标签
|
11 years ago |
|
sw
|
27a30d44be
|
1.修改判断当前用户是不是为课程老师的方法
2.增加作业综评功能
3.其他课程的学生是不能互评的，只有本门课程的学生可以互评
4.修改添加评论方法
5.修复当作业无人评论时，作业最终得分只显示一个分字
|
11 years ago |
|
z9hang
|
bf12692de4
|
登录名==》账号/邮箱
老师在课程动态中看到学生真名
|
11 years ago |
|
xianbo
|
0f56d9e885
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
yanxd
|
a9b88b8e66
|
issues#show words typo
|
11 years ago |
|
wanglinchun
|
a1083fe900
|
修改了原有参赛作品显示报500；
修改了作品删除功能报错
|
11 years ago |
|
yanxd
|
654cb404e2
|
bootstrap test
|
11 years ago |
|
yanxd
|
12b1553a33
|
Merge branch 'develop' into szzh
|
11 years ago |
|
yanxd
|
7a4e5afba0
|
test
|
11 years ago |
|
t430
|
fd0a504d84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
11 years ago |
|
yanxd
|
5364687160
|
bootstrap & tag bug
|
11 years ago |
|
xianbo
|
e52886cf46
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/softapplications/show.html.erb
db/schema.rb
|
11 years ago |
|
xianbo
|
cda9942723
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
yanxd
|
598429695f
|
Merge branch 'develop' into szzh
|
11 years ago |
|
yanxd
|
62f9ed052b
|
issues#655
|
11 years ago |
|
fanqiang
|
d3ead651fe
|
动态显示安全问题
|
11 years ago |
|
sw
|
5d4226ce79
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
65c3bb5eb1
|
1.作业列表评分结果显示保留2位有效数字
2.互评界面显示最终评分数值
3.增加互评按钮，修改查看学号、按学号排序等功能的条件
4.修改互评界面作业下载信息显示，取消描述
|
11 years ago |
|
yanxd
|
f44b930037
|
233
|
11 years ago |
|
wanglinchun
|
2f709c92ba
|
重构bid_helper，contest_helper以及application_helper中共同用到的方法
|
11 years ago |
|
nwb
|
f51873d98b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
dd4ef11b3d
|
添加项目管理员审核已申请用户界面及逻辑
|
11 years ago |
|
yanxd
|
34aa8433de
|
import hubspot
|
11 years ago |
|
yanxd
|
3517dbb88b
|
Merge branch 'szzh' into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
fanqiang
|
10aa8eee81
|
显示帖子的发布者和时间
|
11 years ago |
|
wanglinchun
|
88b7fd24b1
|
给新建参赛作品中托管项目添加默认选项，使用户自行选择是否需要将参赛作品托管到制定的项目中
|
11 years ago |
|
nwb
|
1d6816419d
|
优化用户申请加入项目界面刷新
|
11 years ago |
|
nwb
|
104ee13ac7
|
1.添加用户申请加入项目contrl、model及相关逻辑
2.项目界面添加申请加入按钮
|
11 years ago |
|
xianbo
|
4b063a2c69
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
fanqiang
|
973a59042c
|
修改帖子显示用户名与链接问题
|
11 years ago |
|
wanglinchun
|
77b7da81fd
|
参赛作品页面编辑功能中添加修改托管项目列表完成
|
11 years ago |
|
yanxd
|
c4bd9aaabd
|
Merge branch 'szzh' into develop
|
11 years ago |
|
nwb
|
4156983494
|
缺陷添加缩略图显示
|
11 years ago |
|
yanxd
|
d47facc9e8
|
Merge branch 'szzh' into develop
Conflicts:
app/views/contests/show_attendingcontest.html.erb
db/schema.rb
|
11 years ago |
|
sw
|
c141501085
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
yanxd
|
9373666576
|
混淆课程数量
|
11 years ago |
|
sw
|
b80c51475f
|
1.增加作业参与人员类homework_users及相关代码
2.homework_attach增加字段：name，description，state
|
11 years ago |
|
sw
|
14a468066f
|
修复打开首页，SQL没有默认的school_id的问题
|
11 years ago |
|
sw
|
7ead12dba6
|
1.优化路由代码
2.修改当查询学校课程数数量少于8个时，推荐9-当前学校课程数量门最好的课程给用户，并且排除当前学校课程
|
11 years ago |
|
wanglinchun
|
31ec9bc353
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
z9hang
|
0385013905
|
修复主页跳转
去除老师删除项目型作业，优化代码
|
11 years ago |
|
fanqiang
|
c6ee7e53e6
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
fanqiang
|
1a7c82174c
|
修改表结构
|
11 years ago |
|
yanxd
|
665a17eda5
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
yanxd
|
829c77879a
|
typo
|
11 years ago |
|
wanglinchun
|
4ea8611942
|
教师评奖功能初步完成
|
11 years ago |
|
nwb
|
6f0e621f3c
|
添加项目成员界面，显示用户的account
|
11 years ago |
|
z9hang
|
fcc5f220ce
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
25dba88a08
|
1.优化界面
2.资源下载界面添加按文件类型分类浏览
|
11 years ago |
|
z9hang
|
73dcf3679d
|
去除课程、项目配置中的讨论区配置
|
11 years ago |
|
sw
|
64900b1fd7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
5d2bb4ccbd
|
1.选择学校进入学校课程列表，点击更多由显示所有课程可能改为显示当前学校课程列表，之后排序也一样
2.当查询学校课程列表为空时，推荐改为本系统中本年度开设的最好的课程，同时加入课程改为关注课程。此时点击更多查看的为所有课程
3.查询出课程列表将学校和教师放在课程上面
|
11 years ago |
|
nwb
|
431b6603f1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
e5bbd68c8c
|
1.添加资源分类浏览视图
2.处理分类选择变化事件
3.资源处理优化
|
11 years ago |
|
sw
|
f487352d6d
|
当当前学校开设课程数位0时推荐给用户的由开设课程最多的几个学校改为本系统中最好的几门课程
|
11 years ago |
|
sw
|
b97c2e230f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
74a9aa14d6
|
增加获取学校列表按学校开设课程数排序的方法
增加当当前学校开设课程数目为0时按照上方法推荐其进入其他学校查看课程
|
11 years ago |
|
yanxd
|
2f47cc1cd8
|
Merge branch 'test', remote-tracking branch 'origin/szzh' into develop
|
11 years ago |
|
fanqiang
|
9b151567f1
|
修改没有帮助显示问题
|
11 years ago |
|
yanxd
|
05baffe4f3
|
issue导航，首页贴吧动态html,加入了最后回复
|
11 years ago |
Wen
|
501b491363
|
=.=
|
11 years ago |
|
fanqiang
|
2c8580a4e8
|
Merge branch 'crawl' into develop
Conflicts:
app/controllers/tags_controller.rb
app/views/tags/_tag.html.erb
app/views/tags/_tag_search_results.html.erb
app/views/tags/index.html.erb
config/locales/zh.yml
config/routes.rb
db/schema.rb
|
11 years ago |
|
Wen
|
90b53a7efb
|
打分的调整
|
11 years ago |
|
Wen
|
040e4b2740
|
用户打分.
|
11 years ago |
|
wanglinchun
|
3da6d5cd37
|
应用页面列表排序（按时间排序已好，另一种排序暂未定）
|
11 years ago |
|
wanglinchun
|
b542f8072d
|
调整竞赛列表页面中的排序问题
|
11 years ago |
|
fanqiang
|
07b75924d8
|
修改tag搜索，使得tag搜索能够搜索开源项目
在帖子展示页面添加时间，并添加标签
|
11 years ago |
|
wanglinchun
|
189b935d5b
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
wanglinchun
|
1ca0113204
|
Merge branch 'competition' into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
wanglinchun
|
9038f2758c
|
根据将旧的竞赛信息和参与竞赛的项目信息迁移到新的竞赛相关数据表后重新调整竞赛子站首页最新热门竞赛的显示
|
11 years ago |
|
yanxd
|
f4595dfcd2
|
修改部分拍段project、course方式
projectlist 报错
|
11 years ago |
 kg
|
77ea0092b7
|
add course homepage activity
|
11 years ago |
|
Wen
|
473a44d11a
|
学校-课程模式！
|
11 years ago |
|
Wen
|
00e62ec8f7
|
用户评分理论上完成版.
|
11 years ago |
|
fanqiang
|
91d5959016
|
添加了对管理员申请的接受与拒绝
|
11 years ago |
|
Wen
|
ded3da6670
|
用户评分理论上完成了
|
11 years ago |
|
fanqiang
|
28b10ed3fd
|
修改了搜索功能，并能对搜索进行过滤
|
11 years ago |
|
Wen
|
3ba524668f
|
用户评分未完成版本= =
上传一下以防丢了
|
11 years ago |
|
wanglinchun
|
94a7bacdd2
|
首页：当无应用时，提示暂无应用
|
11 years ago |
 baiyu
|
f0b497e455
|
user score merge
|
11 years ago |
|
baiyu
|
36cd91401f
|
user score
|
11 years ago |
|
fanqiang
|
8600265f00
|
修改查询条件样式
|
11 years ago |
|
xianbo
|
bb4d141b0e
|
erge branch 'competition' into develop
Conflicts:
app/views/layouts/base_newcontest.html.erb
|
11 years ago |
|
wanglinchun
|
43064c4bc2
|
调整竞赛模块首页中显示的竞赛：既有旧的竞赛又有新的竞赛
|
11 years ago |
|
xianbo
|
647081539c
|
fix
|
11 years ago |
|
wanglinchun
|
76ccfe8ac4
|
fix
|
11 years ago |
|
wanglinchun
|
9ac0cbe6a3
|
Merge branch 'competition' into develop
Conflicts:
Gemfile
app/controllers/tags_controller.rb
app/views/layouts/_base_header.html.erb
config/routes.rb
db/schema.rb
|
11 years ago |
|
wanglinchun
|
8f6d9fc6a5
|
0418
|
11 years ago |
|
alan
|
f6a1e90ad1
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
wanglinchun
|
3a5b5bc0ce
|
设计并调整竞赛模块的首页显示样式
|
11 years ago |
|
yanxd
|
84d3e40c41
|
zip down controller created
|
11 years ago |
|
wanglinchun
|
6421f02ac8
|
调整了参赛应用列表布局显示样式
|
11 years ago |
|
wanglinchun
|
733497fef8
|
调整竞赛列表页面中部分统计数字的超链接
|
11 years ago |
|
alan
|
933fc6cb33
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
alan
|
7781203474
|
附件按tag查询时，只查选定项目中的附件
|
11 years ago |
|
wanglinchun
|
f9e5dd47f6
|
修改了竞赛列表的排序问题
|
11 years ago |
|
wanglinchun
|
64895a75ed
|
显示上传截图+应用显示
|
11 years ago |
|
wanglinchun
|
a4df4cf893
|
修改竞赛和参与竞赛的新建应用之间的关联关系
|
11 years ago |
|
wanglinchun
|
b97cdd6b0d
|
修改参赛应用中应用和竞赛的关联前，目前部分代码由于数据表及关联没考虑清楚，导致无法关联，下一步修改代码，重新建表，完成关联功能及应用的正常显示
|
11 years ago |
|
yanxd
|
1b6cdeac05
|
列表上提交作业，大概好了吧
|
12 years ago |
|
yanxd
|
045b55236f
|
作业提交临时解决方案
|
12 years ago |
|
fanqiang
|
d381423c0e
|
添加了版主功能
|
12 years ago |
|
fanqiang
|
89b668be82
|
添加申请版主功能，目前已经可以写入数据库
|
12 years ago |
|
wanglinchun
|
a9e9171441
|
通过脚手架新建了一套应用的东西，包括数据库的相应表，新建了发布应用的页面，上传图片功能未实现，界面格式还需调整
|
12 years ago |
|
yanxd
|
7e130ee89e
|
去掉login_flag
|
12 years ago |
|
wanglinchun
|
2a278e0a2d
|
all
|
12 years ago |
|
fanqiang
|
9af808821d
|
修改框架，添加"没有帮助"和"申请成为版主"功能
|
12 years ago |
|
wanglinchun
|
120e84cfc7
|
新竞赛代码移植
|
12 years ago |
|
yanxd
|
a1a58ee26c
|
加注释
|
12 years ago |
|
Wen
|
4448fdfaca
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
4f5216e632
|
merge
|
12 years ago |
|
yanxd
|
84c5032eb2
|
整理下，加个推荐tag
|
12 years ago |
|
xianbo
|
5c63ea2378
|
add contest and fix url
|
12 years ago |
|
xianbo
|
2bba27e7a1
|
evils uri
|
12 years ago |
|
xianbo
|
3d2516f53c
|
fix navigation
|
12 years ago |
|
yanxd
|
d2ebfca314
|
加个数组判断
|
12 years ago |
|
yanxd
|
850ff6194f
|
issue#509,#510
|
12 years ago |
|
yanxd
|
8c251da25d
|
Bug：新建作业时菜单栏第一个显示蓝色，应该是第二个显示蓝色
|
12 years ago |
|
xianbo
|
6e065361b3
|
fix main page navigation
|
12 years ago |
|
fanqiang
|
d935152ed7
|
initial crawl
|
12 years ago |
|
yanxd
|
c38a8e4f6a
|
socialForge#324
|
12 years ago |
|
xianbo
|
3bf0a8f138
|
fix default show
|
12 years ago |
|
yanxd
|
6ba25556b7
|
issues id new world
|
12 years ago |
|
xianbo
|
321f2df0b9
|
add chance to new preoject
|
12 years ago |
|
xianbo
|
8db09739a1
|
optimize the show of forge
|
12 years ago |
|
yanxd
|
2e3b44c830
|
id-name(position|count)
|
12 years ago |
|
xianbo
|
34fd8a933a
|
fix the show of domain and project page
|
12 years ago |
|
Wen
|
ce7af30788
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
Wen
|
31b7ab8ae5
|
创建课程处添加了学校
数据库中存储学校的ID
但是学校与省份的级联还没有做好=A=
|
12 years ago |
|
xianbo
|
20cd5941a8
|
modify project main page
|
12 years ago |
|
yanxd
|
c905ded3b5
|
擦屁股
|
12 years ago |
|
yanxd
|
52fe99d71c
|
fixed 谭 domain bug in development environment.
|
12 years ago |
|
yanxd
|
e97caddbdb
|
又一个course timeout问题
|
12 years ago |
|
xianbo
|
3f55e78f49
|
add diff url in navigation
|
12 years ago |
|
yanxd
|
e0c87996bf
|
改了个课程截至日期，并且在courses_controller中设置了过期不允许加入的设定，目测没什么问题，明天再看看
|
12 years ago |
|
yanxd
|
daed8a1164
|
暂且提交，增加活动失败。
|
12 years ago |
|
yanxd
|
592d704a6d
|
主页 文件上传bug
|
12 years ago |
|
yanxd
|
3df986a908
|
教师列表转换排序方式后则搜索所有人员bug
|
12 years ago |
|
yanxd
|
46b508be2b
|
首页 论坛发帖权限
|
12 years ago |
|
yanxd
|
e7841cb512
|
fix
|
12 years ago |
|
yanxd
|
8963cc3a3c
|
邮件问题一
|
12 years ago |
|
yanxd
|
3b7e8483e3
|
搜索算法
|
12 years ago |
|
yanxd
|
0b385cdbbb
|
毛的资源库关联文件
|
12 years ago |
|
yanxd
|
e9373991d2
|
maoxian
|
12 years ago |
|
yanxd
|
21e55492fa
|
小改怡情 大改伤身 强改灰飞烟灭
|
12 years ago |
|
yanxd
|
2ca1362e83
|
“按用户搜索”和“搜索”的区别，分别可以搜索什么？ 上面搜索删掉
1、标签的格式需 要优化（所有涉及到标签的地方的标签的格式都需要调整） tag周围距离
“课程通知“应该调整到“课程作业”后面 改！
|
12 years ago |
|
yanxd
|
8a3d1d033c
|
用户navbar问题，注册对齐问题
|
12 years ago |
|
yanxd
|
7deeab62bc
|
course.trustie.net
|
12 years ago |
|
yanxd
|
cf2689917b
|
三天两头反复改 不如自挂东南枝
|
12 years ago |
|
wanglinchun
|
b45332bab0
|
课程默认活跃度排序
|
12 years ago |
|
yanxd
|
ecec98aac9
|
菜单栏调整
|
12 years ago |
|
yanxd
|
104e2f8542
|
内容不一致引起的路由错误
|
12 years ago |
|
wanglinchun
|
42a1a9e0b9
|
重复提交问题
|
12 years ago |
|
yanxd
|
45f8b15083
|
paginate
|
12 years ago |
|
yanxd
|
61380a5e1a
|
文件来源
|
12 years ago |
|
yanxd
|
2bb44456d6
|
search
|
12 years ago |
|
yanxd
|
d09e995f52
|
class
|
12 years ago |
|
yanxd
|
85e89f5c09
|
storeshelper attachFromUrl
|
12 years ago |
|
yanxd
|
f91d94fd4c
|
fetch stores/index instance_object
|
12 years ago |
|
yanxd
|
4b8a4c82c9
|
学号在作业里显示问题，首页时间显示不确定问题，项目缺陷滑动效果乱跳问题。
|
12 years ago |
|
wanglinchun
|
4167e8bb8f
|
修改了门户网站中用户动态的[进入附件列表]显示颜色
|
12 years ago |
|
yanxd
|
123817df93
|
tools 顺序
首页讨论区去掉项目讨论区
所有留言删除功能
标题显示错误
|
12 years ago |
|
yanxd
|
2070e9dc7f
|
remove memo/messages info from welcome.index
|
12 years ago |
|
yanxd
|
997c546083
|
remove html char
|
12 years ago |
|
yanxd
|
c3cbf87b3d
|
首页排序大概搞定
|
12 years ago |
|
yanxd
|
fea1cdff53
|
首页时间排序，可能会引起其他调用event_datetime的问题。待观察
|
12 years ago |
|
yanxd
|
e12922544a
|
链接bug，去掉动态里的文档内容
|
12 years ago |
 nieguanghui
|
8a0dc59f3e
|
welcome index helper.
|
12 years ago |
|
yanxd
|
2c5cd7a12a
|
'merge'
|
12 years ago |
|
yanxd
|
f05d2131bd
|
组织留言数据方法
|
12 years ago |
|
nieguanghui
|
fbf73de68b
|
1234
|
12 years ago |
|
yanxd
|
3f82203735
|
it can be summited project with same name.
|
12 years ago |
|
nieguanghui
|
2db1067158
|
1、 网站中的搜索几乎都没有搜索后的提示语，这里应该加提示语，提示重新搜索。
2、 竞赛—关注 参与项目 用户反馈 这行应该去掉。
4. 去掉竞赛参与项目页面中”参与了竞赛”的 a 标签。
5．竞赛侧边栏显示方式的统一。
6. 解决竞赛侧边栏关注部分不显示头像的bug.修复侧边栏参与者部分没有参与者也不会显示提示的bug。
7. 增加竞赛中关注一栏的”more”链接。
7. 重构竞赛layouts代码。
|
12 years ago |
|
nieguanghui
|
ca9da99f7e
|
1、 实践课程->课程动态 列表 动态显示（有了最新动态后）应该为：如果是项目则显示新闻，课程则显示通知【光辉 周三】
2、 系统中需要加空格地方：留言时间后加空格；作业截止日期前加空格；项目-缺陷：指派给**加空格；项目动态-发布时间加空格，而且去掉a标签；项目-新闻（更新时间后缺空格）【光辉 周三】
3、 竞赛—左下角 参与项目后面的“更多“位置应该调整【光辉 周三】
4、 看别人的主页时没有标签【光辉 周三】
|
12 years ago |
|
yanxd
|
e1e2e6e986
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
4d2fd01cf9
|
进入附件列表
|
12 years ago |
|
nieguanghui
|
c6f657ed8c
|
重构排序代码
|
12 years ago |
|
yanxd
|
b0efdefa7d
|
学号显示问题
|
12 years ago |
|
yanxd
|
246ab25bf0
|
部分sql语句写成rails形式
|
12 years ago |
|
yanxd
|
5e9bb9a99f
|
删除提示框作业，作业提交的问题。附件提交之后还会存在。
|
12 years ago |
|
yanxd
|
fcc2dd7952
|
首页版本库，sth.
|
12 years ago |
|
yanxd
|
3484632ce8
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
b703c65033
|
关注取消关注位置漂移
个人主页学号的隐藏
|
12 years ago |
|
nieguanghui
|
f2d392de1d
|
调整主页界面显示
|
12 years ago |
|
yanxd
|
59b2c408e7
|
sa
|
12 years ago |
|
nieguanghui
|
0416902cde
|
修改个人动态显示内容
|
12 years ago |
|
nieguanghui
|
b9b089fb27
|
完善主页个人动态部分汉化问题
|
12 years ago |
|
yanxd
|
ca2f5c6705
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
cefddb635a
|
e
|
12 years ago |
|
nieguanghui
|
f23451e4bb
|
add something
|
12 years ago |
|
yanxd
|
dcb16cb789
|
fix bug"
|
12 years ago |
|
nieguanghui
|
c27528ffb7
|
1234
|
12 years ago |
|
yanxd
|
f7a6798b73
|
.
|
12 years ago |
|
yanxd
|
23785999f1
|
fix fetch time
|
12 years ago |
|
yanxd
|
4f6cd0800a
|
welcome helper fetch new memos
|
12 years ago |
|
nieguanghui
|
25baf61185
|
to do
|
12 years ago |
|
yanxd
|
4eeb7c3ea8
|
look at daily log.
|
12 years ago |
|
nieguanghui
|
02b5f2bafa
|
解决项目跑到课程里面的bug
|
12 years ago |
|
yanxd
|
d29154cc24
|
hot memo merged board/topic.
|
12 years ago |
|
nieguanghui
|
02bea99646
|
主页改进
|
12 years ago |
|
nieguanghui
|
69c113f386
|
修改主页显示
|
12 years ago |
|
yanxd
|
6cede3d2be
|
计算评论数量，修复按照时间查找bug,etc...
|
12 years ago |
|
nieguanghui
|
1ef5059708
|
主页
|
12 years ago |
|
yanxd
|
28978b88b2
|
首页用户动态加入讨论区内容，点击之后定位到帖子。
|
12 years ago |
|
yanxd
|
5914fb218c
|
add method to show download link
show download count in /project/:id/files
|
12 years ago |
|
nieguanghui
|
25fd898623
|
修改部分内容
|
12 years ago |
|
yanxd
|
0609c5c7ea
|
1.增加帖子回复时间查询语句
2.帖子回复的数量在数据库中有字段
3.新建帖子失败错误提示
4.下载里程碑top_menu删掉，
5.学生分页，分页方法封装
|
12 years ago |
|
yanxd
|
825b1e7fd7
|
点击tag之后的索引功能.
|
12 years ago |
|
nieguanghui
|
344e51105a
|
qq
|
12 years ago |
|
nieguanghui
|
39bf4ff188
|
解决鼠标bug
|
12 years ago |
|
nieguanghui
|
3700294890
|
门户网站页面微调
|
12 years ago |
|
nieguanghui
|
aa4596e170
|
增加图标显示
|
12 years ago |
|
yanxd
|
5d77f2031e
|
主页去除影响性能的代码
|
12 years ago |
|
nieguanghui
|
90b38cf5e8
|
s
|
12 years ago |
|
yanxd
|
49327905f8
|
refactor welcome help
|
12 years ago |
|
nieguanghui
|
6e704872be
|
1
|
12 years ago |
|
yanxd
|
579e78df9b
|
讨论区回复最多的主题帖
|
12 years ago |
|
yanxd
|
6a97cb69a8
|
welcome activity.
|
12 years ago |
|
nieguanghui
|
eb2bf5b879
|
增加方法
|
12 years ago |
|
nieguanghui
|
1f83ca612b
|
显示部分数据
|
12 years ago |
|
yanxd
|
cdbc26e8df
|
Merge branch 'forum' into develop
|
12 years ago |
|
yanxd
|
16c0bc3ac3
|
memo edit/destory.
|
12 years ago |
|
yanxd
|
48650a2a91
|
init forum. again.
|
12 years ago |
|
yanxd
|
ae1fe0027a
|
optimization project helper.
|
12 years ago |
|
fanqiang
|
16f70437d1
|
forum init.
|
12 years ago |
|
yanxd
|
5de8e1c2f2
|
new welcome index.
|
12 years ago |
|
yanxd
|
356a48caa8
|
move constant to module, fixed some translate.
|
12 years ago |
