jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,135 Commits 98 Branches 0 Tags 0 B
Commit Graph

298 Commits

Author SHA1 Message Date
huangjingquan 10ce6a87c2 修改了一些新建、编辑权限 2013-11-26 16:27:56 +08:00
huangjingquan dc00216603 修改了谈论区框架、列表等 2013-11-25 21:42:59 +08:00
fanqiang cb494f460a Merge branch 'forum' of 10.0.47.245:/home/trustie2 into forum 2013-11-24 20:46:17 +08:00
fanqiang 4f00b12016 添加了论坛加tag功能 2013-11-24 20:45:04 +08:00
yanxd 54c6ed72c1 memos 2013-11-24 20:09:24 +08:00
fanqiang a4d4dd5d97 haha 2013-11-23 20:04:26 +08:00
yanxd 4a51f08009 memos unfinish. 2013-11-23 20:02:15 +08:00
xianbo 9e6414e810 add the show about student number 2013-11-22 17:21:27 +08:00
baiyu 1944cb5bcf 1、修改了个人主页里关注列表的项目和课程的显示错误 
2、修改了竞赛里里竞赛参与者的项目和课程的显示错误
 2013-11-22 10:37:58 +08:00
huangjingquan b8db0f59d2 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2013-11-21 17:12:00 +08:00
yanxd a6d0482804 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2013-11-21 14:46:01 +08:00
baiyu c17148a151 给竞赛添加了“参与人”与“参与竞赛”的大号数字显示 2013-11-21 10:18:46 +08:00
huangjingquan 9b044f8d13 修改了讨论区显示 2013-11-21 09:38:03 +08:00
yanxd 78b65f363f move boards to tab_new, remove board from tool list on sidebar. 2013-11-21 08:59:58 +08:00
yanxd d7f0b42bb7 . 2013-11-20 15:26:26 +08:00
baiyu 6c9c849e7c 1、增加了竞赛的配置功能 
2、增加了课程的成员学号显示
 2013-11-19 15:15:54 +08:00
huangjingquan 16611d8eff 修改了管理员权限 2013-11-16 11:09:10 +08:00
yanxd c4bf9a8f72 refactor gender avatar html.erb => helper 2013-11-15 15:36:45 +08:00
yanxd 26d75af51a fix homework uri error ,after joined xxx_show.html.erb. 2013-11-15 11:23:28 +08:00
yanxd a9ec58f245 prepare fix admin/ 
new file:   app/views/layouts/base_admin.html.erb
 2013-11-15 10:55:11 +08:00
huangjingquan bfcb68efab 课程添加了讨论区 
限制学生下作业
讨论区权限设置
 2013-11-14 19:29:42 +08:00
baiyu 2f8ef03d32 1、增加了参与竞赛的用户列表 
2、区分了个人主页里“粉丝”列表里的项目与课程的计数与显示
3、竞赛发布人的名字改为了全称
 2013-11-14 17:01:06 +08:00
baiyu 005e0802d4 增加了竞赛的“加入” 2013-11-14 15:55:56 +08:00
huangjingquan b22077033a 链接到课程列表 2013-11-14 09:14:38 +08:00
huangjingquan 06e24fa38a 修改了提交作业范围 2013-11-14 09:07:55 +08:00
huangjingquan 3055286cdd 修改了作业不能提交bug 2013-11-13 10:19:47 +08:00
huangjingquan 7935520612 对课程、项目、作业页面 当前位置显示做了隐藏 2013-11-12 10:44:15 +08:00
huangjingquan 59d0cc8e7a 修改了个人主页项目列表 2013-11-09 08:56:34 +08:00
yanxd 56cbca3ce8 fix little words 2013-11-08 17:29:08 +08:00
xianbo 1cfba644f5 fix show of someone who watch and fxi the show of homework exdit 2013-11-08 17:19:57 +08:00
huangjingquan 534c252bcb 修改了课程列表样式，部分国际化 2013-11-08 15:59:08 +08:00
xianbo 7da2f421e0 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 
Conflicts:
	app/views/bids/_new.html.erb
	app/views/projects/feedback.html.erb
 2013-11-08 15:50:28 +08:00
xianbo 3253f1cf28 modify show of some style 2013-11-08 15:49:08 +08:00
huangjingquan 165c392f31 各个列表添加当前位置 2013-11-08 10:29:29 +08:00
xianbo 5032eaabcb fix the show out of the frame and the location of show 2013-11-07 19:14:57 +08:00
xianbo 607eb2c2ff modify shoew of project 2013-11-07 17:04:37 +08:00
huangjingquan d71890526b 课程列表里面超出的部分自动隐藏 2013-11-07 16:35:20 +08:00
fanqiang 9996386fe4 增加课程留言与项目反馈功能，修改了点击课程作业时tab页显示问题 2013-11-07 11:02:32 +08:00
xianbo 73424b0c59 fix 2013-11-06 11:14:42 +08:00
xianbo 8d75d87ef5 fix the link of photo 2013-11-06 10:49:38 +08:00
xianbo 10a14d5e82 add the link to thieris homepage 2013-11-06 10:36:58 +08:00
huangjingquan 14445d0801 页面链接 2013-11-06 10:31:20 +08:00
huangjingquan 9d2f7d1c28 add the link to projects 2013-11-06 09:44:10 +08:00
huangjingquan 17317da314 修改了项目和课程里面配置成员bug 2013-11-06 09:13:02 +08:00
huangjingquan 49c22fbec3 个人主页课程列表里面添加了学期 2013-11-05 20:04:45 +08:00
xianbo 82c597a163 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2013-11-05 15:40:51 +08:00
huangjingquan d6aa6550d7 调整了主页及六个界面的样式 2013-11-05 15:38:12 +08:00
xianbo 83b30b1f9e Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2013-11-05 12:54:57 +08:00
xianbo b61f3ce79f fix showw 2013-11-05 12:54:48 +08:00
huangjingquan 2a4539dc2c 几个主要页面样式 2013-11-05 12:49:57 +08:00
huangjingquan b9b0b06185 修改了一些链接bug 2013-11-05 10:58:23 +08:00
baiyu 231d1f2c4b 增加样式修改了各个模块导航条颜色 2013-11-05 09:17:36 +08:00
xianbo c8c4cecccd fix course link location 2013-11-05 09:17:50 +08:00
huangjingquan ee33583ae1 修改了竞赛页面 
添加了搜索功能
 2013-11-04 22:09:03 +08:00
huangjingquan ea8a87c3a6 需求里面增加了搜索功能 2013-11-04 21:55:47 +08:00
baiyu be20b2c7fe 增加了需求导航，超链接 2013-11-04 21:52:01 +08:00
baiyu f113cb7667 增加了需求导航，样式，超链接 2013-11-04 21:39:45 +08:00
huangjingquan bb994f8b7d 修改了搜索结果显示 2013-11-04 21:38:14 +08:00
baiyu be14669f6b 修改了个人主页导航超链接不能显示全名 2013-11-04 20:54:20 +08:00
huangjingquan c8427fe61e 修改了作业、项目、课程页面 2013-11-04 20:51:47 +08:00
baiyu 20c2feef30 增加了“项目门户”的当前位置导航、样式、配套的超链接 2013-11-04 20:18:44 +08:00
huangjingquan 8ee5381e44 修改了用户个人主页样式 2013-11-04 16:07:31 +08:00
huangjingquan 29f058efba 修改了新建课程的时候报错 2013-11-04 15:30:02 +08:00
huangjingquan 27299586c2 修改了top——mune 2013-11-04 15:20:22 +08:00
yanxd 0b61b4ef5b move flash message to page top in course/setting 2013-11-02 14:22:40 +08:00
yanxd 19b983e103 move flash message to top on base_project 2013-11-02 14:17:15 +08:00
xianbo 003b4704cc fix link to 2013-11-02 12:42:30 +08:00
xianbo c7b38e5bf2 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 
Conflicts:
	app/views/news/index.html.erb
 2013-11-01 15:53:38 +08:00
xianbo ca0f63a817 del the link of .head portrait 2013-11-01 15:48:23 +08:00
baiyu b2080a4470 加入了开课时间，结课时间选项 
增加了课时文本框
相应的增加了显示
 2013-11-01 08:45:24 +08:00
nieguanghui 75c0480071 增加个人活动列表，作业过滤功能，删除课程作业搜索框，修复课程页面以学生角色搜索也会出现新建课程的bug 2013-10-31 21:44:10 +08:00
xianbo c7d96dd183 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2013-10-31 17:29:04 +08:00
xianbo 743ef9856a only teacher can know his tag and modify it 2013-10-31 17:28:10 +08:00
yanxd 369e5eccc0 member_list ,group by roles in course#show 2013-10-31 16:52:06 +08:00
xianbo 08f1453dbd modify some show in create course and project 2013-10-31 16:44:05 +08:00
xianbo 0706fdd6dc let the homework show under class in homeworkpager 2013-10-31 15:58:14 +08:00
huangjingquan 477e299e24 修改了用户主页课程列表显示 
去掉了作业和关注需求，将关注需求统计显示
 2013-10-31 15:18:42 +08:00
yanxd 0b04b28024 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2013-10-31 10:58:20 +08:00
yanxd 2286fbeff5 members split (teacher,student) in course 2013-10-31 10:57:46 +08:00
xianbo 5dfac1d8e3 add modify about homework and modify the show of toll bar 2013-10-30 22:17:51 +08:00
baiyu 5fb0bc945c 修改了删除“我的账号”后的小问题 2013-10-30 21:22:44 +08:00
baiyu 9319a7f87b 去掉了top_bar上“我的账号” 2013-10-30 21:10:28 +08:00
huangjingquan b113719b46 课程里面添加了图片上传功能 2013-10-30 20:50:35 +08:00
yanxd 4bef2eee24 course can be shared files by project's member 2013-10-22 09:02:48 +08:00
yanxd 5d0b5812b3 share completed with fq, xianbo 2013-10-21 08:57:55 +08:00
baiyu a44713ba6d 修改了需求页面显示 2013-10-19 16:16:54 +08:00
baiyu 0206d3f2c3 需求里面添加了用户和项目与需求的联系 2013-10-19 09:35:14 +08:00
baiyu 9fa9aa0fb8 “返回课程”“返回主页”按钮变色。改边距，边框变圆润 2013-10-17 16:22:26 +08:00
yanxd 081a8e9825 fixed issue#319 2013-10-17 10:31:41 +08:00
baiyu 1be0a7d23f 修改了“返回个人主页”和“返回课程”，修改了样式 2013-10-16 22:02:05 +08:00
xianbo 520c5843ce modify homework show and the link of style 2013-10-16 17:02:38 +08:00
huangjingquan 29e2a4c70b 修改了作业提交时学号显示错误 
作业页面增加了内容
 2013-10-16 10:53:11 +08:00
xianbo 5a234e6fb2 add the link of project contributers&&followers count number 2013-10-15 17:11:10 +08:00
nieguanghui 17a4f14f2a 修复课程和项目搜索bug 2013-10-15 16:29:35 +08:00
xianbo 13e7280245 1.modify show of data 
2.modify tool bar show when differ user login
 2013-10-15 09:40:26 +08:00
yanxd 20883b92a5 add button css, fix js bug, add create project to push homework. 2013-10-14 21:45:10 +08:00
xianbo 8c675c2a96 add show about setting about course 2013-10-14 16:38:52 +08:00
xianbo 2bd110c550 delete the icon show about course 2013-10-12 14:35:19 +08:00
huangjingquan 8082bb456f 为竞赛添加新的页面 2013-10-12 10:45:48 +08:00
baiyu 13a2cfe644 修改了fork页面，增加了教师超链接 2013-10-10 23:02:15 +08:00