Commit Graph

1059 Commits

Author SHA1 Message Date
yanxd 52cffd3864 icon 2014-01-16 11:04:11 +08:00
baiyu ff9bde0b9f Merge branch 'bai' into develop 2014-01-16 10:35:17 +08:00
baiyu 13fdbde1cf 个人分数 2014-01-16 10:34:39 +08:00
nieguanghui c4138ffe05 changge color 2014-01-16 10:21:34 +08:00
yanxd 5261def716 highlight 2014-01-16 10:19:19 +08:00
nieguanghui 346e9574ca Merge branch 'bigchange' of 10.0.47.245:/home/trustie2 into bigchange 2014-01-16 10:17:51 +08:00
nieguanghui 18b4a3ff5c changge 2014-01-16 10:17:43 +08:00
yanxd 00022ce9fe icon search controller 2014-01-16 09:47:50 +08:00
yanxd 76f69973b4 fix search incalid byte sequence in utf-8 2014-01-15 21:00:07 +08:00
nieguanghui 8d788fac45 modified 2014-01-15 20:38:58 +08:00
nieguanghui 33df4327b5 Merge branch 'bigchange' of 10.0.47.245:/home/trustie2 into bigchange 2014-01-15 20:05:20 +08:00
yanxd ee570ea0ac 1 2014-01-15 20:06:49 +08:00
nieguanghui a54158c938 say something 2014-01-15 20:05:13 +08:00
nieguanghui 3f54d24e52 Merge branch 'bigchange' of 10.0.47.245:/home/trustie2 into bigchange 2014-01-15 19:41:19 +08:00
nieguanghui a687bed84c serach 2014-01-15 19:41:12 +08:00
yanxd a5c9d9c31e um... 2014-01-15 17:28:53 +08:00
yanxd b825d2b7b5 css... 2014-01-15 16:02:41 +08:00
yanxd 45f8b15083 paginate 2014-01-15 14:28:36 +08:00
yanxd 61380a5e1a 文件来源 2014-01-15 10:40:37 +08:00
yanxd 2bb44456d6 search 2014-01-14 20:48:43 +08:00
yanxd 91a6c13ced search 2014-01-14 17:21:27 +08:00
nieguanghui 6a7a6b1be6 modified searching result for stores 2014-01-14 16:18:48 +08:00
yanxd 997b90c3b2 add label on box 2014-01-14 15:41:56 +08:00
yanxd f1f08e150b modify search bar action http 2014-01-14 15:18:18 +08:00
yanxd d34253bdfc search framework 2014-01-14 15:01:11 +08:00
yanxd 41fefd0b37 去除隐藏项目课程内的内容, 下载文件名缩略显示鼠标移上去浮动显示所有 完整文件名 2014-01-14 10:24:13 +08:00
nieguanghui 54aef57287 download 2014-01-14 10:12:55 +08:00
yanxd d09e995f52 class 2014-01-14 09:43:53 +08:00
nieguanghui e174c710ef add url to files 2014-01-14 09:33:00 +08:00
yanxd 85e89f5c09 storeshelper attachFromUrl 2014-01-14 09:29:28 +08:00
nieguanghui dadf9da477 modified something 2014-01-14 09:24:46 +08:00
nieguanghui db60ece59f Merge branch 'bigchange' of 10.0.47.245:/home/trustie2 into bigchange 2014-01-13 21:32:40 +08:00
nieguanghui b2f2097cd4 ellipsis 2014-01-13 21:32:34 +08:00
yanxd 308df9eda5 z 2014-01-13 21:24:01 +08:00
yanxd 95e77464ad downloads desc 2014-01-13 21:02:45 +08:00
nieguanghui d0d36186df modified table style 2014-01-13 20:46:27 +08:00
yanxd fd25c5ed30 ... 2014-01-13 20:26:40 +08:00
nieguanghui e460896fa2 nothing 2014-01-13 16:40:18 +08:00
nieguanghui e5a3fea2b2 Merge branch 'bigchange' of 10.0.47.245:/home/trustie2 into bigchange 2014-01-13 16:32:34 +08:00
yanxd 5a797ba474 s 2014-01-13 16:34:24 +08:00
nieguanghui d49e51f5a6 Merge branch 'bigchange' of 10.0.47.245:/home/trustie2 into bigchange 2014-01-13 16:29:19 +08:00
nieguanghui 405cf70b42 modified table style 2014-01-13 16:29:02 +08:00
yanxd f91d94fd4c fetch stores/index instance_object 2014-01-13 16:24:13 +08:00
yanxd 3d2c0ba721 add activityBox to project/course/contest html 2014-01-13 08:23:35 +08:00
yanxd 289b0581df stores css 2014-01-11 09:08:15 +08:00
yanxd 9dd6bdc0ae store framework => route, and refactory debug params in html/footer. 2014-01-10 09:19:50 +08:00
yanxd 28bc3c1894 图标and页面不换行顶出边界 2014-01-09 16:57:28 +08:00
baiyu db1874fa07 评分 2014-01-09 10:58:05 +08:00
yanxd f728061d05 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2014-01-09 09:16:09 +08:00
yanxd 16c4b0e18c board#new css 2014-01-09 09:15:58 +08:00
wanglinchun 6b5f1827a6 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2014-01-09 08:45:26 +08:00
wanglinchun 7a4fe59978 实践课程=>课程实践 2014-01-09 08:45:16 +08:00
yanxd 71775000a4 新建新闻css,教师新建课程 2014-01-09 08:34:30 +08:00
yanxd ea289ae036 竞赛中,创建项目404问题 2014-01-08 20:53:37 +08:00
yanxd b9967074dc 新闻界面修改,new页面bug修复 2014-01-08 20:18:32 +08:00
yanxd 789acee429 缺陷查询飘来飘去 2014-01-07 08:20:26 +08:00
yanxd eafbb20807 匿名用户禁止回复 2014-01-06 21:11:20 +08:00
yanxd 4b8a4c82c9 学号在作业里显示问题,首页时间显示不确定问题,项目缺陷滑动效果乱跳问题。 2014-01-06 19:29:18 +08:00
yanxd 38b1f69aa5 fix bug in homework.html/ with admin or user who is belong to jfm. 2014-01-04 17:29:35 +08:00
yanxd 343b656c0f Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2014-01-03 22:18:40 +08:00
yanxd d23b196eaa zz 2014-01-03 22:18:22 +08:00
wanglinchun 97749cfd8e Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2014-01-03 21:44:25 +08:00
wanglinchun 1c374a4530 Merge branch 'wordh' into develop 2014-01-03 21:43:55 +08:00
yanxd fccd83e199 it i 2014-01-03 21:41:54 +08:00
wanglinchun 4167e8bb8f 修改了门户网站中用户动态的[进入附件列表]显示颜色 2014-01-03 21:36:47 +08:00
yanxd 4587c840b1 a 2014-01-03 21:33:01 +08:00
yanxd 4c0acc5f3e welcome css 2014-01-03 21:02:30 +08:00
yanxd 61f0eef6f3 words/new reply insteads of project new reply form 2014-01-03 11:27:16 +08:00
yanxd d0601aa671 Merge branch 'wordh' into develop 2014-01-03 10:34:17 +08:00
yanxd d26f274a96 Merge branch 'wordh' of 10.0.47.245:/home/trustie2 into wordh 2014-01-03 10:33:31 +08:00
yanxd d114c6abed add remark to words_controller 2014-01-03 10:33:06 +08:00
nieguanghui 1581a3a153 Merge branch 'wordh' of 10.0.47.245:/home/trustie2 into wordh 2014-01-03 10:29:42 +08:00
nieguanghui d0908c9132 front page 2014-01-03 10:29:29 +08:00
yanxd 4abea36f3b remove label_leave_me_message from user show erb 2014-01-03 08:53:09 +08:00
yanxd 1881e9726c zz 2014-01-02 21:36:51 +08:00
yanxd 123817df93 tools 顺序
首页讨论区去掉项目讨论区
所有留言删除功能
标题显示错误
2014-01-02 21:20:57 +08:00
yanxd e8a313be6c fixed bug in create leavemessage from bids 2014-01-02 20:18:39 +08:00
yanxd e577e1713f Merge branch 'wordh' of 10.0.47.245:/home/trustie2 into wordh 2014-01-02 17:29:57 +08:00
yanxd 90a37a5f4e 竞赛众包的留言修改 2014-01-02 17:29:46 +08:00
nieguanghui 8b1264c99e replace table with div + css ---- bids/show 2014-01-02 16:07:59 +08:00
yanxd 6d82d2ce17 remove table with oneline 2014-01-02 15:37:12 +08:00
nieguanghui 2c1e53bfec Merge branch 'wordh' of 10.0.47.245:/home/trustie2 into wordh 2014-01-02 15:21:14 +08:00
nieguanghui f77ecf71f1 mpdified project and contest message 2014-01-02 15:21:03 +08:00
yanxd 32510028aa 论坛留言里发帖的分界 2014-01-02 14:48:01 +08:00
yanxd a7c6461f03 move dstinguish origin message into private method 2013-12-31 16:09:50 +08:00
yanxd 2070e9dc7f remove memo/messages info from welcome.index 2013-12-31 15:48:08 +08:00
wanglinchun 0c8e1e19e6 "软件众包"和“创新竞赛”中“关注”及前面星号的隐藏属性设置 2013-12-31 15:36:35 +08:00
wanglinchun fdcb68bd69 当用户未登陆的时候,隐藏掉了“软件众包”中的“选为作业”
当用户未登陆的时候,隐藏掉了“项目托管”、“创新竞赛”以及“软件众包” 关注 前的星号
2013-12-31 11:12:39 +08:00
yanxd 9cd931cb7f ajax 2013-12-30 20:53:48 +08:00
yanxd 8618ad3ede add access methods for delete 2013-12-30 20:16:56 +08:00
yanxd ebc803a88a 项目留言. 2013-12-30 17:13:44 +08:00
wanglinchun 80f40cd1c0 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop 2013-12-30 16:28:04 +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
yanxd 42fa7eb4c1 dd 2013-12-28 13:40:22 +08:00
yanxd 8cb3756bbc 首页帖子数量 2013-12-28 13:33:04 +08:00
nieguanghui 61116b0495 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
	app/views/words/_new_respond.html.erb
2013-12-28 13:17:00 +08:00
yanxd 69448b36ea 字数统计 2013-12-28 13:16:22 +08:00
nieguanghui ae094bde28 主页界面修改 2013-12-28 13:14:38 +08:00