 wanglinchun
|
a40db3dc4b
|
首页添加了竞赛所获奖项显示
|
2014-06-10 17:17:31 +08:00 |
 yanxd
|
73f5bab075
|
document css/
wiki h2 bug
|
2014-06-10 15:59:57 +08:00 |
|
wanglinchun
|
9d783a7caa
|
修改竞赛通知等tab-menu的显示状态
|
2014-06-03 21:52:16 +08:00 |
 z9hang
|
2e9251530c
|
修改缺陷状态留言处引用的链接被遮住问题
|
2014-05-30 16:27:05 +08:00 |
|
yanxd
|
b33ee17343
|
Merge remote-tracking branch 'remotes/origin/develop' into szzh
Conflicts:
Gemfile
app/controllers/users_controller.rb
db/schema.rb
|
2014-05-30 10:57:13 +08:00 |
ganyiang
|
b4c299bff8
|
修复osp中“热帖”下显示“没有帮助”的问题
|
2014-05-30 09:35:06 +08:00 |
|
ganyiang
|
e901e8046d
|
修改osp中allbug的显示界面
|
2014-05-29 22:25:53 +08:00 |
|
ganyiang
|
c8ca5277a6
|
新增osp项目“聚焦”标签 （演示用）
|
2014-05-29 21:43:50 +08:00 |
|
ganyiang
|
6ca1d7f7ab
|
修改osp的css文件，解决标题过长的显示问题
|
2014-05-29 20:04:09 +08:00 |
|
yanxd
|
006e4ae45e
|
user tab bar
|
2014-05-29 18:34:51 +08:00 |
|
yanxd
|
654cb404e2
|
bootstrap test
|
2014-05-26 11:27:10 +08:00 |
|
yanxd
|
12b1553a33
|
Merge branch 'develop' into szzh
|
2014-05-26 09:05:36 +08:00 |
|
yanxd
|
2273a6fd0b
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-05-26 08:56:58 +08:00 |
|
yanxd
|
d77d7e14c7
|
home page memo css no wrap
|
2014-05-26 08:56:16 +08:00 |
|
yanxd
|
7a4e5afba0
|
test
|
2014-05-24 12:12:38 +08:00 |
t430
|
fd0a504d84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2014-05-23 17:12:10 +08:00 |
|
yanxd
|
5364687160
|
bootstrap & tag bug
|
2014-05-23 17:07:58 +08:00 |
|
xianbo
|
cda9942723
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-23 09:44:33 +08:00 |
|
yanxd
|
2681c3ce88
|
...
|
2014-05-22 16:12:42 +08:00 |
|
ganyiang
|
c70352011d
|
修复buglist.css对整体界面的影响
|
2014-05-22 15:46:22 +08:00 |
|
yanxd
|
34aa8433de
|
import hubspot
|
2014-05-22 11:00:13 +08:00 |
|
yanxd
|
3517dbb88b
|
Merge branch 'szzh' into develop
Conflicts:
db/schema.rb
|
2014-05-22 09:58:19 +08:00 |
|
yanxd
|
9edb8a49de
|
fontsize fix
|
2014-05-21 18:38:46 +08:00 |
|
yanxd
|
c5a3a5bac3
|
user_courses.html
|
2014-05-21 18:21:57 +08:00 |
|
xianbo
|
4b063a2c69
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
2014-05-21 11:09:22 +08:00 |
|
yanxd
|
0ab17f1e90
|
contest image show
|
2014-05-21 09:46:40 +08:00 |
|
xianbo
|
e3fe69c445
|
Merge branch 'test' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/open_source_projects/_show_topics.html.erb
|
2014-05-21 08:25:20 +08:00 |
|
yanxd
|
a76620a741
|
welcome footer
判断成员列表的查看
|
2014-05-19 16:12:18 +08:00 |
|
z9hang
|
19d1682077
|
修改编辑作业提交文件处样式
|
2014-05-19 15:23:34 +08:00 |
|
z9hang
|
ea095a6f61
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-17 15:17:09 +08:00 |
|
z9hang
|
fc1d5baf95
|
课程、竞赛、项目的主页的上下间距缩小
logo和大学名称的居中对齐，以及搜索条的上下居中。
|
2014-05-17 15:15:33 +08:00 |
 nwb
|
7df6be8ff4
|
调整资源文件界面
|
2014-05-17 14:07:57 +08:00 |
|
nwb
|
8f153520b4
|
调整上传资源界面
|
2014-05-16 16:29:01 +08:00 |
|
yanxd
|
4db228f88e
|
调整tag高度为啥要修改两个地方我自己也忘了，改天再说
|
2014-05-15 15:52:25 +08:00 |
|
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
2014-05-15 09:46:38 +08:00 |
|
yanxd
|
14e4bf5bcc
|
typo
|
2014-05-14 17:20:31 +08:00 |
|
yanxd
|
829c77879a
|
typo
|
2014-05-14 17:12:04 +08:00 |
|
ganyiang
|
27ade53af3
|
针对OSP社区的新需求的界面展示：
1.开源项目社区(OSP)index界面增加[软件安全漏洞]展示
2.osp项目主页增加[项目安全态势]、[技术创新趋势] 展示
ps.此次为不负责任的提交~
|
2014-05-14 09:45:11 +08:00 |
|
z9hang
|
6e14e0b262
|
提交作业窗口删除全部图标位置修正
|
2014-05-13 12:01:43 +08:00 |
|
z9hang
|
a80da022cb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-12 09:33:19 +08:00 |
yanxd
|
19ddb38e1b
|
异步验证注册字段合法
|
2014-05-10 09:22:45 +08:00 |
|
z9hang
|
7a341972e7
|
course网站中大学名加上该大学在本站的链接
|
2014-05-09 11:47:41 +08:00 |
|
yanxd
|
2f47cc1cd8
|
Merge branch 'test', remote-tracking branch 'origin/szzh' into develop
|
2014-05-08 18:15:58 +08:00 |
|
z9hang
|
268dc1acce
|
主页讨论吧动态前显示吧名
|
2014-05-08 17:37:38 +08:00 |
|
yanxd
|
cc2f359e8c
|
1. Three expressions syntax
2. 留言显示重复
3. 发送邮件内容
4. show_contest.html typo
5. welcome.css typo
|
2014-05-08 15:27:16 +08:00 |
|
yanxd
|
8770599352
|
css typo
|
2014-05-07 10:58:49 +08:00 |
|
yanxd
|
eb19b0cb1f
|
welcome css改标点错误
|
2014-05-06 17:14:36 +08:00 |
|
yanxd
|
05baffe4f3
|
issue导航，首页贴吧动态html,加入了最后回复
|
2014-05-06 17:04:24 +08:00 |
Wen
|
c893227609
|
个人资料页面学校选择框更改
|
2014-04-30 17:47:20 +08:00 |
|
Wen
|
50745d5d21
|
course首页布局上的小调整
|
2014-04-29 09:49:51 +08:00 |
|
Wen
|
815e7cf3af
|
个人资料修改页面 限制了学校列表的高度并添加了滚动条
|
2014-04-28 16:20:55 +08:00 |
|
Wen
|
02295e5ca9
|
给严总调试用
|
2014-04-25 09:40:05 +08:00 |
|
Wen
|
473a44d11a
|
学校-课程模式！
|
2014-04-23 21:20:03 +08:00 |
|
yanxd
|
b4209b7cc5
|
jrating
|
2014-04-21 15:41:51 +08:00 |
|
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
|
2014-04-18 16:03:52 +08:00 |
 kg
|
d450da9df8
|
footer , footer of base_course,upload files count and delete all upload
|
2014-04-17 08:33:44 +08:00 |
|
wanglinchun
|
6421f02ac8
|
调整了参赛应用列表布局显示样式
|
2014-04-16 08:46:04 +08:00 |
|
Wen
|
44560a679f
|
工作单位更改为下拉框选择
级联问题解决中 0.0
|
2014-04-15 09:36:29 +08:00 |
|
wanglinchun
|
b4b61a3422
|
修改小bug；设计打分和评论唯一性前提交版
|
2014-04-14 21:54:54 +08:00 |
|
yanxd
|
a5743cd987
|
button加作用域
|
2014-04-09 17:23:56 +08:00 |
|
yanxd
|
2a62bc822a
|
修改ajax提交过程中，等待indicator被覆盖的问题
|
2014-04-09 15:33:21 +08:00 |
|
wanglinchun
|
dfad0448e1
|
单个应用显示页面
|
2014-04-09 11:14:54 +08:00 |
|
yanxd
|
1b6cdeac05
|
列表上提交作业，大概好了吧
|
2014-04-09 11:06:13 +08:00 |
|
yanxd
|
3fad5abb5c
|
modal init
|
2014-04-08 16:56:53 +08:00 |
|
yanxd
|
045b55236f
|
作业提交临时解决方案
|
2014-04-08 14:53:11 +08:00 |
|
wanglinchun
|
a9e9171441
|
通过脚手架新建了一套应用的东西，包括数据库的相应表，新建了发布应用的页面，上传图片功能未实现，界面格式还需调整
|
2014-04-04 17:54:20 +08:00 |
|
yanxd
|
ad23ba646e
|
理理css
|
2014-03-28 18:12:46 +08:00 |
|
yanxd
|
35d1c33a29
|
...
|
2014-03-27 10:53:45 +08:00 |
|
yanxd
|
dba674dfec
|
首页调整
|
2014-03-26 08:24:12 +08:00 |
|
yanxd
|
937d594c41
|
首页字体
|
2014-03-25 21:12:04 +08:00 |
|
yanxd
|
a8d1608603
|
nil
|
2014-03-25 14:40:47 +08:00 |
|
wanglinchun
|
8d2bbfe320
|
调整首页主题部分字体格式
|
2014-03-24 21:36:10 +08:00 |
|
wanglinchun
|
83b97ef71d
|
调整主页中主体部分字体为粗体
|
2014-03-24 21:23:51 +08:00 |
|
wanglinchun
|
1fabad8c2f
|
修改项目托管主页和课程实践主页主题句
|
2014-03-24 16:27:18 +08:00 |
|
yanxd
|
b5215e95e0
|
store table用div重构
|
2014-03-14 17:39:16 +08:00 |
|
yanxd
|
6cbd0f874c
|
store table用div重构
|
2014-03-14 17:29:45 +08:00 |
|
yanxd
|
592d704a6d
|
主页 文件上传bug
|
2014-03-12 17:09:26 +08:00 |
|
yanxd
|
21e55492fa
|
小改怡情 大改伤身 强改灰飞烟灭
|
2014-03-01 10:14:01 +08:00 |
|
yanxd
|
2ca1362e83
|
“按用户搜索”和“搜索”的区别，分别可以搜索什么？ 上面搜索删掉
1、标签的格式需 要优化（所有涉及到标签的地方的标签的格式都需要调整） tag周围距离
“课程通知“应该调整到“课程作业”后面 改！
|
2014-02-25 15:43:03 +08:00 |
|
yanxd
|
7deeab62bc
|
course.trustie.net
|
2014-02-24 10:40:45 +08:00 |
|
yanxd
|
cf2689917b
|
三天两头反复改 不如自挂东南枝
|
2014-02-22 09:47:59 +08:00 |
|
Wen
|
2aa6a14289
|
回复按钮的位置调整
|
2014-01-24 19:38:46 +08:00 |
|
Wen
|
12314de130
|
Redo
|
2014-01-24 19:25:25 +08:00 |
|
yanxd
|
e7dab11250
|
wc modify
|
2014-01-24 18:58:04 +08:00 |
 nieguanghui
|
a850cc8a04
|
修复侧边栏bug
|
2014-01-24 15:45:13 +08:00 |
|
yanxd
|
f96428ef20
|
fix word break bug
|
2014-01-24 15:35:36 +08:00 |
|
yanxd
|
f549645dce
|
字符超出边界问题， 新建课程404问题
|
2014-01-24 15:33:01 +08:00 |
|
nieguanghui
|
c26cb56193
|
主页调整
|
2014-01-24 15:01:15 +08:00 |
|
yanxd
|
0ed2e19268
|
项目列表
|
2014-01-24 10:55:25 +08:00 |
|
Wen
|
ed922dd192
|
删除了引用、删除之前的图标
|
2014-01-23 16:19:17 +08:00 |
|
Wen
|
c231f3bd35
|
项目和课程的讨论区界面中，引用、编辑、删除均改为文字，且放置在楼层数旁边；
回复数量距离铸铁增加了四行的距离；
发表人及时间位置更改为主贴左下角，右下角改为“回复”
|
2014-01-23 15:13:38 +08:00 |
|
wanglinchun
|
f0132a0f5f
|
在“课程实践->讨论区”为匿名用户不能进行评论添加登陆的提示以及登陆的链接
在“课程实践->留言”中的用户反馈改为用户留言
将“课程实践”中讨论区、资源库、课程通知和留言中提示语格式进行统一
|
2014-01-21 17:02:33 +08:00 |
|
yanxd
|
0d9453080c
|
bug
|
2014-01-18 10:52:05 +08:00 |
|
yanxd
|
099fffab51
|
Merge branch 'bigchange' into develop
|
2014-01-17 08:23:15 +08:00 |
|
yanxd
|
951666a1ed
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-01-16 21:15:24 +08:00 |
|
yanxd
|
0e3dcf88ff
|
conflict
|
2014-01-16 15:52:48 +08:00 |
|
yanxd
|
bacddf00d9
|
logo
|
2014-01-16 15:46:09 +08:00 |
 baiyu
|
13fdbde1cf
|
个人分数
|
2014-01-16 10:34:39 +08:00 |
|
nieguanghui
|
18b4a3ff5c
|
changge
|
2014-01-16 10:17:43 +08:00 |
|
nieguanghui
|
8d788fac45
|
modified
|
2014-01-15 20:38:58 +08:00 |
|
yanxd
|
a5c9d9c31e
|
um...
|
2014-01-15 17:28:53 +08:00 |
|
yanxd
|
3d2c0ba721
|
add activityBox to project/course/contest html
|
2014-01-13 08:23:35 +08:00 |
|
yanxd
|
289b0581df
|
stores css
|
2014-01-11 09:08:15 +08:00 |
|
yanxd
|
16c4b0e18c
|
board#new css
|
2014-01-09 09:15:58 +08:00 |
|
yanxd
|
b9967074dc
|
新闻界面修改，new页面bug修复
|
2014-01-08 20:18:32 +08:00 |
|
wanglinchun
|
4be4fa5e9a
|
welome css
|
2014-01-03 22:23:46 +08:00 |
|
wanglinchun
|
97749cfd8e
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-01-03 21:44:25 +08:00 |
|
wanglinchun
|
4167e8bb8f
|
修改了门户网站中用户动态的[进入附件列表]显示颜色
|
2014-01-03 21:36:47 +08:00 |
|
yanxd
|
4587c840b1
|
a
|
2014-01-03 21:33:01 +08:00 |
|
yanxd
|
4c0acc5f3e
|
welcome css
|
2014-01-03 21:02:30 +08:00 |
|
yanxd
|
32510028aa
|
论坛留言里发帖的分界
|
2014-01-02 14:48:01 +08:00 |
|
nieguanghui
|
ae094bde28
|
主页界面修改
|
2013-12-28 13:14:38 +08:00 |
|
nieguanghui
|
b0bb8b4a48
|
主页界面修改
|
2013-12-28 12:09:56 +08:00 |
|
nieguanghui
|
c05dd4f900
|
修改用户页面留言显示样式
|
2013-12-25 21:00:40 +08:00 |
|
yanxd
|
1af4e4f712
|
welcome index css.
|
2013-12-23 19:45:51 +08:00 |
|
yanxd
|
8e8f58a813
|
试试字体
|
2013-12-20 17:16:06 +08:00 |
|
yanxd
|
60be338848
|
作业提交的部分问题
禁止js的情况
修复一些路由错误
ie提交的问题.
|
2013-12-19 15:59:10 +08:00 |
|
xianbo
|
da74c97b7d
|
fix the show of manager web
|
2013-12-17 11:26:56 +08:00 |
|
yanxd
|
8043c527ce
|
项目-设置-问题-居中;
|
2013-12-16 14:50:46 +08:00 |
|
yanxd
|
fcc2dd7952
|
首页版本库，sth.
|
2013-12-14 11:41:53 +08:00 |
|
yanxd
|
3484632ce8
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-12-13 20:02:20 +08:00 |
|
nieguanghui
|
f2d392de1d
|
调整主页界面显示
|
2013-12-13 16:08:29 +08:00 |
|
yanxd
|
ee5194e052
|
jkl
|
2013-12-13 15:19:01 +08:00 |
|
yanxd
|
b8e95ffc67
|
修改查询过滤样式
|
2013-12-13 14:31:28 +08:00 |
|
nieguanghui
|
c27528ffb7
|
1234
|
2013-12-11 16:14:51 +08:00 |
|
yanxd
|
0bc2b8f2b3
|
项目论坛丢失了的编辑功能
贴吧的置顶锁定功能，目前只针对管理员开放
贴吧列表搜索功能重构
增加1/2帖子显示数目
取出楼主，防止输入帖子id让回复作为主贴显示
首页取新帖子
帖子下载内容随意删除功能
|
2013-12-11 08:52:55 +08:00 |
xianbo
|
0f93065ac4
|
imitate github show help doucument
|
2013-12-10 20:18:21 +08:00 |
|
yanxd
|
9742a94583
|
change line height in forums/index
|
2013-12-06 19:48:30 +08:00 |
|
nieguanghui
|
69c113f386
|
修改主页显示
|
2013-12-05 15:26:29 +08:00 |
 huangjingquan
|
096f0eed03
|
添加了留言结果在用户动态里面显示
|
2013-12-04 21:24:52 +08:00 |
|
nieguanghui
|
9c192f5a92
|
主页界面修改
|
2013-12-04 15:49:21 +08:00 |
|
yanxd
|
0609c5c7ea
|
1.增加帖子回复时间查询语句
2.帖子回复的数量在数据库中有字段
3.新建帖子失败错误提示
4.下载里程碑top_menu删掉，
5.学生分页，分页方法封装
|
2013-12-02 17:27:15 +08:00 |
|
nieguanghui
|
39bf4ff188
|
解决鼠标bug
|
2013-11-30 09:29:02 +08:00 |
|
huangjingquan
|
fc78a2b876
|
修改了项目里面成员列表角色错位
|
2013-11-30 08:59:00 +08:00 |
|
nieguanghui
|
3700294890
|
门户网站页面微调
|
2013-11-29 10:48:16 +08:00 |
|
huangjingquan
|
c1ea53faf0
|
修改了主页里面页面漂移问题
|
2013-11-28 18:27:18 +08:00 |
|
yanxd
|
f14f73414e
|
Merge branch 'welcome' into develop
|
2013-11-28 17:29:28 +08:00 |
|
nieguanghui
|
aa4596e170
|
增加图标显示
|
2013-11-28 17:22:24 +08:00 |
|
huangjingquan
|
2ba8bb8fd0
|
修改了forums主页显示，限制了讨论区用户图片显示大小
|
2013-11-28 17:15:42 +08:00 |
|
nieguanghui
|
90b38cf5e8
|
s
|
2013-11-28 16:00:53 +08:00 |
|
nieguanghui
|
c4d1b884e8
|
aaa
|
2013-11-28 10:07:49 +08:00 |
|
nieguanghui
|
1f83ca612b
|
显示部分数据
|
2013-11-28 08:34:20 +08:00 |
|
huangjingquan
|
6dc692bb6a
|
修改了主页、论坛显示
|
2013-11-27 16:40:47 +08:00 |
|
nieguanghui
|
f0b17a1a10
|
主页界面设计
|
2013-11-27 15:37:43 +08:00 |
|
huangjingquan
|
860c46e1c7
|
修改了字体大小
|
2013-11-27 10:31:12 +08:00 |
|
huangjingquan
|
dc00216603
|
修改了谈论区框架、列表等
|
2013-11-25 21:42:59 +08:00 |
|
huangjingquan
|
19f183cb2b
|
讨论区message样式
|
2013-11-25 15:07:34 +08:00 |
|
yanxd
|
5de8e1c2f2
|
new welcome index.
|
2013-11-22 08:19:40 +08:00 |
|
huangjingquan
|
0f652b4955
|
首页显示样式
|
2013-11-21 17:27:14 +08:00 |
|
huangjingquan
|
b8db0f59d2
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-21 17:12:00 +08:00 |
|
yanxd
|
67bec27f34
|
.
|
2013-11-21 17:11:55 +08:00 |
|
huangjingquan
|
9b044f8d13
|
修改了讨论区显示
|
2013-11-21 09:38:03 +08:00 |
|
baiyu
|
6c9c849e7c
|
1、增加了竞赛的配置功能
2、增加了课程的成员学号显示
|
2013-11-19 15:15:54 +08:00 |
|
huangjingquan
|
16611d8eff
|
修改了管理员权限
|
2013-11-16 11:09:10 +08:00 |
|
huangjingquan
|
4d8345593d
|
将作业情况改成作业提交情况
|
2013-11-14 19:39:07 +08:00 |
|
huangjingquan
|
3055286cdd
|
修改了作业不能提交bug
|
2013-11-13 10:19:47 +08:00 |
|
huangjingquan
|
7935520612
|
对课程、项目、作业页面 当前位置显示做了隐藏
|
2013-11-12 10:44:15 +08:00 |
|
huangjingquan
|
59d0cc8e7a
|
修改了个人主页项目列表
|
2013-11-09 08:56:34 +08:00 |
|
huangjingquan
|
718fa65fc4
|
整个界面样式协调
|
2013-11-08 20:54:45 +08:00 |
|
huangjingquan
|
e8153c86ad
|
修改了项目里面各个子页面的样式
|
2013-11-08 20:09:21 +08:00 |
|
huangjingquan
|
f13665959a
|
作业列表样式修改
项目新闻样式修改
|
2013-11-08 17:26:47 +08:00 |
|
baiyu
|
8f216a6723
|
统一了各个模块的按钮，修改了部分国际化
|
2013-11-08 10:53:18 +08:00 |
|
huangjingquan
|
165c392f31
|
各个列表添加当前位置
|
2013-11-08 10:29:29 +08:00 |
|
xianbo
|
5032eaabcb
|
fix the show out of the frame and the location of show
|
2013-11-07 19:14:57 +08:00 |
|
xianbo
|
607eb2c2ff
|
modify shoew of project
|
2013-11-07 17:04:37 +08:00 |
|
huangjingquan
|
d71890526b
|
课程列表里面超出的部分自动隐藏
|
2013-11-07 16:35:20 +08:00 |
|
huangjingquan
|
f15619d99d
|
样式
|
2013-11-05 16:42:03 +08:00 |
|
huangjingquan
|
2a4539dc2c
|
几个主要页面样式
|
2013-11-05 12:49:57 +08:00 |
|
baiyu
|
231d1f2c4b
|
增加样式修改了各个模块导航条颜色
|
2013-11-05 09:17:36 +08:00 |
|
huangjingquan
|
c8427fe61e
|
修改了作业、项目、课程页面
|
2013-11-04 20:51:47 +08:00 |
|
baiyu
|
20c2feef30
|
增加了“项目门户”的当前位置导航、样式、配套的超链接
|
2013-11-04 20:18:44 +08:00 |
|
huangjingquan
|
8ee5381e44
|
修改了用户个人主页样式
|
2013-11-04 16:07:31 +08:00 |
|
huangjingquan
|
27299586c2
|
修改了top——mune
|
2013-11-04 15:20:22 +08:00 |
|
yanxd
|
19b983e103
|
move flash message to top on base_project
|
2013-11-02 14:17:15 +08:00 |
|
yanxd
|
5d431670a5
|
add new css to nyan.css
|
2013-11-02 13:41:46 +08:00 |
|
yanxd
|
6dec8a9312
|
share previews
|
2013-10-25 15:46:14 +08:00 |
|
yanxd
|
4bef2eee24
|
course can be shared files by project's member
|
2013-10-22 09:02:48 +08:00 |
baiyu
|
1be0a7d23f
|
修改了“返回个人主页”和“返回课程”，修改了样式
|
2013-10-16 22:02:05 +08:00 |
|
yanxd
|
ec63fc41bb
|
add link in project/course list page, joinBUtton renamed.
|
2013-10-15 14:46:20 +08:00 |
|
yanxd
|
e1d8c8a992
|
remove nyan css & move another file
|
2013-10-15 11:06:19 +08:00 |
|
yanxd
|
20883b92a5
|
add button css, fix js bug, add create project to push homework.
|
2013-10-14 21:45:10 +08:00 |
 huangjingquan
|
b19ed67d79
|
新的课程
修改了一些bug
|
2013-09-29 19:46:59 +08:00 |
 william
|
2079c87362
|
增加tag删除。
|
2013-09-27 14:58:51 +08:00 |
|
xianbo
|
806fae7b19
|
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop
Conflicts:
app/controllers/account_controller.rb
app/controllers/my_controller.rb
app/controllers/projects_controller.rb
app/controllers/users_controller.rb
app/helpers/projects_helper.rb
app/helpers/users_helper.rb
app/models/project.rb
app/models/user.rb
app/models/user_extensions.rb
app/views/account/register.html.erb
app/views/bids/_bid_show.html.erb
app/views/bids/_history.html.erb
app/views/bids/_project_list.html.erb
app/views/bids/show.html.erb
app/views/files/index.html.erb
app/views/layouts/base_bids.html.erb
app/views/layouts/base_users.html.erb
app/views/my/account.html.erb
app/views/users/watch_bids.html.erb
config/locales/en.yml
config/locales/zh.yml
config/routes.rb
db/schema.rb
lib/redmine.rb
public/stylesheets/application.css
|
2013-09-23 20:18:03 +08:00 |
baiyu
|
4fb040bc61
|
modify register bug
|
2013-09-23 16:42:19 +08:00 |
|
huangjingquan
|
278cb57ab9
|
修改了项目里面一些bug
|
2013-09-23 13:35:29 +08:00 |
|
baiyu
|
6ce27271e3
|
修改了身份
增加了职称、学号
|
2013-09-23 09:41:36 +08:00 |
|
huangjingquan
|
3536883248
|
课程合并
|
2013-09-23 08:44:48 +08:00 |
|
baiyu
|
a7b500f5e7
|
修正了“注册”和“我的账号”的显示格式
|
2013-09-16 21:56:12 +08:00 |
|
huangjingquan
|
466922d13b
|
修改了上次会议提出的几点
|
2013-09-16 08:49:39 +08:00 |
|
baiyu
|
2768c935be
|
1、增加了“我的状态”
|
2013-09-14 17:22:44 +08:00 |
|
baiyu
|
313e66537e
|
增加了“地区”
|
2013-09-13 22:47:14 +08:00 |
|
huangjingquan
|
261c3fc337
|
new version
|
2013-09-12 10:41:15 +08:00 |
yanxd
|
43d43f22c0
|
fix icon position on issues/new
|
2013-09-03 08:37:16 +08:00 |
|
huangjingquan
|
a318266c60
|
修改用户列表tabs显示bug
|
2013-09-02 20:37:41 +08:00 |
|
huangjingquan
|
77a47797d2
|
user列表
|
2013-09-02 15:01:20 +08:00 |
 kaizheng
|
f077fd397b
|
字体修复
|
2013-09-02 13:07:23 +08:00 |
|
huangjingquan
|
c4df893eab
|
修改了tabs页面，字体大小
|
2013-09-02 12:49:17 +08:00 |
|
baiyu
|
844f1d2dcf
|
修改了不合理的地方
|
2013-08-31 21:45:20 +08:00 |
|
kaizheng
|
3b2bad9d22
|
页面字体修复
|
2013-08-31 20:49:47 +08:00 |