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

598 Commits

Author SHA1 Message Date
yanxd 56cbca3ce8 fix little words 2013-11-08 17:29:08 +08:00
huangjingquan f13665959a 作业列表样式修改 
项目新闻样式修改
 2013-11-08 17:26:47 +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 6e9f3d53e5 新增一个user列表页面 2013-11-08 11:25:33 +08:00
nieguanghui dd6563cf8c 优化用户搜索 2013-11-08 11:01:28 +08:00
baiyu 8f216a6723 统一了各个模块的按钮，修改了部分国际化 2013-11-08 10:53:18 +08:00
huangjingquan 165c392f31 各个列表添加当前位置 2013-11-08 10:29:29 +08:00
baiyu a52944811b 修正了用户列表里“参与了xx个项目”改为“参与了XX个项目”和“参与了XX个课程” 2013-11-08 09:02:14 +08:00
nieguanghui 3966e0bc0b 修复课程列表bug 2013-11-08 08:57:48 +08:00
xianbo 5032eaabcb fix the show out of the frame and the location of show 2013-11-07 19:14:57 +08:00
yanxd 7c4e62cc40 add time describe 2013-11-07 17:21:32 +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
nieguanghui 50b91e3942 修改按钮样式，增加附件过滤 2013-11-07 15:58:15 +08:00
fanqiang 9996386fe4 增加课程留言与项目反馈功能，修改了点击课程作业时tab页显示问题 2013-11-07 11:02:32 +08:00
huangjingquan 2fd63c80b3 修改了留言显示 2013-11-06 17:21:18 +08:00
huangjingquan 6499352d8e 修改了无项目时候 新建按钮重复提示 2013-11-06 17:00:14 +08:00
nieguanghui 8df3bcf76f 修改评分显示颜色，重构课程列表显示部分代码 2013-11-06 16:43:07 +08:00
nieguanghui eeb22ab4a6 fix some little bug 2013-11-06 15:46:38 +08:00
xianbo 73424b0c59 fix 2013-11-06 11:14:42 +08:00
huangjingquan bf2ae17e05 修改了数据读取错误 2013-11-06 11:10:26 +08:00
baiyu 3c9605c551 修复了课程配置里丢失的“开课时间”“结课时间”“课时” 2013-11-06 11:06:08 +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
nieguanghui 0c849c3216 解决按钮冲突 2013-11-06 10:28:18 +08:00
huangjingquan 9d2f7d1c28 add the link to projects 2013-11-06 09:44:10 +08:00
baiyu 0f3eb9cf87 kec 2013-11-06 09:25:05 +08:00
huangjingquan 17317da314 修改了项目和课程里面配置成员bug 2013-11-06 09:13:02 +08:00
nieguanghui be72746a80 样式微调 2013-11-05 20:51:33 +08:00
nieguanghui 2b10258ae1 修改课程列表显示样式 2013-11-05 20:46:38 +08:00
huangjingquan 49c22fbec3 个人主页课程列表里面添加了学期 2013-11-05 20:04:45 +08:00
yanxd b7027405ce fix some little bug! 2013-11-05 16:53:00 +08:00
xianbo 88084990bf fix 2013-11-05 15:59:12 +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
yanxd b6df32e029 fix files under_line 2013-11-05 11:14:45 +08:00
huangjingquan b9b0b06185 修改了一些链接bug 2013-11-05 10:58:23 +08:00
baiyu 231d1f2c4b 增加样式修改了各个模块导航条颜色 2013-11-05 09:17:36 +08:00
xianbo 8e922ef273 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2013-11-05 09:19:52 +08:00
xianbo c8c4cecccd fix course link location 2013-11-05 09:17:50 +08:00
nieguanghui a80e77bd01 修复bug 2013-11-05 08:30:33 +08:00
huangjingquan ee33583ae1 修改了竞赛页面 
添加了搜索功能
 2013-11-04 22:09:03 +08:00
nieguanghui 5d83a03e5f Merge remote-tracking branch 'origin/develop' into develop 2013-11-04 22:01:06 +08:00
yanxd 397eb11dca refactor memberlist 2013-11-04 22:00:06 +08:00
nieguanghui c6824c539b 修复作业搜索条出现在竞赛，需求页面的bug 2013-11-04 21:58:40 +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
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
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 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 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 5fb0bc945c 修改了删除“我的账号”后的小问题 2013-10-30 21:22:44 +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
nieguanghui 224a194759 修复成员 bug，修复作业显示bug‘ 2013-10-30 10:45:37 +08:00