Commit Graph

1565 Commits

Author SHA1 Message Date
huang acf4e15f09 统计数左侧刷新 2016-04-14 10:26:25 +08:00
huang 12efc10759 图标曲线 总变更为+ 2016-04-14 10:10:31 +08:00
huang 3501d6f1d6 完成组织模块的开发 2016-04-07 17:05:22 +08:00
huang 623114dc41 解决删除项目的私有资源显示在我的资源中的问题 2016-04-06 19:02:07 +08:00
huang 378dfca006 组织图标只有管理员可以修改 2016-04-06 13:53:40 +08:00
huang 2162d7d4b8 组织banner上传功能 2016-04-06 10:40:38 +08:00
huang 73297230d1 权限控制 2016-04-02 00:31:36 +08:00
huang e4b5a4df05 500wenti 2016-04-02 00:14:48 +08:00
huang 0bcd2ddcf8 0 2016-04-02 00:02:09 +08:00
huang 0dc7b1f621 上传图片 2016-04-02 00:00:36 +08:00
huang 86aecd21b9 上传图片 2016-04-01 23:56:05 +08:00
huang 0459856a2c 上线logo更换 2016-04-01 21:30:32 +08:00
huang 218a6b9358 Merge branch 'hjq_beidou' of http://git.trustie.net/jacknudt/trustieforge into hjq_beidou 2016-04-01 19:25:01 +08:00
huang 9e7c595e55 组织发送动态的显示 2016-04-01 17:23:15 +08:00
huang 10371e8bdd 添加附件图片功能 2016-04-01 00:27:34 +08:00
huang 12c3de6dc9 500问题 2016-03-31 21:14:07 +08:00
huang d71035159a 修改more链接 2016-03-31 20:54:01 +08:00
huang ba658e44c0 组织more权限 2016-03-31 20:46:55 +08:00
huang 5866dfb7ff 登录
没内容more
logo不加链接
2016-03-31 20:12:20 +08:00
huang 1fdd562bd3 修改组织一些功能jibug 2016-03-31 19:33:43 +08:00
huang 756a2db4aa 组织配置样式问题
链接more空白问题
2016-03-31 19:04:31 +08:00
huang 45343a44b8 修改链接 2016-03-31 17:13:40 +08:00
huang f662bfa40b 组织科配置 2016-03-31 17:06:00 +08:00
huang c431658333 setting中后台编辑 2016-03-31 16:19:59 +08:00
huang c6f6030e10 组织新样式 2016-03-31 15:25:02 +08:00
huang 3465a39285 添加配置
隐藏不显示
2016-03-31 13:07:12 +08:00
huang 8f43341f81 新建组织为空的情况 2016-03-30 19:17:29 +08:00
huang b64e8a5f9e 完成所有图片自动适应转换 2016-03-30 19:02:41 +08:00
huang 7c55356ace 组织新界面修改 2016-03-30 17:22:23 +08:00
huang f2106d0045 more链接添加,区分两种模式 2016-03-29 20:33:16 +08:00
huang 8a6a1b94ee 组织资源的统计与权限 2016-03-29 20:09:47 +08:00
huang 961a264e05 创建时间统一date 2016-03-29 19:04:51 +08:00
huang 65e80b1978 用户图像样式 2016-03-29 18:25:16 +08:00
huang 7c9e20c9bf 登录注册样式 2016-03-29 16:51:50 +08:00
huang d28a46c48a 北斗资源库板块 2016-03-29 16:45:14 +08:00
huang 80cd5089a4 Merge branch 'develop' into hjq_beidou
Conflicts:
	db/schema.rb
2016-03-29 13:51:46 +08:00
huang 2b9ddf3594 组织新版 2016-03-29 13:43:28 +08:00
huang b80bc98fcb 组织首页 2016-03-29 11:31:58 +08:00
huang b8463fcca5 北斗 2016-03-28 16:51:58 +08:00
cxt 33c9331c7b 课程设置为私有/公开 课程头部未刷新 2016-03-28 15:35:24 +08:00
huang 4b6b5504ca 北斗框架(未完) 2016-03-28 14:11:40 +08:00
huang 326730f6b1 北斗框架 2016-03-28 10:39:09 +08:00
huang 1bf494f661 课程推荐资源统计数 2016-03-25 20:11:26 +08:00
huang ba25f41bcb 添加教师统计数、学生统计数 2016-03-25 19:20:36 +08:00
alan 6862480632 修改当用户没有项目时,报错 2016-03-25 17:16:45 +08:00
alan 4587e728d8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 17:07:42 +08:00
alan 05d66f41f9 fix bug when user don't have courses or projects 2016-03-25 17:07:30 +08:00
huang dea1c13a64 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	db/migrate/20160324074942_add_index_to_forge_activities.rb
2016-03-25 16:33:22 +08:00
alan 46951f7af9 Merge branch 'develop' into alan_develop
Conflicts:
	app/views/student_work/_student_work_list.html.erb
	app/views/users/_user_activities.html.erb
	app/views/users/_user_message_course.html.erb
2016-03-25 16:16:55 +08:00
huang 9ce39d2f4a Issue模块动态优化 2016-03-25 15:46:40 +08:00