huang
|
811c3a065e
|
完成左中一模块定制
|
2016-04-27 14:09:15 +08:00 |
huang
|
ddf1e6f2db
|
组织模式3完成
|
2016-04-27 11:29:01 +08:00 |
huang
|
cded1802cc
|
右上模块定制完成
|
2016-04-27 10:41:05 +08:00 |
cxt
|
78c7db1150
|
Merge branch 'weixin_guange' into develop
|
2016-04-27 10:36:24 +08:00 |
cxt
|
0222038899
|
缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息
|
2016-04-27 10:28:36 +08:00 |
yuanke
|
23f48b7189
|
项目列表、项目讨论区列表
|
2016-04-27 09:54:49 +08:00 |
huang
|
b6f5bfc450
|
右下版本模块定制
|
2016-04-27 09:45:56 +08:00 |
huang
|
b589d5b2ff
|
末班六定配完成
|
2016-04-26 18:27:01 +08:00 |
huang
|
17b2e82963
|
banner类型
|
2016-04-26 16:23:08 +08:00 |
yuanke
|
43c1120b19
|
课程问答区 项目讨论区列表
|
2016-04-26 15:10:47 +08:00 |
huang
|
32d7927eb9
|
组织新界面
|
2016-04-26 11:06:18 +08:00 |
huang
|
76f93a54c6
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/helpers/organizations_helper.rb
app/views/layouts/base_org2.html.erb
app/views/organizations/_org_content.html.erb
|
2016-04-26 11:03:21 +08:00 |
huang
|
d8f71da1fb
|
完成模块8配置
|
2016-04-26 11:01:12 +08:00 |
Tim
|
53e6b41d93
|
北斗登录效果调整
|
2016-04-26 10:02:16 +08:00 |
huang
|
255d7e07bc
|
北斗新界面样式
|
2016-04-25 18:54:21 +08:00 |
huang
|
dae6a5ecae
|
配置八种类型更新
|
2016-04-25 16:00:52 +08:00 |
huang
|
81210fd475
|
顶部导航及样式
|
2016-04-25 15:35:32 +08:00 |
huang
|
5b763927cc
|
顶部用户路由
|
2016-04-25 14:14:26 +08:00 |
huang
|
c1437bb75b
|
北斗界面
|
2016-04-24 14:39:33 +08:00 |
yuanke
|
f6d09e0554
|
配置中增加一个 隐藏课程信息的功能
|
2016-04-24 14:23:08 +08:00 |
huang
|
cccc2a7eb7
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-04-21 16:21:49 +08:00 |
huang
|
ab8c1a0bad
|
Merge branch 'hjq_beidou' into develop
|
2016-04-21 16:21:39 +08:00 |
cxt
|
0cc5eca34b
|
个人主页的项目列表有重复的项目
|
2016-04-19 09:58:51 +08:00 |
huang
|
200307ec9f
|
组织模块访问统计修改
|
2016-04-19 09:18:58 +08:00 |
cxt
|
829399b8af
|
个人主页的课程列表和项目列表排序
|
2016-04-14 16:59:25 +08:00 |
cxt
|
e5b07c6c12
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-04-14 12:33:11 +08:00 |
cxt
|
5e1284605f
|
Merge branch 'hjq_beidou' into cxt_course
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-04-14 11:29:26 +08:00 |
huang
|
acf4e15f09
|
统计数左侧刷新
|
2016-04-14 10:26:25 +08:00 |
huang
|
12efc10759
|
图标曲线 总变更为+
|
2016-04-14 10:10:31 +08:00 |
cxt
|
f97699037b
|
冲突解决
|
2016-04-13 16:58:44 +08:00 |
cxt
|
2befcd6634
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
2016-04-13 16:52:52 +08:00 |
cxt
|
42f960922a
|
个人主页的项目排序按更新时间排序
|
2016-04-13 15:39:05 +08:00 |
cxt
|
a21ea98b37
|
个人主页中的课程列表出现重复课程
|
2016-04-13 15:14:35 +08:00 |
guange
|
aa9cb4e579
|
merge
|
2016-04-08 10:44:36 +08:00 |
huang
|
320ed07b31
|
解决上传图片问题
|
2016-04-08 09:55:02 +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 |
huang
|
9549d695f6
|
讨论区局部优化
|
2016-03-25 14:29:58 +08:00 |
huang
|
ff2340baf9
|
课程统计信息优化
|
2016-03-25 10:42:26 +08:00 |
huang
|
cb4b26762d
|
课程base优化
|
2016-03-25 09:56:45 +08:00 |
ouyangxuhua
|
2d4f5284df
|
删除的课程、项目不能被关联到组织;组织名称长度限制;组织栏目添加帖子加上栏目名称;编辑组织时,如果组织名称没变,就不需要提示;学生回复老师的作业留言,打开后,显示该学生作业;新增、编辑组织文章,需要验证标题
|
2016-03-24 17:03:51 +08:00 |
huang
|
1330f02db8
|
项目创建的动态以多态形式存入forge_activities
|
2016-03-24 12:59:03 +08:00 |
alan
|
0d049bbe1f
|
refactor new_base_user
|
2016-03-24 10:07:39 +08:00 |
alan
|
13e265b7d2
|
优化 layouts/_user_projects 和 layouts/_user_courses页面
|
2016-03-23 18:25:50 +08:00 |
huang
|
70d594659e
|
课程英雄榜代码封装
|
2016-03-21 16:50:24 +08:00 |
huang
|
e06695b56b
|
课程活跃度代码封装
|
2016-03-21 16:45:49 +08:00 |
guange
|
6ae4cd0767
|
merge
|
2016-03-21 16:02:30 +08:00 |
ouyangxuhua
|
5c22b23f3a
|
Merge branch 'develop' into ouyangxuhua
|
2016-03-18 14:52:51 +08:00 |
ouyangxuhua
|
1eafad6468
|
鼠标经过用户头像显示用户信息后,持续显示用户信息半秒钟,以便用户及时操作用户信息
|
2016-03-18 10:05:31 +08:00 |
cxt
|
b8b34f7861
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-17 16:23:47 +08:00 |
cxt
|
1489c8d924
|
课程简介没有内容就不要显示
|
2016-03-17 16:22:29 +08:00 |
ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
2016-03-17 16:18:30 +08:00 |
cxt
|
602864bd71
|
个人主页课程列表: 1、增加学期信息 2、排序不对
|
2016-03-17 16:17:33 +08:00 |
huang
|
7ff946e488
|
课程资源库提供历史版本下载
|
2016-03-17 12:37:05 +08:00 |