Commit Graph

1368 Commits

Author SHA1 Message Date
Wen 30eb2d79f2 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2014-03-21 13:55:12 +08:00
xianbo cd246fc9c2 fix redmine 2014-03-21 11:29:06 +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
xianbo 6198c3565b fix redmine.rb 2014-03-20 16:41:11 +08:00
Wen 78854685d4 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2014-03-20 16:40:30 +08:00
Wen 337885503e school表done
建立了school和course的一对多关联
2014-03-20 16:19:16 +08:00
Wen 0b1ec7a1c5 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2014-03-20 16:18:14 +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
Wen 7d6bd2bf61 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2014-03-20 09:46:33 +08:00
xianbo 0b016e7c11 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2014-03-19 21:46:18 +08:00
xianbo 173181add2 add constant about domain 2014-03-19 21:42:18 +08:00
Wen bfec67a446 删除了courses表中的school列。
重新设计下表= =
2014-03-19 17:36:38 +08:00
yanxd d9bc17c1ea 留言权限, basecourse关闭课程重构 2014-03-19 17:32:32 +08:00
Wen 3c0f41a64c Merge branch 'develop' into experiment 2014-03-19 17:14:06 +08:00
yanxd f9e9404471 过滤器过滤加入课程的行为,不再进行n多判断 2014-03-19 15:50:02 +08:00
Wen ccca1f7f5f 修改大学表,删除列City 2014-03-18 15:26:39 +08:00
Wen ebd09e4b1a 大学表创建 2014-03-18 15:19:31 +08:00
Wen 5200e238a9 = =| 2014-03-18 09:28:40 +08:00
Wen ac0a05bcc7 - - 2014-03-18 09:22:33 +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 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 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
yanxd 62ea2b3849 下拉文件菜单 2014-03-11 10:45:01 +08:00
wanglinchun 6b8e51211a 将讨论吧中的删除符号改为删除 2014-03-11 09:30:04 +08:00
yanxd bc6950fbb0 姓氏弄出来 2014-03-11 08:22:27 +08:00
yanxd 2878c57d43 新建作业 除了学生 2014-03-10 21:37:00 +08:00
wanglinchun 15550ead3e 修改讨论吧中引用的显示 2014-03-10 17:34:19 +08:00
yanxd f614ab33e2 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2014-03-08 11:09:02 +08:00
yanxd 46b508be2b 首页 论坛发帖权限 2014-03-08 11:08:48 +08:00
wanglinchun abb27025d3 修改course门户主页中新开课程后更多的链接问题 2014-03-08 09:55:00 +08:00
yanxd e7841cb512 fix 2014-03-07 20:34:17 +08:00
yanxd ce1e6c49f1 改留言 2014-03-07 16:49:45 +08:00
yanxd 8963cc3a3c 邮件问题一 2014-03-07 11:28:52 +08:00
yanxd 3b7e8483e3 搜索算法 2014-03-07 08:53:05 +08:00