 huang
|
b19f61edcb
|
私有项目非项目成员不能通过url访问关注列表
|
11 years ago |
|
huang
|
76b4ae24da
|
修改邮件邀请--邮件名
修改成用户点击同意按钮后才能加入项目
|
11 years ago |
|
huang
|
119e540373
|
邮件邀请系统已注册的用户
|
11 years ago |
|
huang
|
73798a0da4
|
修改邮件两次点击500错误
增加功能：在点击提交时代码后自动创建用户
用户自动登录功能
|
11 years ago |
|
huang
|
681546b860
|
缺陷上传附件显示
项目邮件邀（未完成，需切换分支）
|
11 years ago |
 lizanle
|
3620cd99b6
|
去掉错误的符号
|
11 years ago |
|
huang
|
611952eb05
|
新建项目时候设定默认项目类型
新建项目样式异常调整
|
11 years ago |
|
lizanle
|
9621c35e8b
|
项目 版本 和 版本库 标签改动
|
11 years ago |
|
lizanle
|
17f495e77b
|
项目 版本 和 版本库 标签改动
|
11 years ago |
|
huang
|
115d77dd01
|
圈子JS和modulesJS
版本库删除按钮
|
11 years ago |
 sw
|
fadca9128f
|
完成项目朋友圈、开发组、科研组直接的切换功能
|
11 years ago |
|
sw
|
fb935f124c
|
完成修改项目界面
|
11 years ago |
|
huang
|
d832514a55
|
新增项目成员列表
|
11 years ago |
guange
|
02e83ea776
|
将邮件发送放到后台进程中
|
11 years ago |
whimlex
|
4de0255ce6
|
邀请邮件国际化；js冲突
|
11 years ago |
 dingxu
|
7b3af413cd
|
邮件邀请加入项目:如果邮箱已被注册或为空时给出提示
|
11 years ago |
|
whimlex
|
28321deeb5
|
邮件邀请用户
|
11 years ago |
|
huang
|
96b2627fda
|
修改邮件居中样式及提示
|
11 years ago |
|
huang
|
0ba7ef0560
|
修改邮箱邀请时，邮件为空时提示错误
|
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 |
 alan
|
48ac3dbea8
|
修改《测试版--注册时返回500错误》以及项目邀请时邮箱验证功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
6cf7e156d1
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
5ff43fdea7
|
项目添加新用户邮件发送功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
ce792f6ce8
|
修改邮件发送界面
|
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
|
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 |
|
alan
|
aa8f58530c
|
给黄总提供接口
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
6f9e2bad63
|
mail weekly
|
11 years ago |
|
sw
|
320ee9289a
|
#1897 修改点击DTS测试之后，TAB页背景色变化
|
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 |
|
lizanle
|
90649209ca
|
封装，简化，重新编排代码格式，并删掉了一些无用的方法代码
|
11 years ago |
|
sw
|
c56f641163
|
修改首页加入项目按钮没反应
|
11 years ago |
|
lizanle
|
4796524a97
|
去掉项目动态查询中过大的时间跨度
|
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 |
|
sw
|
74f9bc6404
|
修改右键项目分数页面报500的BUG
|
11 years ago |
moon
|
e4e4c94d53
|
封掉所有列表入口，及页面中更多入口
|
11 years ago |
 z9hang
|
7d4d3f590c
|
项目、课程、竞赛留言模块分页控件修复
|
11 years ago |
|
sw
|
602982a124
|
龚乐鑫修改意见4：redirect_to后使用 url
|
11 years ago |
|
sw
|
27ad49282c
|
控制层增加退出项目的限制
|
11 years ago |
|
z9hang
|
943f428aad
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
bce403f624
|
#1242 点击项目得分在弹出的框中点击各项目得分明细反应慢。原因需要向服务器请求数据。解决：使用js在客户端处理各链接，不在向服务器发送请求
|
11 years ago |
linhk
|
56c31d6e2f
|
解决版本库网页标题Bug
|
11 years ago |
|
z9hang
|
6180943f72
|
空数据库时创建项目报错问题，原redmine的项目按字母排序功能导致，现在项目没有按字母排序，故将之注释掉
|
11 years ago |
|
z9hang
|
a97511750c
|
删除项目页面导航栏丢失：原因layout指定错误，解决方法：修正
|
11 years ago |
 nwb
|
bdeb2e5947
|
启用项目的wiki编辑动态
|
11 years ago |
|
z9hang
|
e63be10680
|
去除显示项目列表的存储过程调用(刷新项目提交次数已移至changeset对象创建之后)
|
11 years ago |
|
z9hang
|
74ba4384b1
|
1、去除不用了的旧的积分代码。2、将刷新提交次数功能修改（原来是在显示项目或个人信息的页面之前调用repository.fetch_changesets刷新changeset，修改为创建changeset对象后马上调用repository.fetch_changesets方法刷新changeset对象，注意：尚需测试）
|
11 years ago |
|
linhk
|
aa4b8c2da9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
linhk
|
b30bfd073c
|
1
|
11 years ago |
|
z9hang
|
644cfe6c21
|
项目成员列表按得分排序
|
11 years ago |
|
z9hang
|
9ae553bace
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
linhk
|
66dfa1ce4f
|
解决删除项目主留言分页Url错误和页数错误的Bug
|
11 years ago |
|
linhk
|
4c57136a1d
|
项目留言删除功能
|
11 years ago |
|
z9hang
|
1e234a9adf
|
优化积分计算速度问题
|
11 years ago |
|
sw
|
46ba7f6a7b
|
Merge branch 'szzh' into develop
|
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 |
|
sw
|
ea0b7ef3f1
|
Merge branch 'szzh' into develop
|
11 years ago |
|
linhk
|
0028c11426
|
退出项目功能
|
11 years ago |
|
sw
|
08821b9391
|
Merge branch 'szzh' into develop
|
11 years ago |
|
z9hang
|
05186c8590
|
项目积分存数据库
有项目积分引起的系列bug
|
11 years ago |
|
z9hang
|
7907edf168
|
更新项目得分规则
调整项目列表显示样式
|
11 years ago |
|
sw
|
d66dc65cca
|
Merge branch 'szzh' into develop
|
11 years ago |
|
z9hang
|
8a9e2b47ad
|
调用存储过程刷新项目提交次数
|
11 years ago |
|
sw
|
2141fcc3ca
|
将是否启用DTS测试移入项目模块配置
|
11 years ago |
 yanxd
|
979d6dd067
|
dts_test. controller ===> model
|
11 years ago |
|
nwb
|
1257e67380
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
z9hang
|
673ffb1819
|
提交次数刷新问题
|
11 years ago |
|
nwb
|
b7c4f87a8f
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
Conflicts:
app/views/welcome/index.html.erb
|
11 years ago |
|
sw
|
b142953a4b
|
1.创建项目增加功能：是否启动DTS测试，默认为不启用。根据用户选择，决定左侧DTS测试工具选项是否在该项目内显示
|
11 years ago |
|
sw
|
ef95835bc6
|
修复当前用户为超级管理员时，创建项目后，在个人信息的参与项目栏内无该项目的记录
|
11 years ago |
|
nwb
|
0031f90c64
|
1.课程动态中的私有的资源、文档进行权限判断
2.项目动态中的私有的资源、文档进行权限判断
|
11 years ago |
|
nwb
|
1d4dad22ad
|
Merge commit '6d698cb5d8fa00faf3cb59a1c657c419bd2da6d5' into develop
Conflicts:
ReadMe.txt
app/views/layouts/_base_footer.html.erb
|
11 years ago |
|
nwb
|
bdaf59513b
|
Merge commit '6688ba61dd67ce7bea195d6f5a7a4458b86956d7' into develop
Conflicts:
app/views/layouts/_base_footer.html.erb
|
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
|
b87abf1f68
|
权限管理优化
|
11 years ago |
|
nwb
|
dd396a6da2
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
z9hang
|
c709545809
|
提交后点击版本库才刷新项目积分问题（尚需测试）
|
11 years ago |
 linchun
|
79f68c2231
|
Merge branch 'szzh' into develop
|
12 years ago |
|
z9hang
|
74603e1256
|
解决直接访问ajax链接地址报错问题
|
12 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
|
12 years ago |
|
linchun
|
c1e780a0f8
|
yan
|
12 years ago |
|
nwb
|
e367c03f6e
|
修正课程作业列表显示BUG
|
12 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
|
12 years ago |
|
nwb
|
9c3605320e
|
加入、退出课程逻辑优化
|
12 years ago |
|
z9hang
|
4478c86cea
|
添加课程 查看真名、查看成员、作业导出权限代码（未应用）
|
12 years ago |
|
z9hang
|
d83899e3e4
|
添加新建任务、编辑任务、删除任务、新建占位、编辑占位、删除占位、查看任务、查看占位、查看留言权限代码（未应用）
|
12 years ago |
|
z9hang
|
2e36949604
|
添加课程列表查看权限（需用管理员账户将Non member的查看课程列表权限勾选并保存方能查看）
|
12 years ago |
|
z9hang
|
bf12692de4
|
登录名==》账号/邮箱
老师在课程动态中看到学生真名
|
12 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
|
12 years ago |
|
nwb
|
9c75b701f4
|
修改BUG
|
12 years ago |
|
nwb
|
dd4ef11b3d
|
添加项目管理员审核已申请用户界面及逻辑
|
12 years ago |
|
nwb
|
5a5db45af2
|
添加文本文件的预览功能
|
12 years ago |
|
wanglinchun
|
9fb9d2dbdf
|
初步增加了新建参赛作品中参赛作品所属的托管项目列表
|
12 years ago |
