 wanglinchun
|
484d334c3c
|
添加竞赛模块中参赛项目的分页功能
|
2014-04-15 10:34:28 +08:00 |
Wen
|
44560a679f
|
工作单位更改为下拉框选择
级联问题解决中 0.0
|
2014-04-15 09:36:29 +08:00 |
|
wanglinchun
|
c964cf9d9d
|
调整了发布应用页面星星的颜色
|
2014-04-14 22:12:13 +08:00 |
|
yanxd
|
31ce41a2d7
|
testcontroller
|
2014-04-14 21:59:32 +08:00 |
|
wanglinchun
|
b4b61a3422
|
修改小bug；设计打分和评论唯一性前提交版
|
2014-04-14 21:54:54 +08:00 |
|
yanxd
|
41f315aac0
|
压缩文件
|
2014-04-14 17:37:03 +08:00 |
|
yanxd
|
8b52d63d14
|
关联文件同时，关联tag
|
2014-04-14 17:37:01 +08:00 |
|
wanglinchun
|
f2ed529b92
|
df
|
2014-04-14 17:30:05 +08:00 |
|
wanglinchun
|
733497fef8
|
调整竞赛列表页面中部分统计数字的超链接
|
2014-04-14 17:29:38 +08:00 |
|
wanglinchun
|
589a21204c
|
应用下载功能实现
|
2014-04-14 15:54:10 +08:00 |
|
xianbo
|
7ae55c1ec8
|
fix
|
2014-04-14 15:51:43 +08:00 |
|
xianbo
|
762386b56d
|
修改版本库的提示
|
2014-04-14 15:32:04 +08:00 |
|
yanxd
|
4f5eff09c8
|
发帖内容验证不通过不会丢失信息了，加上了所有验证
|
2014-04-14 10:15:18 +08:00 |
|
wanglinchun
|
98b6493b91
|
给应用添加开发人员字段及显示
|
2014-04-14 09:50:36 +08:00 |
|
yanxd
|
00ded2bc38
|
作业列表格式化输出，memo发帖人的名字清除浮动，防止换行
|
2014-04-14 08:37:20 +08:00 |
 alan
|
933fc6cb33
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-12 19:03:24 +08:00 |
|
alan
|
7781203474
|
附件按tag查询时，只查选定项目中的附件
|
2014-04-12 19:01:48 +08:00 |
|
yanxd
|
634dd15be3
|
project html
|
2014-04-12 09:40:26 +08:00 |
|
wanglinchun
|
f9e5dd47f6
|
修改了竞赛列表的排序问题
|
2014-04-11 21:56:35 +08:00 |
|
wanglinchun
|
4ccc4548a1
|
xiug
|
2014-04-11 18:02:26 +08:00 |
|
wanglinchun
|
64895a75ed
|
显示上传截图+应用显示
|
2014-04-11 17:16:22 +08:00 |
|
yanxd
|
28a5eff048
|
topics未登录footer飞出去的问题，擦屁股+10086,dom结构还有错，找不到崩溃
|
2014-04-11 16:44:02 +08:00 |
|
yanxd
|
96fcdbacf2
|
课程里搜东西 没有内容项目里也跳出来的问题
|
2014-04-11 16:43:05 +08:00 |
|
wanglinchun
|
a4df4cf893
|
修改竞赛和参与竞赛的新建应用之间的关联关系
|
2014-04-11 16:40:09 +08:00 |
|
yanxd
|
3e1a674ed9
|
fix 3
|
2014-04-11 10:57:12 +08:00 |
 nieguanghui
|
6baa87a8ea
|
修复项目列表分数显示不一致的问题，修改用户列表显示不一致的问题，修改作业中项目显示分数和项目内部分数不一致的问题
|
2014-04-11 10:53:51 +08:00 |
|
wanglinchun
|
b97cdd6b0d
|
修改参赛应用中应用和竞赛的关联前，目前部分代码由于数据表及关联没考虑清楚，导致无法关联，下一步修改代码，重新建表，完成关联功能及应用的正常显示
|
2014-04-11 09:00:00 +08:00 |
|
xianbo
|
1c69e80745
|
keep same between take project and watch project
|
2014-04-11 08:41:15 +08:00 |
|
yanxd
|
d554bf1ea9
|
给下载添加登录过滤器
|
2014-04-10 16:23:40 +08:00 |
|
yanxd
|
bfa6f800d9
|
提交作业 确认在本人属于项目成员的时候才可以
|
2014-04-10 15:46:20 +08:00 |
|
yanxd
|
c21cb264a9
|
评论显示格式
|
2014-04-10 10:54:23 +08:00 |
|
xianbo
|
f823a81a37
|
date time error in news `
|
2014-04-10 10:51:03 +08:00 |
 kg
|
b1705ddf7d
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-10 10:03:49 +08:00 |
|
kg
|
9ab5db8ee3
|
remove tags
|
2014-04-10 09:59:30 +08:00 |
|
yanxd
|
ac4e74af91
|
作业layout显示提交作业的类型
|
2014-04-10 09:34:09 +08:00 |
|
wanglinchun
|
be61b9d1ac
|
调整了具体应用页面评价应用的功能
|
2014-04-10 08:33:30 +08:00 |
|
yanxd
|
d3f886d992
|
不能新建项目 在项目列表
|
2014-04-09 21:44:40 +08:00 |
|
yanxd
|
7a31b3f4ea
|
去掉项目描述长度验证
|
2014-04-09 16:31:27 +08:00 |
|
xianbo
|
20bf1dadc0
|
fix
|
2014-04-09 15:43:20 +08:00 |
|
xianbo
|
b2896c1645
|
fix
|
2014-04-09 11:27:12 +08:00 |
|
yanxd
|
383d62a353
|
修改错误处理文字显示
|
2014-04-09 11:15:34 +08:00 |
|
wanglinchun
|
dfad0448e1
|
单个应用显示页面
|
2014-04-09 11:14:54 +08:00 |
|
yanxd
|
1b6cdeac05
|
列表上提交作业，大概好了吧
|
2014-04-09 11:06:13 +08:00 |
|
wanglinchun
|
92078e6ac8
|
调整首页布局
|
2014-04-09 10:24:44 +08:00 |
|
nieguanghui
|
bad170fdb2
|
应用上传附件功能
|
2014-04-09 09:25:24 +08:00 |
|
yanxd
|
3fad5abb5c
|
modal init
|
2014-04-08 16:56:53 +08:00 |
|
yanxd
|
045b55236f
|
作业提交临时解决方案
|
2014-04-08 14:53:11 +08:00 |
|
yanxd
|
743fee80e3
|
网站状态css
|
2014-04-04 21:43:06 +08:00 |
|
yanxd
|
d83ea7ecd8
|
fake Count count student project, lol.
|
2014-04-04 21:30:40 +08:00 |
|
wanglinchun
|
a9e9171441
|
通过脚手架新建了一套应用的东西，包括数据库的相应表，新建了发布应用的页面，上传图片功能未实现，界面格式还需调整
|
2014-04-04 17:54:20 +08:00 |
|
yanxd
|
24dd71e6b3
|
关注项目
|
2014-04-04 17:18:37 +08:00 |
|
yanxd
|
64e68ff8a0
|
关注项目无法显示的问题
|
2014-04-04 17:18:35 +08:00 |
|
xianbo
|
45c6c0b9f3
|
fix
|
2014-04-04 17:21:07 +08:00 |
|
xianbo
|
b1fc33a697
|
add by nyan
|
2014-04-04 16:59:50 +08:00 |
|
xianbo
|
2a72f7aac8
|
evils fix
|
2014-04-04 15:25:21 +08:00 |
|
yanxd
|
7e130ee89e
|
去掉login_flag
|
2014-04-04 12:33:12 +08:00 |
|
wanglinchun
|
c86af5f483
|
与show_application相关的所有内容改为show_softapplication，以防和系统中的application冲突
|
2014-04-04 11:17:50 +08:00 |
|
wanglinchun
|
8fb185681a
|
修改应用列表页面说法
|
2014-04-04 09:38:31 +08:00 |
|
wanglinchun
|
2a278e0a2d
|
all
|
2014-04-03 22:38:18 +08:00 |
|
wanglinchun
|
1e7e0a1bb5
|
修改加入竞赛和退出竞赛不能刷新的问题；新建项目后不能刷新的问题；竞赛列表和竞赛页面搜索问题
|
2014-04-03 22:15:19 +08:00 |
|
wanglinchun
|
120e84cfc7
|
新竞赛代码移植
|
2014-04-03 17:26:56 +08:00 |
|
alan
|
272be122e5
|
按时间查询
|
2014-04-03 16:46:22 +08:00 |
|
yanxd
|
a272be1686
|
注册页面的姓氏添加回去
|
2014-04-03 15:56:33 +08:00 |
|
yanxd
|
075b1d2143
|
去除中文在controller里
|
2014-04-03 08:50:24 +08:00 |
|
Wen
|
e5470db875
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-03 08:49:35 +08:00 |
|
Wen
|
6986616783
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-02 20:32:50 +08:00 |
|
yanxd
|
a1a58ee26c
|
加注释
|
2014-04-02 19:58:06 +08:00 |
|
Wen
|
a4557d4d19
|
已结束课程显示正常
|
2014-04-02 17:34:06 +08:00 |
|
Wen
|
24d7234fec
|
作业顺序按照截止日期排序
|
2014-04-02 16:04:14 +08:00 |
|
Wen
|
992d2be6e4
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-02 15:23:42 +08:00 |
|
xianbo
|
104eaf8c00
|
fix student can create course in teacher maiun course page
|
2014-04-02 15:13:34 +08:00 |
|
Wen
|
4448fdfaca
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-02 14:44:10 +08:00 |
|
xianbo
|
6888e2bf01
|
fix
|
2014-04-02 10:59:32 +08:00 |
|
xianbo
|
90dcf36257
|
left italic in email
|
2014-04-02 10:47:50 +08:00 |
|
xianbo
|
02925fbb99
|
fix
|
2014-04-02 08:27:39 +08:00 |
|
yanxd
|
5ed40da76f
|
course页面，xx份资料上加链接
|
2014-04-02 08:22:02 +08:00 |
|
alan
|
b06d462b53
|
附件按时间排序 龙军
|
2014-04-01 22:21:05 +08:00 |
|
alan
|
5c2a037a8f
|
user dup
|
2014-04-01 21:04:10 +08:00 |
|
yanxd
|
66e655a19e
|
nothing
|
2014-04-01 20:05:33 +08:00 |
|
xianbo
|
233901577f
|
fix
|
2014-04-01 19:55:35 +08:00 |
|
xianbo
|
b43a899a18
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/layouts/_base_header.html.erb
|
2014-04-01 16:44:06 +08:00 |
|
xianbo
|
5d77381bb9
|
fix the user.trustie.net
|
2014-04-01 16:40:55 +08:00 |
|
xianbo
|
06b2c25f3d
|
fix
|
2014-03-31 19:26:07 +08:00 |
|
yanxd
|
301a21b455
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-03-31 19:23:53 +08:00 |
|
yanxd
|
4f5216e632
|
merge
|
2014-03-31 17:11:41 +08:00 |
|
yanxd
|
930bc4083e
|
forge 软件
|
2014-03-31 17:02:28 +08:00 |
|
yanxd
|
84c5032eb2
|
整理下，加个推荐tag
|
2014-03-31 15:36:51 +08:00 |
|
xianbo
|
5c63ea2378
|
add contest and fix url
|
2014-03-31 10:56:29 +08:00 |
|
xianbo
|
2bba27e7a1
|
evils uri
|
2014-03-31 09:01:27 +08:00 |
|
xianbo
|
3d2516f53c
|
fix navigation
|
2014-03-31 08:42:27 +08:00 |
|
yanxd
|
d2ebfca314
|
加个数组判断
|
2014-03-30 20:28:16 +08:00 |
|
yanxd
|
850ff6194f
|
issue#509,#510
|
2014-03-30 17:03:15 +08:00 |
|
yanxd
|
f7eca26770
|
资源库位置调整：排第三
|
2014-03-30 15:46:58 +08:00 |
|
yanxd
|
8c251da25d
|
Bug：新建作业时菜单栏第一个显示蓝色，应该是第二个显示蓝色
|
2014-03-30 15:46:56 +08:00 |
|
xianbo
|
6e065361b3
|
fix main page navigation
|
2014-03-29 11:03:04 +08:00 |
|
yanxd
|
c38a8e4f6a
|
socialForge#324
|
2014-03-28 18:12:48 +08:00 |
|
yanxd
|
ad23ba646e
|
理理css
|
2014-03-28 18:12:46 +08:00 |
|
yanxd
|
378e8cbefd
|
socailForge#329
|
2014-03-28 18:12:44 +08:00 |
|
xianbo
|
a9d662872c
|
add i want to feedback
|
2014-03-28 11:13:58 +08:00 |
|
yanxd
|
3097f23c06
|
shang
|
2014-03-27 17:12:35 +08:00 |
|
yanxd
|
35d1c33a29
|
...
|
2014-03-27 10:53:45 +08:00 |
|
yanxd
|
dba674dfec
|
首页调整
|
2014-03-26 08:24:12 +08:00 |
|
yanxd
|
d64615e604
|
issue created alert
|
2014-03-25 21:24:17 +08:00 |
|
yanxd
|
937d594c41
|
首页字体
|
2014-03-25 21:12:04 +08:00 |
|
yanxd
|
575fc48ff0
|
首页搜索分类
|
2014-03-25 16:53:11 +08:00 |
|
yanxd
|
6bef7029bc
|
项目课程分不清，添加解释语句
|
2014-03-25 15:21:38 +08:00 |
|
yanxd
|
a8d1608603
|
nil
|
2014-03-25 14:40:47 +08:00 |
|
xianbo
|
3bf0a8f138
|
fix default show
|
2014-03-25 09:34:43 +08:00 |
|
yanxd
|
ce4f49b635
|
counter cache for issue
|
2014-03-25 09:27:43 +08:00 |
|
yanxd
|
6ba25556b7
|
issues id new world
|
2014-03-25 09:10:28 +08:00 |
|
wanglinchun
|
8d2bbfe320
|
调整首页主题部分字体格式
|
2014-03-24 21:36:10 +08:00 |
|
wanglinchun
|
b167193172
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-03-24 17:17:04 +08:00 |
|
xianbo
|
321f2df0b9
|
add chance to new preoject
|
2014-03-24 17:12:28 +08:00 |
|
yanxd
|
163cdc8cf7
|
issues to_param
|
2014-03-24 16:46:24 +08:00 |
|
wanglinchun
|
1fabad8c2f
|
修改项目托管主页和课程实践主页主题句
|
2014-03-24 16:27:18 +08:00 |
|
xianbo
|
8bb4d44cbe
|
fix link
|
2014-03-24 13:49:14 +08:00 |
|
xianbo
|
8db09739a1
|
optimize the show of forge
|
2014-03-24 13:49:13 +08:00 |
|
yanxd
|
2e3b44c830
|
id-name(position|count)
|
2014-03-24 11:11:13 +08:00 |
|
yanxd
|
3b13183dbb
|
resort
|
2014-03-24 08:31:59 +08:00 |
|
yanxd
|
404568be89
|
留言url显示，以及留言分页的url处理
|
2014-03-22 09:27:29 +08:00 |
|
xianbo
|
34fd8a933a
|
fix the show of domain and project page
|
2014-03-21 20:26:28 +08:00 |
|
Wen
|
ce7af30788
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-03-21 18:03:38 +08:00 |
|
Wen
|
31b7ab8ae5
|
创建课程处添加了学校
数据库中存储学校的ID
但是学校与省份的级联还没有做好=A=
|
2014-03-21 18:02:55 +08:00 |
|
yanxd
|
f786d01312
|
加个table标签
|
2014-03-21 16:50:06 +08:00 |
|
yanxd
|
9c54c9c1b6
|
重构项目和课程排序部分，修复分页数量错误
|
2014-03-21 16:50:04 +08:00 |
|
xianbo
|
20cd5941a8
|
modify project main page
|
2014-03-21 15:17:14 +08:00 |
|
Wen
|
30eb2d79f2
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-03-21 13:55:12 +08:00 |
|
yanxd
|
c905ded3b5
|
擦屁股
|
2014-03-21 10:03:03 +08:00 |
|
yanxd
|
52fe99d71c
|
fixed 谭 domain bug in development environment.
|
2014-03-21 09:28:59 +08:00 |
|
Wen
|
337885503e
|
school表done
建立了school和course的一对多关联
|
2014-03-20 16:19:16 +08:00 |
|
yanxd
|
e97caddbdb
|
又一个course timeout问题
|
2014-03-20 15:28:36 +08:00 |
|
yanxd
|
a8ab8fc45d
|
projects list course timeout method
|
2014-03-20 15:13:25 +08:00 |
|
yanxd
|
66ea9a00b4
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-03-20 14:17:59 +08:00 |
|
yanxd
|
6877ff7e8d
|
解决设置跳转404.bug
|
2014-03-20 14:17:48 +08:00 |
|
xianbo
|
a8fbed4502
|
add welcome page in diff url
|
2014-03-20 10:11:12 +08:00 |
|
xianbo
|
3f55e78f49
|
add diff url in navigation
|
2014-03-20 10:10:22 +08:00 |
|
yanxd
|
d9bc17c1ea
|
留言权限， basecourse关闭课程重构
|
2014-03-19 17:32:32 +08:00 |
|
yanxd
|
f9e9404471
|
过滤器过滤加入课程的行为，不再进行n多判断
|
2014-03-19 15:50:02 +08:00 |
|
yanxd
|
e1ddb3b0f6
|
修改文字说明
|
2014-03-18 08:35:30 +08:00 |
|
yanxd
|
e0c87996bf
|
改了个课程截至日期，并且在courses_controller中设置了过期不允许加入的设定，目测没什么问题，明天再看看
|
2014-03-17 22:43:38 +08:00 |
|
yanxd
|
6ac640f36a
|
课程资源列表有点乱#issue482
|
2014-03-17 08:17:07 +08:00 |
|
yanxd
|
af3b32fa89
|
帖子内容可以为空
|
2014-03-14 21:25:59 +08:00 |
|
yanxd
|
6cbd0f874c
|
store table用div重构
|
2014-03-14 17:29:45 +08:00 |
|
yanxd
|
daed8a1164
|
暂且提交，增加活动失败。
|
2014-03-13 22:06:49 +08:00 |
|
yanxd
|
78c2f40b8a
|
作业文字 文件列表 标签提交后删除
|
2014-03-13 15:33:12 +08:00 |
|
yanxd
|
592d704a6d
|
主页 文件上传bug
|
2014-03-12 17:09:26 +08:00 |
|
yanxd
|
aa3f0e1662
|
上传文件点一点
|
2014-03-12 08:47:43 +08:00 |
|
yanxd
|
3df986a908
|
教师列表转换排序方式后则搜索所有人员bug
|
2014-03-11 15:46:18 +08:00 |
|
yanxd
|
ffad898914
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-03-11 11:28:19 +08:00 |
|
yanxd
|
6fd970973d
|
ll
|
2014-03-11 11:28:11 +08:00 |