yanxd
|
08b27f38a7
|
tag todo
|
2014-04-24 20:41:45 +08:00 |
|
yanxd
|
653fe6c1ea
|
所有发邮件都新开线程
|
2014-04-24 18:25:57 +08:00 |
 kg
|
14511c079a
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-24 14:38:32 +08:00 |
|
kg
|
0ff3734aae
|
delete nothing
|
2014-04-24 14:37:19 +08:00 |
|
kg
|
77ea0092b7
|
add course homepage activity
|
2014-04-24 14:33:15 +08:00 |
|
yanxd
|
cee205a568
|
issues#377 074e8adf 引入的issue页面权限问题，除了控制器还修改过views判断语句 keyworks: @edit_allowed
issues#379 tag字符串短
issues#380 tag 提交之后 不隐藏输入框
issues#381 搜索框有误
|
2014-04-24 10:16:49 +08:00 |
|
yanxd
|
2052d36abe
|
issue:socialForge#381
|
2014-04-24 10:16:47 +08:00 |
|
kg
|
daa19de51d
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-24 09:13:51 +08:00 |
|
kg
|
709629bcdf
|
add course activity
|
2014-04-24 09:13:06 +08:00 |
|
kg
|
271427d29e
|
homepage status
|
2014-04-24 08:18:14 +08:00 |
Wen
|
6a2626c90e
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-23 21:41:02 +08:00 |
|
Wen
|
cf762e6aa3
|
bug fix~
|
2014-04-23 21:35:03 +08:00 |
|
Wen
|
08e40c4a4e
|
bug fix
|
2014-04-23 21:26:37 +08:00 |
|
Wen
|
473a44d11a
|
学校-课程模式！
|
2014-04-23 21:20:03 +08:00 |
 wanglinchun
|
ae622eb74e
|
sdfsd
|
2014-04-23 17:33:32 +08:00 |
|
wanglinchun
|
9af6c03547
|
Merge branch 'competition' into develop
Conflicts:
Gemfile.lock
app/views/layouts/_base_footer.html.erb
|
2014-04-23 17:18:53 +08:00 |
|
wanglinchun
|
6b5452f3e2
|
增加修改应用时提示语
|
2014-04-23 17:06:48 +08:00 |
|
yanxd
|
e2a5e2f730
|
footer
|
2014-04-23 16:37:19 +08:00 |
|
wanglinchun
|
3608cecca5
|
增加应用软件包的后缀格式
|
2014-04-23 16:30:23 +08:00 |
|
wanglinchun
|
c272d7a8c7
|
调整应用的修改功能，使其可以更新重新上传的文件，但是会删除上次上传的文件
|
2014-04-23 16:16:17 +08:00 |
|
Wen
|
735f920e9d
|
注册页面学校显示方式修改为文本框
|
2014-04-23 11:10:11 +08:00 |
|
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 |
|
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 |
|
Wen
|
3ba524668f
|
用户评分未完成版本= =
上传一下以防丢了
|
2014-04-21 22:34:51 +08:00 |
|
wanglinchun
|
7758e9bbf1
|
df
|
2014-04-21 21:03:18 +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 |