Commit Graph

1219 Commits

Author SHA1 Message Date
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
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
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
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
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
yanxd a272be1686 注册页面的姓氏添加回去 2014-04-03 15:56:33 +08:00
Wen e5470db875 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2014-04-03 08:49:35 +08:00
yanxd 075b1d2143 去除中文在controller里 2014-04-03 08:50:24 +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