yanxd
|
2f47cc1cd8
|
Merge branch 'test', remote-tracking branch 'origin/szzh' into develop
|
2014-05-08 18:15:58 +08:00 |
 yanxd
|
d257f4e853
|
随便关闭课程禁止//临时
|
2014-05-06 09:16:48 +08:00 |
 kg
|
0f51480bab
|
amend course search
|
2014-04-29 10:36:09 +08:00 |
|
kg
|
e9bd8a8f3e
|
revise project index,course,search
|
2014-04-28 09:53:22 +08:00 |
|
yanxd
|
8f5958abc1
|
mao
|
2014-04-25 16:08:00 +08:00 |
|
yanxd
|
f4595dfcd2
|
修改部分拍段project、course方式
projectlist 报错
|
2014-04-25 08:29:20 +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
|
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 |
Wen
|
cf762e6aa3
|
bug fix~
|
2014-04-23 21:35:03 +08:00 |
|
Wen
|
473a44d11a
|
学校-课程模式！
|
2014-04-23 21:20:03 +08:00 |
|
Wen
|
3dbe7c5896
|
课程的学校ID自动设置为开课教师的学校ID
去掉课程添加界面上的学校选择
|
2014-04-22 15:25:50 +08:00 |
 wanglinchun
|
9ac0cbe6a3
|
Merge branch 'competition' into develop
Conflicts:
Gemfile
app/controllers/tags_controller.rb
app/views/layouts/_base_header.html.erb
config/routes.rb
db/schema.rb
|
2014-04-18 16:03:52 +08:00 |
|
Wen
|
5699a947ec
|
建立了学校与用户的关联
课程与用户的学校字段均为学校id而不再是学校名称
页面暂时改了想到的地方= =
|
2014-04-17 17:36:41 +08:00 |
|
Wen
|
c34f2da385
|
课程注册与用户注册页面的学校选择全部搞定！
|
2014-04-15 17:37:38 +08:00 |
|
yanxd
|
634dd15be3
|
project html
|
2014-04-12 09:40:26 +08:00 |
|
yanxd
|
96fcdbacf2
|
课程里搜东西 没有内容项目里也跳出来的问题
|
2014-04-11 16:43:05 +08:00 |
|
wanglinchun
|
120e84cfc7
|
新竞赛代码移植
|
2014-04-03 17:26:56 +08:00 |
|
Wen
|
24d7234fec
|
作业顺序按照截止日期排序
|
2014-04-02 16:04:14 +08:00 |
|
Wen
|
4448fdfaca
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-02 14:44:10 +08:00 |
 alan
|
5c2a037a8f
|
user dup
|
2014-04-01 21:04:10 +08:00 |
|
yanxd
|
850ff6194f
|
issue#509,#510
|
2014-03-30 17:03:15 +08:00 |
|
yanxd
|
8c251da25d
|
Bug：新建作业时菜单栏第一个显示蓝色，应该是第二个显示蓝色
|
2014-03-30 15:46:56 +08:00 |
|
yanxd
|
35d1c33a29
|
...
|
2014-03-27 10:53:45 +08:00 |
|
yanxd
|
404568be89
|
留言url显示，以及留言分页的url处理
|
2014-03-22 09:27:29 +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
|
9c54c9c1b6
|
重构项目和课程排序部分，修复分页数量错误
|
2014-03-21 16:50:04 +08:00 |
|
yanxd
|
6877ff7e8d
|
解决设置跳转404.bug
|
2014-03-20 14:17:48 +08:00 |
|
yanxd
|
d9bc17c1ea
|
留言权限， basecourse关闭课程重构
|
2014-03-19 17:32:32 +08:00 |
|
yanxd
|
e0c87996bf
|
改了个课程截至日期，并且在courses_controller中设置了过期不允许加入的设定，目测没什么问题，明天再看看
|
2014-03-17 22:43:38 +08:00 |
|
yanxd
|
2878c57d43
|
新建作业 除了学生
|
2014-03-10 21:37:00 +08:00 |
|
yanxd
|
8963cc3a3c
|
邮件问题一
|
2014-03-07 11:28:52 +08:00 |
|
wanglinchun
|
b45332bab0
|
课程默认活跃度排序
|
2014-01-24 14:29:24 +08:00 |
 baiyu
|
13fdbde1cf
|
个人分数
|
2014-01-16 10:34:39 +08:00 |
|
yanxd
|
90a37a5f4e
|
竞赛众包的留言修改
|
2014-01-02 17:29:46 +08:00 |
|
yanxd
|
9cd931cb7f
|
ajax
|
2013-12-30 20:53:48 +08:00 |
|
yanxd
|
ebc803a88a
|
项目留言.
|
2013-12-30 17:13:44 +08:00 |
 nieguanghui
|
36289eba41
|
modified projects
|
2013-12-30 16:03:28 +08:00 |
|
yanxd
|
4c4e725b5c
|
project leave message.
|
2013-12-30 08:47:45 +08:00 |
|
yanxd
|
1d962b98d3
|
model project leave message
|
2013-12-29 19:35:52 +08:00 |
|
nieguanghui
|
c6f657ed8c
|
重构排序代码
|
2013-12-17 16:59:07 +08:00 |
|
yanxd
|
265e0f246b
|
问题六
|
2013-12-11 10:00:38 +08:00 |
|
yanxd
|
c86b85cb3d
|
.bug
|
2013-12-07 10:43:31 +08:00 |
|
nieguanghui
|
5b10981754
|
解决项目按时间排序bug
|
2013-12-07 10:10:54 +08:00 |
|
nieguanghui
|
02b5f2bafa
|
解决项目跑到课程里面的bug
|
2013-12-07 09:47:54 +08:00 |
|
yanxd
|
0609c5c7ea
|
1.增加帖子回复时间查询语句
2.帖子回复的数量在数据库中有字段
3.新建帖子失败错误提示
4.下载里程碑top_menu删掉，
5.学生分页，分页方法封装
|
2013-12-02 17:27:15 +08:00 |