 lizanle
|
3c17492901
|
列宽
|
10 years ago |
 sw
|
7239f6a641
|
1、成员列表分页空间翻页不可用
2、当五输入时显示，无用户显示
|
10 years ago |
|
lizanle
|
17f9ed52ce
|
Wiki列宽度
|
10 years ago |
|
lizanle
|
b6db00643e
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
10 years ago |
|
lizanle
|
532a8cb5c3
|
返回的时候展开输入框
|
10 years ago |
 huang
|
14a0d885f0
|
settings
|
10 years ago |
|
lizanle
|
f8951c0044
|
国际化
|
10 years ago |
|
lizanle
|
5e8848f962
|
国际化
|
10 years ago |
|
huang
|
917701f09d
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
c2c9660a46
|
项目得分界面调整
|
10 years ago |
|
lizanle
|
8290741746
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
10 years ago |
|
lizanle
|
d2b0eae119
|
格式修改
|
10 years ago |
|
huang
|
1ffa447767
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
640f6a1ca7
|
邮件发送框距离
去掉讨论区不必要的*
|
10 years ago |
|
lizanle
|
8cee159cb7
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
10 years ago |
|
lizanle
|
e4abc86093
|
版本和版本库bug修改
|
10 years ago |
|
huang
|
d1e7777040
|
关注列表样式
|
10 years ago |
|
huang
|
440eb8dc7f
|
1、修改项目成员一排显示
2、项目动态显示强制换行
3、讨论区提示用语
|
10 years ago |
|
huang
|
611952eb05
|
新建项目时候设定默认项目类型
新建项目样式异常调整
|
10 years ago |
|
huang
|
bfc83d1a8c
|
解决项目图片不能上传
|
10 years ago |
|
huang
|
9fa7b04ce5
|
组织不需要必填
|
10 years ago |
|
lizanle
|
17f495e77b
|
项目 版本 和 版本库 标签改动
|
10 years ago |
|
lizanle
|
a4d6eaa46c
|
跳转回来自动选择tab页
|
10 years ago |
|
lizanle
|
38672458b0
|
新建版本 更改页面
|
10 years ago |
|
lizanle
|
86b05b8e6a
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
10 years ago |
|
lizanle
|
fe94efeb39
|
新建版本更改页面
|
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 |
|
huang
|
115d77dd01
|
圈子JS和modulesJS
版本库删除按钮
|
10 years ago |
|
huang
|
4d0a9bd35c
|
部分描述增加强制换行
|
10 years ago |
|
huang
|
b7537ad518
|
修改新闻中测出的bug，
讨论区中附件显示形式
|
10 years ago |
|
huang
|
b8058c3e12
|
用户邀请加入的时候增加拒绝功能
删除提示星系修改
申请加入模块样式调整
|
10 years ago |
|
sw
|
e4b2092c7f
|
实现项目成员列表增加成员，以及用户/角色留空时的提示信息
|
10 years ago |
|
huang
|
729b28ae43
|
修改项目创始人不能删除自己
|
10 years ago |
|
huang
|
5ae5cfda03
|
项目配置添加申请加入
删除成员局部刷新
编辑成员局部刷新
项目动态国际化错误
|
10 years ago |
|
huang
|
b98a67f50d
|
完成项目配置-成员模块
|
10 years ago |
|
huang
|
b3c3693d72
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
845794675a
|
配置-成员界面休整
|
10 years ago |
|
sw
|
aee81e8e44
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
app/views/layouts/base_projects.html.erb
|
10 years ago |
|
sw
|
fadca9128f
|
完成项目朋友圈、开发组、科研组直接的切换功能
|
10 years ago |
|
huang
|
6b8022cb23
|
清除不需要的子模块
|
10 years ago |
|
huang
|
f3ba393bd4
|
去掉代码审查
修改配置-“版本库”样式
|
10 years ago |
|
huang
|
48f096178c
|
修改配置modoule模块
|
10 years ago |
|
huang
|
2b063db0cc
|
修改版本界面
未完成部分，隔行换色
|
10 years ago |
|
huang
|
6ce998bb54
|
去掉新版本库中冗余代码
|
10 years ago |
|
huang
|
5d249823df
|
修改配置版本库页面
|
10 years ago |
|
sw
|
01f56a761f
|
完成配置---模块
|
10 years ago |
|
sw
|
fb935f124c
|
完成修改项目界面
|
10 years ago |
|
sw
|
7ad3c2d578
|
修改项目配置js
增加项目配置相关子界面
|
10 years ago |
|
huang
|
e3d815b51d
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
0c90f2361d
|
项目用户反馈页面调整
|
10 years ago |
|
sw
|
db0cc88142
|
静态页面添加
|
10 years ago |
whimlex
|
5936d8d8e9
|
评论显示
|
10 years ago |
|
whimlex
|
69153d2d95
|
项目界面缺失翻译调整
|
10 years ago |
|
whimlex
|
1fae44b201
|
用户主页国际化修改
|
10 years ago |
|
whimlex
|
2a35e771c2
|
项目界面国际化及样式调整；标签模块国际化及样式调整
|
10 years ago |
|
whimlex
|
bcf83328f2
|
项目界面国际化
|
10 years ago |
|
huang
|
f2cf46f0a0
|
修改缺陷列表显示bug
|
10 years ago |
|
huang
|
e907f5e3e4
|
1.解决缺陷列表图片不显示
2、项目种类页面局部刷新
3、工具栏调整
4.项目新增字段（判断种类）
|
10 years ago |
|
huang
|
c8f9add566
|
修改项目成员邀请界面（添加按钮点击搜索）
|
10 years ago |
|
huang
|
4d4e1cac8b
|
完成新的邮件邀请界面
|
10 years ago |
|
huang
|
b415575e0e
|
修改新缺陷列表
完成部分项目配置
|
10 years ago |
|
huang
|
be07c2c961
|
添加项目关注列表
|
10 years ago |
|
huang
|
d832514a55
|
新增项目成员列表
|
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 |
|
sw
|
cee08d9c58
|
修改加入课程弹出框样式
|
10 years ago |
|
whimlex
|
82fb9325c5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/_point_browser.html.erb
|
10 years ago |
|
whimlex
|
4de0255ce6
|
邀请邮件国际化；js冲突
|
10 years ago |
|
whimlex
|
05d17361e9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/projects/invite_members_by_mail.html.erb
|
10 years ago |
|
whimlex
|
1452e09154
|
邮件邀请邮箱格式自动填充；部分国际化
|
10 years ago |
|
huang
|
75ae68ffc8
|
项目邀请用户邮箱为空的提示语！
|
10 years ago |
|
huang
|
1e1ee9a248
|
修改邮箱匹配错误后提示语
|
10 years ago |
|
huang
|
9e297609fd
|
项目邮件邀请：正则匹配触发事件改成失去鼠标焦点
（否则输入一个字母也会触发，给人感觉邮箱已经错误）
|
10 years ago |
|
huang
|
72d41fd07a
|
修改邮件邀请提示信息！
|
10 years ago |
|
whimlex
|
b400c9bb11
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
10 years ago |
|
whimlex
|
b95852dfcd
|
附件上传国际化：修改页面一些bug：用户主页个人得分身份信息修改
|
10 years ago |
|
huang
|
371f25b61f
|
修改邀请页面分页异常（冲突引起）
|
10 years ago |
|
whimlex
|
cfaf788e37
|
新版项目成员，关注者，资源库国际化；修改国际化缺失的bug
|
10 years ago |
|
sw
|
e4895731ae
|
Merge branch 'develop' into szzh
|
10 years ago |
|
whimlex
|
aee987d634
|
邀请Trustie用户
|
10 years ago |
|
sw
|
aa8d1741f9
|
修改项目发送邮箱时的正则验证
|
10 years ago |
|
sw
|
368a3ce1fa
|
修改项目创建时间显示不正确
|
10 years ago |
|
whimlex
|
cef923b8a8
|
邮件邀请用户国际化
|
10 years ago |
|
whimlex
|
28321deeb5
|
邮件邀请用户
|
10 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
|
10 years ago |
|
whimlex
|
1e5fac32b4
|
添加邮箱验证
|
10 years ago |
|
sw
|
362bad594f
|
修改项目发送邮件邀请页面样式，以及提示
|
10 years ago |
|
whimlex
|
3a1f0aec55
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
5f88ffc5d0
|
项目邀请用户国际化，js判断邮件格式
|
10 years ago |
|
sw
|
d18e9ff66b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
312d7660b2
|
增加邀请成功后的提示
邀请成功后跳转页面修改
调整翻页控件的样式
|
10 years ago |
|
sw
|
2ee04d55f2
|
修改项目邀请用户的界面
|
10 years ago |
|
huang
|
0ba7ef0560
|
修改邮箱邀请时，邮件为空时提示错误
|
10 years ago |
|
whimlex
|
6f4ef81eb9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
65ee3fdc74
|
项目主页国际化，项目主页JS冲突解决
|
10 years ago |
|
huang
|
64bbbff879
|
添加里程碑
|
10 years ago |
|
lizanle
|
8f3f9ea2ed
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
a8a62ab750
|
issue2012,分页显示方式修改
|
10 years ago |
|
sw
|
27e72c1f39
|
#2000 增加项目每个模块的访问控制
|
10 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
|
10 years ago |
|
lizanle
|
383d90bb12
|
issue2626，建议什么时候创建工程的信息也要加进来。
|
10 years ago |
|
sw
|
4034e3565a
|
修改新建项目html代码不争取
修改新建项目提示信息有两个
|
10 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
|
10 years ago |
|
whimlex
|
115eb38a02
|
完善用户资料模块，用户主页课程栏、留言栏、项目栏和标签模块国际化；对一些存储在数据表中的固定的中文属性，比如学期，职称，在helper和model中定义方法封装；平台导航模块，包括各模块内部导航的国际化；课程平台模块国际化整理和修改，去除重复功能标签
|
10 years ago |
|
huang
|
0402fee6de
|
修改邮件邀请
|
10 years ago |
|
lizanle
|
bd9a645c2c
|
project动态分页页码数显示个数减少
|
10 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
|
10 years ago |
|
alan
|
48ac3dbea8
|
修改《测试版--注册时返回500错误》以及项目邀请时邮箱验证功能
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
huang
|
ba09213023
|
添加新闻模块、部分样式
|
10 years ago |
|
huang
|
eb6deed682
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
749e10592d
|
修改邮件页面样式
|
10 years ago |
|
lizanle
|
e8bdc13f24
|
缺陷1975，打开project 330的时候报错
|
10 years ago |
|
alan
|
5ff43fdea7
|
项目添加新用户邮件发送功能
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
huang
|
ce792f6ce8
|
修改邮件发送界面
|
10 years ago |
|
huang
|
b3cbfd39ca
|
修改一些缺陷，删掉多余的文件
|
10 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
|
10 years ago |
|
huang
|
beac15475d
|
新项目及用户反馈框的修改！！
|
10 years ago |
|
sw
|
1f2b5eedb8
|
Merge branch 'dev_zanle' into szzh
Conflicts:
app/views/projects/show.html.erb
db/schema.rb
|
10 years ago |
|
sw
|
dead08a0d6
|
添加、修改项目增加所属组织的选择
|
10 years ago |
|
sw
|
7f249d29f4
|
修整页面代码
|
10 years ago |
|
lizanle
|
7ee58d1d44
|
项目动态重写，并去掉首页缓存
|
10 years ago |
|
whimlex
|
59a2c8283a
|
国际化结构调整
|
10 years ago |
|
alan
|
3484fd34bb
|
merge dev_zanle branch
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
7710af316d
|
Merge remote-tracking branch 'remotes/origin/dev_zanle' into szzh
|
10 years ago |
|
lizanle
|
a47cb8eb65
|
去掉原有的样式分页样式
|
10 years ago |
|
sw
|
0d6261dfa7
|
Merge branch 'dev_zanle' into szzh
Conflicts:
app/controllers/projects_controller.rb
app/helpers/projects_helper.rb
|
10 years ago |
|
huang
|
d91c0442d1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 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
|
10 years ago |
|
sw
|
36c07f9664
|
修改拒绝项目成员加入后，页面不会刷新的BUG
|
10 years ago |
|
huang
|
d0a675f2b8
|
企业版模块
|
10 years ago |
|
lizanle
|
22dd4981c0
|
修改分页函数
|
10 years ago |
|
sw
|
a265556cfe
|
搜索项目时增加js验证增加
|
10 years ago |
|
sw
|
87f19f7a8b
|
#1873 加入”==》“申请加入”
|
10 years ago |
|
sw
|
02f01c1aba
|
修改首页加入项目
|
11 years ago |
|
sw
|
90a81ee1f1
|
增加网站项目首页加入项目的功能
|
11 years ago |
|
alan
|
4b9bad0dc5
|
修改《若有某公开课程courseA，在课程主页中搜索courseA跳转到搜索结果界面，相关链接没有对齐》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
815d2ceb3d
|
添加《添加相同组时应该给出相关提示信息》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
7c1b86556d
|
增加《作业评分弹窗》《学生列表增加作业评分》两项功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
74f9bc6404
|
修改右键项目分数页面报500的BUG
|
11 years ago |
 z9hang
|
e6aa9d3592
|
修复用户、课程、项目、竞赛、留言模块样式，去除回复时的回复某某字样，及字数控制
|
11 years ago |
|
sw
|
9d971069b5
|
Merge branch 'Homework' into szzh
|
11 years ago |
|
z9hang
|
9bd1af9541
|
#1480 项目留言区回复时间显示问题
|
11 years ago |
|
sw
|
460ba55dde
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/models/user.rb
app/views/courses/_course_form.html.erb
db/schema.rb
|
11 years ago |
|
z9hang
|
b141db6624
|
用户留言修复
|
11 years ago |
|
z9hang
|
7d4d3f590c
|
项目、课程、竞赛留言模块分页控件修复
|
11 years ago |
|
z9hang
|
07c21e97d6
|
修复竞赛、课程、项目留言模块样式
|
11 years ago |
|
alan
|
7487c538f3
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
7d3a18197b
|
修改bug<注册时用户可以不填真实姓名，将其设置为可选>和《测试版：项目--点击作品下载报500错误》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
21c6f01d5f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
8cbc4eb938
|
#1318 课程/项目，点击打开该标签，不显示对应的课程/项目名称,原实现逻辑与现存的数据有冲突，扩展了其实现方式，使之兼容现有的数据
|
11 years ago |
