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

656 Commits

Author SHA1 Message Date
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 2a6171ca52 refactor course helper 2013-11-04 15:00:08 +08:00
huangjingquan 7e7534041e 课程列表新的权限设置 2013-11-04 09:57:36 +08:00
yanxd ce7b2ceba0 fix teacher/student search Identifier 2013-11-04 09:45:56 +08:00
huangjingquan c93ca4d2ed 添加了作业截止时间提醒功能！ 2013-11-02 15:43:38 +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
huangjingquan 84327892a9 加入/退出课程权限修改 2013-11-02 13:00:32 +08:00
xianbo 003b4704cc fix link to 2013-11-02 12:42:30 +08:00
baiyu 606b2d0587 在我的主页的“课程”列表里加入了“主讲教师” 2013-11-02 11:06:22 +08:00
huangjingquan fb54fcbe86 修改了新闻页面两个图像重复bug 2013-11-02 10:45:58 +08:00
huangjingquan 09eb16ad9a 修改了项目和课程里面成员配置显示错误 2013-11-02 10:34:53 +08:00
huangjingquan ac2b90ecfd 退出课程加入权限 2013-11-01 16:08:41 +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
nieguanghui cab092cd04 修改课程默认排序方式 2013-11-01 11:17:24 +08:00
nieguanghui 583c022048 修复作业列表搜索bug 2013-11-01 10:48:02 +08:00
huangjingquan 775ebc3607 新闻界面添加删除功能 2013-11-01 10:01:16 +08:00
huangjingquan 5febe8a58d 个人主页课程列表加入了“退出课程”和加入课程按钮 2013-11-01 09:06:06 +08:00
baiyu b2080a4470 加入了开课时间，结课时间选项 
增加了课时文本框
相应的增加了显示
 2013-11-01 08:45:24 +08:00
yanxd 0a21b87714 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2013-11-01 08:19:08 +08:00
nieguanghui db25900336 修复新建项目的时候相关信息写入丢失bug 2013-10-31 22:07:31 +08:00
nieguanghui 75c0480071 增加个人活动列表，作业过滤功能，删除课程作业搜索框，修复课程页面以学生角色搜索也会出现新建课程的bug 2013-10-31 21:44:10 +08:00
yanxd 54d9566a7b Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2013-10-31 20:14:27 +08:00
yanxd b55c5d20a3 added activity info from event, warning. 2013-10-31 20:13:49 +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 67d228142a add the root in bid modify about homework 2013-10-31 16:33:15 +08:00
xianbo 9f8c764053 modify new cresate is_piublic? and leave some module about select 2013-10-31 16:21:34 +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 f55a06e76d 1、"活动“变成了动态，”只看自己“改成了”我的动态“ 
2、解释了项目是什么
 2013-10-30 22:04:47 +08:00
baiyu 9b9745ea0a 对于应标需求，提交作业，提交竞赛作品成功后闪出的flash做了区别 2013-10-30 21:46:40 +08:00
baiyu 5fb0bc945c 修改了删除“我的账号”后的小问题 2013-10-30 21:22:44 +08:00
yanxd b617f3d42f fix my welcome#index bug 2013-10-30 21:15:00 +08:00
baiyu 9319a7f87b 去掉了top_bar上“我的账号” 2013-10-30 21:10:28 +08:00
yanxd 868025bb40 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2013-10-30 20:57:17 +08:00
yanxd 67216ca463 fix back_url bug 2013-10-30 20:56:24 +08:00
huangjingquan b113719b46 课程里面添加了图片上传功能 2013-10-30 20:50:35 +08:00
yanxd 8a37f924f9 remove nyancss 2013-10-30 20:30:56 +08:00
yanxd dd0c087209 rest tan backurl 2013-10-30 11:23:40 +08:00
nieguanghui 224a194759 修复成员 bug，修复作业显示bug‘ 2013-10-30 10:45:37 +08:00
xianbo 1f419c936d del the back_url to let the different identity change has a correct url 2013-10-30 08:51:58 +08:00
xianbo 1f09bfbab1 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2013-10-28 20:09:43 +08:00
xianbo e9856b3524 modify the style of the projects witch show 2013-10-28 20:09:15 +08:00
nieguanghui 1f8c10e48a 修复bug 2013-10-28 08:51:15 +08:00
xianbo cbe22e4e60 modify the judge of the nil class of identity in app/views/bids/_project_list.html.erb 2013-10-26 15:04:00 +08:00
yanxd 6dec8a9312 share previews 2013-10-25 15:46:14 +08:00
xianbo a50aff3fb4 1.add special reward 
2.give a root controller in bid controller && give the administrator the root can change the reward who is deadine.
 2013-10-24 20:36:57 +08:00
xianbo 2fa6276829 fix natural 2013-10-24 10:13:37 +08:00
nieguanghui 39580a04a2 修复项目列表成员显示bug 2013-10-24 09:46:22 +08:00
xianbo 21ffbe637e Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 
Conflicts:
	app/views/projects/_project.html.erb
	app/views/projects/member.html.erb
	app/views/users/index.html.erb
	config/locales/zh.yml
	db/schema.rb
	files/2013/10/131007102834__my_course.html.erb
 2013-10-24 08:33:07 +08:00
xianbo 2589d429b0 add the project what one watch 2013-10-24 08:24:56 +08:00
yanxd 666806ae28 fixed little bug 2013-10-22 16:15:27 +08:00
yanxd df73f34e71 share linkto better 2013-10-22 14:46:33 +08:00
nieguanghui cf40f9ff02 fix course list bug 2013-10-22 10:02:49 +08:00
yanxd 4bef2eee24 course can be shared files by project's member 2013-10-22 09:02:48 +08:00
nieguanghui 5ce9bcdb2c 解决竞赛，需求，作业列表搜索bug 2013-10-21 21:16:41 +08:00
xianbo 3f4a60b462 fix show 2013-10-21 14:43:22 +08:00
xianbo 5a1bb0f2d4 fix bug in arrange to net 2013-10-21 11:21:07 +08:00
nieguanghui b04fe3d1bb 增加项目评分 个人评分 ，个人在项目中的评分机制 2013-10-21 09:42:09 +08:00
yanxd 5d0b5812b3 share completed with fq, xianbo 2013-10-21 08:57:55 +08:00
yanxd dde65a5895 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2013-10-21 08:52:02 +08:00
baiyu a44713ba6d 修改了需求页面显示 2013-10-19 16:16:54 +08:00
baiyu ecdeaf123e 修改了部分国际化 2013-10-19 15:39:53 +08:00
baiyu 0206d3f2c3 需求里面添加了用户和项目与需求的联系 2013-10-19 09:35:14 +08:00
yanxd e2447b4c88 truncate textilizable 2013-10-18 10:00:06 +08:00
baiyu 9fa9aa0fb8 “返回课程”“返回主页”按钮变色。改边距，边框变圆润 2013-10-17 16:22:26 +08:00
yanxd ab5d8853b5 fixed issue#314 2013-10-17 16:14:35 +08:00
yanxd 081a8e9825 fixed issue#319 2013-10-17 10:31:41 +08:00
baiyu 8ec86a27c4 xuehao 2013-10-16 22:14:49 +08:00
baiyu 5b48826faf 修改了学号显示错误 2013-10-16 22:10:58 +08:00
baiyu 1be0a7d23f 修改了“返回个人主页”和“返回课程”，修改了样式 2013-10-16 22:02:05 +08:00
baiyu 19b030dd23 修改了需求和作业列表显示混乱 2013-10-16 21:46:54 +08:00
yanxd abe52df8d0 Merge remote-tracking branch 'origin/develop' into develop 2013-10-16 21:11:46 +08:00
yanxd 332bc0765d 240 characters or less limited in activity info. ===> projects#show 2013-10-16 21:10:30 +08:00
xianbo 520c5843ce modify homework show and the link of style 2013-10-16 17:02:38 +08:00
yanxd 534457547e Merge remote-tracking branch 'origin/develop' into develop 2013-10-16 10:59:49 +08:00
yanxd 69869a05c9 reverse projects list, add explain to role. 2013-10-16 10:58:21 +08:00
huangjingquan 29e2a4c70b 修改了作业提交时学号显示错误 
作业页面增加了内容
 2013-10-16 10:53:11 +08:00
huangjingquan 41a74a5254 提示信息国际化 2013-10-16 09:20:37 +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
yanxd ec63fc41bb add link in project/course list page, joinBUtton renamed. 2013-10-15 14:46:20 +08:00
yanxd e1d8c8a992 remove nyan css & move another file 2013-10-15 11:06:19 +08:00
baiyu 8335c111c7 1、修改了“加入课程”位置 
2、修改了我的账号里的格式
 2013-10-15 09:42:27 +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
huangjingquan 6e10f16c68 添加了注释 
修改了作业提交显示错误（显示成需求）
 2013-10-14 22:40:34 +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 0238001721 modify destroy project and user can't destroy biding_project 2013-10-14 20:57:31 +08:00
xianbo 8c675c2a96 add show about setting about course 2013-10-14 16:38:52 +08:00
xianbo abc163887e fix 2013-10-14 16:38:51 +08:00
fanqiang 2fbf025c2f 调整需求的评价，隐藏个人账户的首选项内容 2013-10-14 10:09:10 +08:00
huangjingquan bcb66f2b32 在个人主页项目里面添加新建按钮 2013-10-13 15:26:41 +08:00
huangjingquan 673850bd03 fix 2013-10-12 17:42:19 +08:00
huangjingquan 19ebd48a95 修改了作业列表无法显示 2013-10-12 17:21:50 +08:00
huangjingquan 00cef03049 修改了个人主页里关注需求全部需求改成只关注的需求 2013-10-12 16:23:25 +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
yanxd a5cdbc8e92 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2013-10-12 10:37:37 +08:00
yanxd f1a31c7f6b 提升头像图片显示分辨力 2013-10-12 10:36:50 +08:00
xianbo d3f46adc34 fix 2013-10-12 10:08:45 +08:00
xianbo fd14457446 add delete homework in course 2013-10-12 10:05:31 +08:00
xianbo d7f7ff5fa9 delete homework 2013-10-12 10:05:30 +08:00
huangjingquan 8ce8de09cb 修改了个人主页课程列表 2013-10-12 08:53:45 +08:00
huangjingquan c49209cbfb 将课程和作业分开 
作业单独一个tabs
 2013-10-11 20:25:24 +08:00
huangjingquan 508eee45f2 修改了加入课程弹框显示错误！ 2013-10-11 09:27:07 +08:00
baiyu 6676110b11 修改了教授丢失 2013-10-11 09:05:03 +08:00
baiyu 13a2cfe644 修改了fork页面，增加了教师超链接 2013-10-10 23:02:15 +08:00
huangjingquan 3ff443b7b6 修改了自己的作业不能关注 
只能关注别人的作业
 2013-10-10 22:45:00 +08:00
huangjingquan 0a5013edd1 修改了作业界面显示 
修改了发布作业的时候在个人动态里面显示做（之前显示需求）
 2013-10-10 22:36:35 +08:00
fanqiang 962842d841 修改了提交作业数量显示问题，修改了创建需求的种类选择问题 2013-10-10 21:56:27 +08:00
huangjingquan ff21bca683 修改了老师访问学生页面的时候bug 2013-10-10 21:43:49 +08:00
xianbo 956aa3d0c1 remove forum block in course setting 2013-10-10 21:41:42 +08:00
huangjingquan e25425d9a7 用户看别人课程主页时显示问题 2013-10-10 21:33:52 +08:00
nieguanghui 8703709bd0 解决了课程创建时设置私有依旧显示在课程列表的bug 2013-10-10 21:11:42 +08:00
wanglinchun 48a0f2f409 个人主页，课程相关国际化 2013-10-10 17:07:43 +08:00
huangjingquan a0c6a183fe 修改了个人主页的关注需求里面只显示需求不显示作业 2013-10-10 16:04:59 +08:00
xianbo 543279eb84 add course filter 2013-10-10 15:05:27 +08:00
huangjingquan 64cddc8687 修改了课程设置里面bug 
角色改成英文
 2013-10-10 10:36:56 +08:00
xianbo b0d413a216 modify the admin select 2013-10-10 10:22:32 +08:00
xianbo 677bc4060b fix bug about delete project 2013-10-09 22:31:57 +08:00
xianbo 3b6f0e3d34 modify delete project and user and define a course is a public 2013-10-09 22:26:03 +08:00
huangjingquan 72f2793b0a 修改了关注的显示 2013-10-09 21:53:07 +08:00
xianbo ad597695f5 fix register user.current bug 
and course is show or hidden
 2013-10-09 20:56:15 +08:00
huangjingquan bf081b95bd 学生自己的主页课程里面添加加入课程链接 
竞赛里面 修复列表排序bug
新建竞赛的时候 修复了几个bug
 2013-10-09 17:27:42 +08:00
baiyu 0226785f51 作业“关注”居左 2013-10-09 17:00:09 +08:00
baiyu 011c38988a 需求列表显示 2013-10-09 16:50:20 +08:00
fanqiang c75391b3a0 修改了加入课程窗口里文本框的长度 2013-10-09 16:47:54 +08:00
huangjingquan 82ce0ac8da 修改了参加竞标成提交作业 2013-10-09 16:46:56 +08:00
baiyu 39c45dff30 1、修改了注册里的问题 
2、作业名称改为靠左
3、修改了提交作业、参加竞赛等混乱
4、修改了top bar的字体大小
 2013-10-09 16:41:02 +08:00
huangjingquan 2a959a9b65 添加了学号 2013-10-09 16:28:24 +08:00
huangjingquan 9e77d3e001 修改了作业课程里面一些Bug 2013-10-09 16:14:11 +08:00
fanqiang 7d2bdbc935 在课程列表中添加加入课程按钮 
在课程主页中添加关注按钮，修改加入课程和关注的样式
修改作业列表中提交作业的数量显示问题
 2013-10-09 16:04:23 +08:00
huangjingquan b14f0e2901 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2013-10-08 22:21:24 +08:00
huangjingquan e19fe844a2 新增 2013-10-08 22:20:48 +08:00
baiyu aefd9b545b 1、删除了“企业”里的“课程” 
2、减小了顶和踩的图标
3、更改了课程图标
 2013-10-08 22:15:50 +08:00
huangjingquan 2c45fb8760 竞赛 2013-10-08 22:12:17 +08:00
fanqiang 8e51ea7327 修改了企业注册与修改企业资料过程，以及一些企业主页中的显示细节 2013-10-08 16:31:28 +08:00
huangjingquan 08aa5be7df 解决我的作业不显示问题 2013-10-07 22:50:20 +08:00