 wanglinchun
|
a90804b312
|
修改上传应用软件包和截图的说明文字
|
2014-04-23 09:58:37 +08:00 |
|
wanglinchun
|
5d752f785f
|
竞赛页面中应用列表题目增加：点击后弹出新页面
|
2014-04-23 09:49:15 +08:00 |
Wen
|
f8c6d7d77e
|
注册时学校选择的小调整
|
2014-04-23 09:36:42 +08:00 |
|
Wen
|
59d705b33c
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-23 09:22:34 +08:00 |
|
Wen
|
7be7fd3d9b
|
学校选择形式改为弹窗
|
2014-04-23 09:22:13 +08:00 |
yanxd
|
d9cadfc43e
|
未登录500报错
|
2014-04-23 09:20:09 +08:00 |
|
wanglinchun
|
b318166c15
|
给参与竞赛的应用页面增加导航条
|
2014-04-23 09:18:43 +08:00 |
|
yanxd
|
60bc3bb1b2
|
seem_rateable to lib, using Engine setting routes
|
2014-04-23 08:51:46 +08:00 |
|
wanglinchun
|
0bdb3eb118
|
应用页面添加所属竞赛及相应链接
|
2014-04-22 20:23:15 +08:00 |
|
wanglinchun
|
05c0d2a5ac
|
替换竞赛模块首页中竞赛和应用的图标并调整相应的格式
|
2014-04-22 19:27:31 +08:00 |
|
Wen
|
3dbe7c5896
|
课程的学校ID自动设置为开课教师的学校ID
去掉课程添加界面上的学校选择
|
2014-04-22 15:25:50 +08:00 |
|
Wen
|
00e62ec8f7
|
用户评分理论上完成版.
|
2014-04-22 14:53:25 +08:00 |
|
wanglinchun
|
bc068eb12b
|
添加参赛应用的删除和修改功能以及添加相应的删除和修改权限
|
2014-04-22 10:59:50 +08:00 |
 fanqiang
|
91d5959016
|
添加了对管理员申请的接受与拒绝
|
2014-04-22 10:16:50 +08:00 |
|
Wen
|
ded3da6670
|
用户评分理论上完成了
|
2014-04-22 09:54:56 +08:00 |
|
Wen
|
dee5808407
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-22 09:54:17 +08:00 |
|
yanxd
|
0791c35df1
|
赞踩关联关系
|
2014-04-22 08:56:49 +08:00 |
|
wanglinchun
|
cc5b55ec9c
|
调整应用页面中简介显示上下边距以及简介限定字数显示格式
|
2014-04-22 08:49:08 +08:00 |
|
fanqiang
|
28b10ed3fd
|
修改了搜索功能，并能对搜索进行过滤
|
2014-04-22 08:21:35 +08:00 |
|
Wen
|
3ba524668f
|
用户评分未完成版本= =
上传一下以防丢了
|
2014-04-21 22:34:51 +08:00 |
|
wanglinchun
|
7758e9bbf1
|
df
|
2014-04-21 21:03:18 +08:00 |
xianbo
|
cd278cb795
|
erge branch 'develop'
Conflicts:
.gitignore
|
2014-04-21 20:24:27 +08:00 |
|
xianbo
|
ca032b659b
|
fix
|
2014-04-21 20:21:36 +08:00 |
|
xianbo
|
4de9f959ac
|
clean repository
|
2014-04-21 20:14:58 +08:00 |
|
yanxd
|
6e4944b914
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-21 20:08:11 +08:00 |
|
yanxd
|
e5a5a337b2
|
format code
|
2014-04-21 20:07:43 +08:00 |
|
wanglinchun
|
66c4d870a4
|
评分样式
|
2014-04-21 20:07:30 +08:00 |
|
yanxd
|
0226052dd0
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-21 20:01:00 +08:00 |
|
yanxd
|
2b679b1ef9
|
看图不登录
|
2014-04-21 20:00:50 +08:00 |
|
wanglinchun
|
8a429ec669
|
首页提示语
|
2014-04-21 19:40:04 +08:00 |
|
wanglinchun
|
94a7bacdd2
|
首页：当无应用时，提示暂无应用
|
2014-04-21 19:40:03 +08:00 |
 alan
|
87fdecdabd
|
创新竞赛添加删除功能
|
2014-04-21 18:13:57 +08:00 |
|
yanxd
|
4c3955bca0
|
revert create tmp
This reverts commit 6bfcf094d9.
|
2014-04-21 16:53:13 +08:00 |
|
yanxd
|
6bfcf094d9
|
f**k
|
2014-04-21 16:21:39 +08:00 |
|
yanxd
|
daf7e8d200
|
user added rater
|
2014-04-21 16:03:55 +08:00 |
|
yanxd
|
e802424e2a
|
merge jrating
|
2014-04-21 15:43:00 +08:00 |
|
yanxd
|
b4209b7cc5
|
jrating
|
2014-04-21 15:41:51 +08:00 |
|
xianbo
|
1aae4291a5
|
fix gitignore
|
2014-04-21 14:15:57 +08:00 |
|
xianbo
|
0a5de653d0
|
fix db migrate
|
2014-04-21 14:07:54 +08:00 |
 baiyu
|
f0b497e455
|
user score merge
|
2014-04-21 11:15:41 +08:00 |
|
baiyu
|
36cd91401f
|
user score
|
2014-04-21 11:13:45 +08:00 |
|
alan
|
dd09c36a8f
|
Added the message of creating the project in the project's activities
|
2014-04-21 09:32:55 +08:00 |
|
alan
|
9a580655ab
|
在project的项目动态的最后一页显示项目创建信息
|
2014-04-21 09:22:46 +08:00 |
|
xianbo
|
0d055fd807
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-21 08:55:11 +08:00 |
|
fanqiang
|
8600265f00
|
修改查询条件样式
|
2014-04-21 08:54:11 +08:00 |
|
xianbo
|
bb4d141b0e
|
erge branch 'competition' into develop
Conflicts:
app/views/layouts/base_newcontest.html.erb
|
2014-04-21 08:46:08 +08:00 |
|
yanxd
|
9034dd09e7
|
开启重启课程在课程列表里
|
2014-04-21 08:39:49 +08:00 |
|
wanglinchun
|
edb5dac785
|
添加竞赛列表页面中的超链接
|
2014-04-19 14:19:21 +08:00 |
|
wanglinchun
|
43064c4bc2
|
调整竞赛模块首页中显示的竞赛：既有旧的竞赛又有新的竞赛
|
2014-04-19 13:10:25 +08:00 |
|
yanxd
|
8775eab3dd
|
iscas modify
|
2014-04-19 12:47:59 +08:00 |