 lizanle
|
88c2db47b7
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/helpers/application_helper.rb
|
10 years ago |
guange
|
4f57e48b92
|
merge
|
10 years ago |
|
guange
|
d1315e35b5
|
merge
|
10 years ago |
|
guange
|
f61f639af2
|
转换为remote js
|
10 years ago |
|
lizanle
|
c5f903146d
|
博客资源下载问题
|
10 years ago |
|
lizanle
|
14912078ee
|
博客资源允许下载
|
10 years ago |
 cxt
|
42f0fc62e9
|
分组成员不能修改作品
|
10 years ago |
|
cxt
|
f880ccd749
|
分组作业
|
10 years ago |
|
cxt
|
4e04df7a8a
|
分组作业的动态显示及关联项目
|
10 years ago |
|
cxt
|
53f9141cf1
|
分组作业动态
|
10 years ago |
|
guange
|
3476731b83
|
将at js data整合到文件中
|
10 years ago |
|
cxt
|
a9f6e817b4
|
分组作业关联项目
|
10 years ago |
|
guange
|
1a2aff99be
|
调整显示的格式
|
10 years ago |
|
cxt
|
79ce5c9ac5
|
匿评已结束时作业动态的作品按钮显示成“查看作品”
|
10 years ago |
|
guange
|
af31946586
|
issue列表开启AT功能
|
10 years ago |
|
lizanle
|
582cd6f5d4
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
10 years ago |
 huang
|
042b197767
|
课程英雄榜界面调整
动作触发的时候更新总分
更换迁移顺序
|
10 years ago |
|
huang
|
aca7684414
|
课程英雄榜
各模块动作 触发加分
|
10 years ago |
|
lizanle
|
4efb660214
|
全站搜索
|
10 years ago |
|
cxt
|
e22b4cbdeb
|
作业提交截止后，未提交作品的学生看到的作业动态将显示“补交作品”
|
10 years ago |
 ouyangxuhua
|
78e1ae4188
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
10 years ago |
|
lizanle
|
b24fadea05
|
设置 删除 编辑按钮做成项目一样的
|
10 years ago |
|
cxt
|
5d03a27170
|
启动匿评和关闭匿评时自动刷新该动态
|
10 years ago |
|
ouyangxuhua
|
283af137c6
|
组织模块动态及配置
|
10 years ago |
|
cxt
|
8e3b04f9e3
|
禁用匿评&&作业截止&&作品已提交 学生可查看所有作品列表
|
10 years ago |
|
cxt
|
41f53ad4e0
|
作业截止后不可再修改作品
|
10 years ago |
|
huang
|
1c45afac89
|
增加提示
修改链接参数
|
10 years ago |
|
huang
|
83486c745e
|
1、如果没有新增版本库，点击链接跳至配置--新增
2、已创建过gitlab项目则跳至gitlab 版本库
|
10 years ago |
|
cxt
|
d851364e70
|
匿评开启前学生能看到提交的作品数
|
10 years ago |
|
cxt
|
717baed23b
|
匿评结束后动态和作业列表中的“作品匿评”改为“匿评结束”
|
10 years ago |
|
huang
|
178752ba8f
|
将“作品”改成“提交”
|
10 years ago |
|
huang
|
07ff8d2eb7
|
老师，非课程成员 课程动态中显示 -- 提交（作品数）
|
10 years ago |
|
huang
|
c11905707d
|
非课程成员 --课程动态中不显示 提交 ，匿评等信息
|
10 years ago |
|
huang
|
0945fecee6
|
匿评开启后，显示“作品匿评”，点击进入匿评作业列表
|
10 years ago |
 sw
|
33924680b2
|
修改开启匿评提示
|
10 years ago |
|
sw
|
709e099770
|
增加部分作业关联表的判断
|
10 years ago |
|
sw
|
6807f649bf
|
1、作品列表头像显示全部一样
2、匿评作业开启匿评之后学生可以在作业列表修改作业
|
10 years ago |
|
sw
|
d727097ed2
|
1、已开启匿评代码没有匿评设置功能
2、匿评结束不显示
|
10 years ago |
|
sw
|
5313bf0e3d
|
具体课程作业列表中也应该看到编程作业的匿评状态
|
10 years ago |
|
cxt
|
20ea692260
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
154cd7de6f
|
子域名的更改
|
10 years ago |
|
sw
|
9d9ed24d1b
|
111
|
10 years ago |
|
sw
|
281e97e468
|
课程内老师可以对作业进行编辑、删除、开启匿评
|
10 years ago |
|
sw
|
4b83265508
|
1、编程作业可以修改、删除
2、关闭匿评之后结束匿评按钮样式
3、编程作业成绩计算有问题
4、相关样式修改
5、编程作业作品展开界面功能
|
10 years ago |
|
sw
|
5f08ecc7e3
|
1、作业的开启匿评、关闭匿评功能
2、提交作品时，迟交扣分、缺评扣分的计算--->改为只计算数量
3、
|
10 years ago |
|
sw
|
30ebe9b2d5
|
1、编程作业可以开启匿评
2、取消扣分标准的显示
|
10 years ago |
|
sw
|
b1463f0864
|
学生提交匿评作业作品功能实现
|
10 years ago |
|
guange
|
216bc7f70f
|
动态中作业的提交状态修改
|
10 years ago |
|
guange
|
6063f39eac
|
修改作业的一些链接和跳转问题
|
10 years ago |
|
huang
|
487881bb92
|
Merge branch 'szzh' into dev_hjq
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
|
huang
|
0e4019be2f
|
修复时间乱的问题
|
10 years ago |
|
huang
|
7361f40b0c
|
修改项目资源时间显示跳转错误页面问题
|
10 years ago |
|
sw
|
c09478c73f
|
作业列表界面和动态列表界面显示不一致
|
10 years ago |
|
sw
|
09a994f76a
|
职称增加副教授等职称
|
10 years ago |
|
sw
|
ca0c7a4fb0
|
个人主页职称
|
10 years ago |
|
cxt
|
e448d2c05f
|
个人主页
|
10 years ago |
|
sw
|
c93bc5be40
|
作业列表效果显示
|
10 years ago |
|
lizanle
|
9138f46301
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/users_controller.rb
|
10 years ago |
|
lizanle
|
89b9a5c09d
|
资源库
|
10 years ago |
|
sw
|
b036d5b63d
|
网站首页、个人主页、项目、课程等页面header项目/课程下拉框按照最新的动态更新时间排序
|
10 years ago |
|
sw
|
2e4babc2ae
|
修改demo代码，增加C++的示例代码
|
10 years ago |
|
sw
|
96420f59a8
|
修改标准代码
|
10 years ago |
|
lizanle
|
6f773b902b
|
移动端版本 管理 可以下载
|
10 years ago |
|
lizanle
|
b3d2754415
|
移动端版本 管理 可以下载
|
10 years ago |
|
sw
|
42d706a961
|
作品列表扣分规则显示
|
10 years ago |
|
sw
|
94ed3501f8
|
转义增加&的转义
|
10 years ago |
|
sw
|
a4095adc59
|
编程作业代码中不显示<和>
|
10 years ago |
|
sw
|
b981c4d07b
|
增加方法判断：将/n转还成<br/>
|
10 years ago |
|
sw
|
159d8f644e
|
编程作业不可修改作品，界面显示
|
10 years ago |
|
sw
|
ec051ef929
|
编程作业老师、学生界面的显示
|
10 years ago |
|
sw
|
3e6ccf3e50
|
作业截至之前不能启动匿评页面
|
10 years ago |
|
guange
|
f58b530484
|
给课程活动慢加上缓存，并且加入了开关
|
10 years ago |
|
sw
|
cc5171bc1d
|
解决冲突
|
10 years ago |
|
sw
|
f2ea879b9b
|
老师和同课程的学生有权限下周作品附件
|
10 years ago |
|
sw
|
837fbe74e8
|
1、老师和同课程的学生有权限下周作品附件
2、作品附件下载成功之后消失
|
10 years ago |
|
sw
|
19bf8ef50d
|
作品修改功能
|
10 years ago |
|
sw
|
70f14f851d
|
根据作业不同类型、不同阶段、当前用户身份对作品列表进行过滤，以及相关界面功能的过滤
部分界面样式调整
|
10 years ago |
|
sw
|
8c6ea88504
|
1、作品列表TAB切换
2、作品界面作业详细信息
3、到处Excel名称
|
10 years ago |
|
huang
|
379de18cd6
|
修改资源库全站搜索：
1、搜索条件为空的时候，不允许显示全部资源
2、全站搜索，非自己上传的资源不允许查看
3、全站搜索，项目管理员能设置公开权限的资源在全局搜索中也可以
|
10 years ago |
|
sw
|
7684a6b253
|
1、实现作业列表展示页面
2、新建作业、修改作业、开启/关闭匿评路由以及页面跳转
3、注释掉bid相关的路由
4、作品列表、新建作品、修改作品、删除作品路由及页面跳转
|
10 years ago |
|
huang
|
df48d89881
|
版本库权限封装
添加admin可以管理资源的公开私有
|
10 years ago |
|
huang
|
3c810a0cee
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
3f77e2cdcf
|
资源权限公共方法定义
|
10 years ago |
|
guange
|
39308dacfd
|
将setting中的domain合并到host配置中
|
10 years ago |
|
huang
|
2c568ed370
|
修改主页下载不存在的资源500错误
定义helper方法
|
10 years ago |
|
guange
|
092af28476
|
修正编辑器在火狐下粘贴不成功
|
10 years ago |
whimlex
|
88bbd70102
|
项目名称导航；问题跟踪页面项目导航到问题列表页面；IE问题跟踪页面缩略图显示
|
10 years ago |
|
whimlex
|
bbe4c15293
|
问题跟踪图片附件和定义的样式不一时，调整图片缩略图显示方式
|
10 years ago |
|
whimlex
|
b5b50bef21
|
问题跟踪图片压缩不清晰
|
10 years ago |
|
sw
|
7e833a4727
|
缺陷图片显示小
|
10 years ago |
|
guange
|
3299f7e726
|
正式库issue界面图片显示路径错误
|
10 years ago |
|
huang
|
de23c3c2a8
|
配置中子页面调整
隔行换色显示
显示页面左对齐
|
10 years ago |
|
huang
|
eeaa613c9e
|
项目类型实时刷新功能
|
10 years ago |
|
huang
|
be5c7ac6dd
|
修改项目类型术语
图标
|
10 years ago |
|
huang
|
7d87915413
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/helpers/application_helper.rb
app/helpers/files_helper.rb
app/views/courses/_course_members.html.erb
app/views/courses/settings.html.erb
app/views/homework_attach/_homework.html.erb
public/javascripts/course.js
public/stylesheets/courses.css
public/stylesheets/public.css
|
10 years ago |
|
lizanle
|
43442d6f62
|
字符截断
|
10 years ago |
|
lizanle
|
8cee159cb7
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
10 years ago |
|
lizanle
|
e4abc86093
|
版本和版本库bug修改
|
10 years ago |
|
sw
|
a8b1ca10b3
|
1、学生作业 --> 作品
2、学生交了作品之后显示修改作品
|
10 years ago |
|
huang
|
54b81bdfb3
|
项目类型图标
|
10 years ago |
|
huang
|
0ea683e1b4
|
修改issue中图片附件的缩略图显示方式
|
10 years ago |
|
sw
|
5649f4c5a1
|
过滤之后现在所有的TAG云
|
10 years ago |
|
sw
|
b7e9442800
|
添加、删除TAG云时TAG云列表刷新
|
10 years ago |
|
huang
|
95c5e6ac83
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/helpers/application_helper.rb
app/helpers/files_helper.rb
app/helpers/members_helper.rb
app/models/journals_for_message.rb
app/models/mailer.rb
app/models/user.rb
app/views/attachments/_form.html.erb
app/views/bids/_new_homework_form.html.erb
app/views/boards/_project_show.html.erb
app/views/courses/_courses_jours.html.erb
app/views/courses/feedback.html.erb
app/views/courses/new_homework.html.erb
app/views/courses/settings.html.erb
app/views/issues/_list.html.erb
app/views/issues/new.html.erb
app/views/messages/_project_show.html.erb
app/views/messages/edit.html.erb
app/views/news/_project_news.html.erb
app/views/projects/invite_members.html.erb
app/views/projects/settings/_modules.html.erb
app/views/projects/show.html.erb
config/configuration.yml
config/locales/zh.yml
db/schema.rb
public/assets/kindeditor/kindeditor.js
public/javascripts/course.js
public/stylesheets/courses.css
public/stylesheets/public.css
|
10 years ago |
|
whimlex
|
7ce8ae0261
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
whimlex
|
9c07976751
|
展开和收起更多信息图片样式修改；跟踪者样式修改
|
10 years ago |
|
huang
|
115d77dd01
|
圈子JS和modulesJS
版本库删除按钮
|
10 years ago |
|
huang
|
fec751608a
|
完成里程碑界面
|
10 years ago |
|
whimlex
|
596e89a14f
|
缺陷更新页面
|
10 years ago |
|
whimlex
|
7fa2338ce6
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
whimlex
|
ba0535e127
|
完成新建缺陷页面
|
10 years ago |
|
huang
|
c607bd5cbf
|
定义缺陷中样式
|
10 years ago |
|
whimlex
|
b3b9688072
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
whimlex
|
cdf1ce1c17
|
缺陷页面
|
10 years ago |
|
huang
|
b8058c3e12
|
用户邀请加入的时候增加拒绝功能
删除提示星系修改
申请加入模块样式调整
|
10 years ago |
|
huang
|
729b28ae43
|
修改项目创始人不能删除自己
|
10 years ago |
|
huang
|
845794675a
|
配置-成员界面休整
|
10 years ago |
|
huang
|
48f096178c
|
修改配置modoule模块
|
10 years ago |
|
huang
|
5d249823df
|
修改配置版本库页面
|
10 years ago |
|
huang
|
e907f5e3e4
|
1.解决缺陷列表图片不显示
2、项目种类页面局部刷新
3、工具栏调整
4.项目新增字段（判断种类）
|
10 years ago |
|
sw
|
6abdc4c7e1
|
课程成员配置界面，显示学生真实姓名，无真实姓名的蔡先生login
|
10 years ago |
|
sw
|
78b60efbbe
|
导航栏根据配置信息确定是否显示非项目连接
|
10 years ago |
|
huang
|
b415575e0e
|
修改新缺陷列表
完成部分项目配置
|
10 years ago |
|
sw
|
c5b55042d4
|
1、修复课程讨论区引用功能
2、回复时回复框自动获得焦点
3、引用样式
4、修改提交回复时下面出现的提示信息
|
10 years ago |
|
huang
|
12eaac5683
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/boards/_project_show.html.erb
public/javascripts/course.js
处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
|
10 years ago |
|
huang
|
df43274565
|
新版项目界面（部分未完成，先合并）
1、项目框架整理
2、各页面样式
|
10 years ago |
|
lizanle
|
ceb6af7365
|
课程相关模块添加编辑器
|
10 years ago |
 z9hang
|
c4e9321e14
|
将attachment_candown方法提取到application_help里面
|
11 years ago |
|
sw
|
b9031095d4
|
Merge branch 'szzh' into sw_new_course
Conflicts:
Gemfile
app/controllers/courses_controller.rb
app/views/attachments/_form.html.erb
app/views/attachments/_form_course.html.erb
app/views/files/_attachement_list.html.erb
app/views/layouts/base.html.erb
app/views/layouts/base_projects.html.erb
config/locales/zh.yml
public/javascripts/attachments.js
|
11 years ago |
|
z9hang
|
8ef9779b46
|
修正课程讨论区样式。修正项目讨论区被影响的样式
|
11 years ago |
|
lizanle
|
0d487efea8
|
添加两个公用的方法。从硬盘上删除对应的资源文件，更新资源文件的owner
|
11 years ago |
|
sw
|
8f5d8c86a3
|
新版样式header调整
|
11 years ago |
|
sw
|
e4c0c840bf
|
1、完成课程模块导航栏样式调整
2、修改意见反馈默认在右下角位置
3、调整我的课程、我的项目js
4、ruby生成的菜单栏添加样式及部分方法重写
5、封装部分页面的ruby代码到helper
|
11 years ago |
|
guange
|
bcb162c600
|
#1968 解决IE8不能上传的问题， 只是解决，体验还是没有chrome,firefox的好
|
11 years ago |
|
sw
|
2ee04d55f2
|
修改项目邀请用户的界面
|
11 years ago |
|
sw
|
4b831c9e65
|
#2001 项目--工具集中wiki-“查看差别”中有html标签
|
11 years ago |
|
huang
|
b2b978d540
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
beac15475d
|
新项目及用户反馈框的修改！！
|
11 years ago |
|
sw
|
5692cbf202
|
#1965 公共贴吧取消软件创客入口
|
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
|
b71d714103
|
#1887 用户职称显示问题
|
11 years ago |
|
sw
|
5950f0404b
|
#1832 不显示无数据的字段，字段名
|
11 years ago |
|
whimlex
|
38157e560e
|
课程--资源库--上传资源：当变化屏幕分辨率时，“上传文件”字样显示异常;添加用户或组没有链接;新建课程中，平台按钮样式调整成统一风格;课程主页，竞赛
|
11 years ago |
 alan
|
5191411508
|
<邮件加密自动登录功能，邮件附件下载功能>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
f7c1b76b3d
|
用户反馈弹框模块！
|
11 years ago |
|
sw
|
cd3f4ef8d3
|
修改标签的显示js
|
11 years ago |
moon
|
e4e4c94d53
|
封掉所有列表入口，及页面中更多入口
|
11 years ago |
|
z9hang
|
9bd1af9541
|
#1480 项目留言区回复时间显示问题
|
11 years ago |
|
sw
|
54aae26cbe
|
被除数为0时弹框报错
|
11 years ago |
|
sw
|
b8c9651079
|
111
|
11 years ago |
|
sw
|
14db93c10a
|
教师作业列表增加当前作业提交信息,匿评信息提示
|
11 years ago |
 gonglexin
|
c52e87c74f
|
统计数据
|
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
|
f3d8aebfe4
|
给排序设置正确的路径
|
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 |
|
z9hang
|
57776d67c5
|
优化代码
|
11 years ago |
|
sw
|
ef78066f3e
|
公共贴吧，回复帖子上传附件时回复信息显示不完整:还有一点点被遮住。。
|
11 years ago |
|
sw
|
0a02fbf10e
|
修复资源搜索，资源列表显示错误 #1262
链接解析方法不对
|
11 years ago |
|
sw
|
0ab7bfcda9
|
限制上传文件名、文件描述长度 #1252
|
11 years ago |
|
sw
|
7c97c0391b
|
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 |
|
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
|
8fc9e65e66
|
wiki编辑控件粘贴进去的截图不能显示问题
|
11 years ago |
|
sw
|
c614734768
|
#1508 修复课程、项目列表中，点击标签的更多按钮，报错的BUG
|
11 years ago |
 zhanghaitao
|
2be1ac0dbd
|
修改日期选择控件当日操作日期不可以选择的Bug
|
11 years ago |
|
linhk
|
4f0817a146
|
项目--文档--文件--代码评审 中用户头像显示错误
|
11 years ago |
|
sw
|
08115c9de4
|
1.修复文本格式化报错的问题
2.修改作业留言清除按钮描述不正确的问题
|
11 years ago |
|
sw
|
f99543ab4b
|
#1294
1.修改缺陷列表中缺陷描述样式
2.修改缺陷、日历查询时，Closed->关闭于，角色成员减少学生、老师、助教等3个角色
|
11 years ago |
|
sw
|
582ccd2ecf
|
添加wiki插件，修改项目讨论区模块回去格式化字符串不正确的BUG
|
11 years ago |
|
zhanghaitao
|
b9ee7fe00d
|
1.#878 缺陷输入计划完成时间小于开始时时间修改
2.修改时间选择的最小默认值
|
11 years ago |
|
z9hang
|
03b212e363
|
首页定制，是否显示课程，竞赛
|
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 |
 yanxd
|
9c3ff51633
|
remove useless navbar method called
|
11 years ago |
|
nwb
|
6bced5106e
|
调整课程列表视图
|
11 years ago |
|
nwb
|
a4d06fbb12
|
课程成员设置为只能使用单一权限
|
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 |
|
z9hang
|
b4dd8409eb
|
添加项目托管平台首页定制功能
|
11 years ago |
|
yanxd
|
2b57e170ef
|
want that image popup in html when user click on thumbnail.
|
11 years ago |
|
nwb
|
31e338f1e5
|
修正http://127.0.0.1:3000/?course.trustie.net链接跳转问题
|
11 years ago |
|
sw
|
ed9b97f987
|
增加访问作业显示列表的权限
|
11 years ago |
|
nwb
|
0736dd1254
|
课程讨论区回复权限和界面BUG修正
|
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
|
2a4486bf0d
|
修改迁移文件
|
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 |
 wanglinchun
|
0255a61d2f
|
dfg
|
11 years ago |
|
nwb
|
4404222437
|
0604
|
11 years ago |
|
nwb
|
7d3d406c00
|
新增部分课程所需的解析函数
|
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 |
xianbo
|
7d1327ad2a
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
nwb
|
f936c30ec9
|
添加与course.index相关的control、view、help等实现
|
11 years ago |
|
z9hang
|
bf12692de4
|
登录名==》账号/邮箱
老师在课程动态中看到学生真名
|
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
|
f44b930037
|
233
|
11 years ago |
|
wanglinchun
|
2f709c92ba
|
重构bid_helper，contest_helper以及application_helper中共同用到的方法
|
11 years ago |
|
yanxd
|
34aa8433de
|
import hubspot
|
11 years ago |
 fanqiang
|
10aa8eee81
|
显示帖子的发布者和时间
|
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 |
|
nwb
|
4156983494
|
缺陷添加缩略图显示
|
11 years ago |
|
nwb
|
6f0e621f3c
|
添加项目成员界面，显示用户的account
|
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 |
|
fanqiang
|
07b75924d8
|
修改tag搜索，使得tag搜索能够搜索开源项目
在帖子展示页面添加时间，并添加标签
|
11 years ago |
yanxd
|
f4595dfcd2
|
修改部分拍段project、course方式
projectlist 报错
|
11 years ago |
Wen
|
473a44d11a
|
学校-课程模式！
|
11 years ago |
|
wanglinchun
|
94a7bacdd2
|
首页：当无应用时，提示暂无应用
|
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 |
|
wanglinchun
|
733497fef8
|
调整竞赛列表页面中部分统计数字的超链接
|
11 years ago |
|
wanglinchun
|
64895a75ed
|
显示上传截图+应用显示
|
11 years ago |
|
wanglinchun
|
b97cdd6b0d
|
修改参赛应用中应用和竞赛的关联前，目前部分代码由于数据表及关联没考虑清楚，导致无法关联，下一步修改代码，重新建表，完成关联功能及应用的正常显示
|
11 years ago |
|
yanxd
|
1b6cdeac05
|
列表上提交作业，大概好了吧
|
11 years ago |
|
yanxd
|
045b55236f
|
作业提交临时解决方案
|
11 years ago |
|
yanxd
|
7e130ee89e
|
去掉login_flag
|
12 years ago |
|
wanglinchun
|
120e84cfc7
|
新竞赛代码移植
|
12 years ago |
|
yanxd
|
a1a58ee26c
|
加注释
|
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
|
8c251da25d
|
Bug：新建作业时菜单栏第一个显示蓝色，应该是第二个显示蓝色
|
12 years ago |
|
xianbo
|
6e065361b3
|
fix main page navigation
|
12 years ago |
|
xianbo
|
34fd8a933a
|
fix the show of domain and project page
|
12 years ago |
|
xianbo
|
20cd5941a8
|
modify project main page
|
12 years ago |
|
yanxd
|
c905ded3b5
|
擦屁股
|
12 years ago |
