 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
|
2015-04-16 10:26:03 +08:00 |
|
huang
|
c11fdc7273
|
版本库调整：未完成
|
2015-04-16 05:01:09 +08:00 |
 alanlong9278
|
b704555628
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
.gitignore
Gemfile
app/controllers/discuss_demos_controller.rb
app/models/user.rb
app/views/bids/_bid_homework_show.html.erb
app/views/issues/index.html.erb
app/views/layouts/_base_feedback.html.erb
app/views/poll/publish_poll.js.erb
app/views/poll/republish_poll.js.erb
public/javascripts/application.js
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-04-15 12:36:19 +08:00 |
|
alanlong9278
|
a51ba0c104
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-04-15 12:30:37 +08:00 |
whimlex
|
69153d2d95
|
项目界面缺失翻译调整
|
2015-04-10 16:59:45 +08:00 |
|
whimlex
|
2a35e771c2
|
项目界面国际化及样式调整；标签模块国际化及样式调整
|
2015-04-10 12:48:02 +08:00 |
|
huang
|
95a1c1fe62
|
版本库显示页面调整，分页样式调整
|
2015-04-09 11:40:18 +08:00 |
|
huang
|
65bf98016a
|
新建git添加导航条
|
2015-03-21 10:15:35 +08:00 |
|
huang
|
beac15475d
|
新项目及用户反馈框的修改！！
|
2015-03-06 14:55:21 +08:00 |
 sw
|
63bc66adc3
|
修复关联版本库会默认登录帐号密码的BUG
|
2014-12-24 11:12:12 +08:00 |
|
sw
|
9d91e85fe4
|
#863 增加已有远程地址，创建一个远程分支，并切换到该分支的示例
|
2014-10-28 14:19:13 +08:00 |
|
sw
|
5aa68ba9b4
|
#1175修改代码评审中的中文问题
|
2014-10-27 10:17:40 +08:00 |
|
alan
|
e044f5b615
|
修改contest中出现的逻辑错误
Signed-off-by: alan <547533434@qq.com>
|
2014-10-23 11:30:34 +08:00 |
|
sw
|
65b80959a6
|
格式化代码
|
2014-10-20 14:23:10 +08:00 |
|
sw
|
7a685c531d
|
#1039暂时隐藏该按钮
|
2014-10-15 14:57:41 +08:00 |
|
alan
|
8c19ec8aa0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/helpers/projects_helper.rb
app/views/contest_notification/show.html.erb
Signed-off-by: alan <547533434@qq.com>
|
2014-09-15 10:58:14 +08:00 |
 z9hang
|
4c58b6a50c
|
1、项目版本库中查看修订导航栏丢失，原因未指定layout，解决：指定laout。2、项目版本库操作中有两页面存在英文的ok按钮，将其通过国际化改为中文
|
2014-09-02 11:02:16 +08:00 |
 zhanghaitao
|
eac85b338f
|
标示错误修改
|
2014-08-07 17:56:29 +08:00 |
linhk
|
b545c5034d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/en.yml
|
2014-08-07 12:02:55 +08:00 |
|
zhanghaitao
|
68a86c5e5d
|
#873 #829问题修改
|
2014-08-07 11:20:24 +08:00 |
|
linhk
|
65174ad8ef
|
项目--wiki--重定向/重命名：“重”字被掩盖
|
2014-08-05 09:19:05 +08:00 |
 linhk
|
25cfb7aa71
|
解决谷歌浏览器新建版本库文本框会默认填写缓存内容的问题
|
2014-08-02 14:43:05 +08:00 |
|
sw
|
d5ac443f90
|
修复竞赛列表搜索结果不正确的BUG
|
2014-07-31 17:02:30 +08:00 |
xianbo
|
9cdd101cc7
|
fix
|
2014-05-15 17:10:02 +08:00 |
|
xianbo
|
a22e082cb5
|
fix repository info
|
2014-05-14 10:07:01 +08:00 |
|
xianbo
|
7ae55c1ec8
|
fix
|
2014-04-14 15:51:43 +08:00 |
|
xianbo
|
762386b56d
|
修改版本库的提示
|
2014-04-14 15:32:04 +08:00 |
xianbo
|
07e9615ac3
|
fix
|
2013-12-11 10:31:49 +08:00 |
|
xianbo
|
caeee11eab
|
add explain to git
|
2013-12-11 07:56:42 +08:00 |
|
xianbo
|
0f93065ac4
|
imitate github show help doucument
|
2013-12-10 20:18:21 +08:00 |
yanxd
|
356a48caa8
|
move constant to module, fixed some translate.
|
2013-11-18 08:48:38 +08:00 |
|
yanxd
|
3ec4e14bfd
|
fix sources bugs from zhangyang tmp code
|
2013-09-30 15:31:46 +08:00 |
 huangjingquan
|
261c3fc337
|
new version
|
2013-09-12 10:41:15 +08:00 |
zhangyang
|
4d82cad51d
|
move 2013.8.29
|
2013-08-30 09:34:21 +08:00 |
|
xianbo
|
89150e8930
|
modify some little bug
|
2013-08-24 16:32:05 +08:00 |
Administrator
|
1b43ce386c
|
modify
|
2013-08-22 22:30:24 +08:00 |
 kaizheng
|
7c634dc5f3
|
稍该国际化
|
2013-08-17 10:45:14 +08:00 |
 baiyu
|
e7716912b5
|
增加了git使用说明文档
在主页增加了用户对系统的反馈
|
2013-08-16 22:53:28 +08:00 |
|
Administrator
|
8dd2d4a39a
|
修正版本库
|
2013-08-16 22:43:44 +08:00 |
|
Administrator
|
90885a4eb5
|
修改版本库
|
2013-08-15 10:52:11 +08:00 |
|
kaizheng
|
128150dd92
|
稍该国际化
|
2013-08-14 22:05:57 +08:00 |
|
huangjingquan
|
3285f1afd2
|
添加项目主页文件数，版本库描述强制换行！
|
2013-08-14 22:03:36 +08:00 |
|
Administrator
|
9b8c0f81b2
|
修复版本库
|
2013-08-14 20:56:20 +08:00 |
|
kaizheng
|
4557ee71e4
|
稍该国际化
|
2013-08-13 16:37:08 +08:00 |
 nieguanghui
|
1dd86b9116
|
修正了UTF-8问题；修正了上传头像显示问题
|
2013-08-13 15:58:21 +08:00 |
|
fanqiang
|
75aca1bad4
|
123
|
2013-08-12 23:43:26 +08:00 |
|
Administrator
|
57991b727a
|
修改了版本库
|
2013-08-12 16:22:38 +08:00 |
|
zhangyang
|
a7871c63b2
|
修改了项目里各form的显示样式
|
2013-08-03 22:18:30 +08:00 |
|
huangjingquan
|
70b211e355
|
first commit
|
2013-08-01 10:33:49 +08:00 |