 ouyangxuhua
|
c2c4c032dc
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-30 17:27:22 +08:00 |
|
ouyangxuhua
|
dcfe89c544
|
帖子发送到组织资源栏目，同时增加增删查改功能
|
2015-12-30 15:46:01 +08:00 |
 guange
|
aa951cd7b9
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-30 13:18:40 +08:00 |
|
guange
|
887d2f9f00
|
添加micros和nubot的链接
|
2015-12-30 13:14:32 +08:00 |
|
ouyangxuhua
|
d203285cc1
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/organizations/_org_left_subfield_list.html.erb
|
2015-12-29 17:18:21 +08:00 |
 cxt
|
c3ddbcfddf
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2015-12-29 16:33:32 +08:00 |
|
cxt
|
6bdd6d3e03
|
课程添加设置菜单，设置页面的信息更改
|
2015-12-29 10:15:53 +08:00 |
|
ouyangxuhua
|
2076c9b449
|
Merge branch 'develop' into dev_hjq
Conflicts:
app/controllers/organizations_controller.rb
app/views/layouts/_footer.html.erb
app/views/layouts/base_org.html.erb
app/views/organizations/_org_activities.html.erb
db/schema.rb
public/stylesheets/new_user.css
public/stylesheets/org.css
public/stylesheets/public.css
|
2015-12-28 15:32:03 +08:00 |
|
cxt
|
d2f56693b4
|
课程通知新建报404
|
2015-12-25 19:02:26 +08:00 |
|
cxt
|
3e39eacd19
|
新建课程通知时通知标题框自动获取焦点
|
2015-12-24 16:45:45 +08:00 |
|
cxt
|
f26f71c07a
|
课程通知改成动态的模式
|
2015-12-24 09:57:32 +08:00 |
|
ouyangxuhua
|
b9ae579622
|
将课程帖子转发至组织帖子栏目
|
2015-12-23 15:35:26 +08:00 |
|
ouyangxuhua
|
2220e0b7cc
|
增加帖子-组织栏目关联表
|
2015-12-22 15:48:41 +08:00 |
|
guange
|
eb97f7dfb2
|
merge
|
2015-12-18 09:20:51 +08:00 |
 lizanle
|
5f8c04e3a0
|
Merge branch 'szzh' into dev_zanle
|
2015-12-17 18:17:38 +08:00 |
|
lizanle
|
8ce2dbc4b8
|
issue回复
|
2015-12-17 18:12:38 +08:00 |
|
lizanle
|
1dbccd81d6
|
issue回复的删除功能
|
2015-12-17 17:15:03 +08:00 |
|
ouyangxuhua
|
de229c0f1c
|
组织资源栏目的文件可以被引用至当前组织下的资源栏目
|
2015-12-17 14:51:02 +08:00 |
|
ouyangxuhua
|
977100e92e
|
双击资源栏目标签可编辑，编辑标签后更新标签
|
2015-12-16 11:17:06 +08:00 |
|
ouyangxuhua
|
af157a9c63
|
组织资源栏目增加标签功能
|
2015-12-15 17:30:24 +08:00 |
|
guange
|
4f57e48b92
|
merge
|
2015-12-14 18:20:32 +08:00 |
|
ouyangxuhua
|
a5fa68c928
|
资源栏目增加资源
|
2015-12-14 16:41:18 +08:00 |
|
ouyangxuhua
|
0602a03e12
|
组织资源类型的栏目，增加搜索功能
|
2015-12-14 10:26:34 +08:00 |
|
ouyangxuhua
|
de0b5d1897
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2015-12-11 16:58:19 +08:00 |
|
ouyangxuhua
|
e98338bf22
|
栏目增加资源类型，可以添加文件、删除文件、显示文件等
|
2015-12-11 16:30:50 +08:00 |
|
cxt
|
bb2f49439e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2015-12-11 15:00:35 +08:00 |
|
cxt
|
27ed6df9d6
|
Merge branch 'szzh' into develop
|
2015-12-11 14:59:52 +08:00 |
|
cxt
|
a3715051b1
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-11 14:59:13 +08:00 |
|
cxt
|
f880ccd749
|
分组作业
|
2015-12-11 14:57:09 +08:00 |
 huang
|
c7b2c9e3af
|
课程删除功能
admin中课程列表取消删除按钮
|
2015-12-10 18:59:54 +08:00 |
|
huang
|
4f7f4acb1f
|
课程删除
|
2015-12-10 17:26:03 +08:00 |
|
cxt
|
4e04df7a8a
|
分组作业的动态显示及关联项目
|
2015-12-09 16:33:48 +08:00 |
|
cxt
|
53f9141cf1
|
分组作业动态
|
2015-12-09 10:29:54 +08:00 |
|
guange
|
3476731b83
|
将at js data整合到文件中
|
2015-12-09 09:59:13 +08:00 |
|
cxt
|
a9f6e817b4
|
分组作业关联项目
|
2015-12-08 17:37:15 +08:00 |
|
lizanle
|
5fcbde2ff1
|
资源库监听回车键
|
2015-12-07 17:29:14 +08:00 |
|
ouyangxuhua
|
76db95aa03
|
1.组织页面中，退出后刷新组织页面；
2.组织页面中，点击“个人主页”，打开新的页面；
3.组织页面页首部分，用户名不链接用户页面。
|
2015-12-07 15:52:13 +08:00 |
|
huang
|
9d7bc17115
|
Merge branch 'develop' into dev_hjq
|
2015-12-05 11:39:40 +08:00 |
|
ouyangxuhua
|
ab4d0e4678
|
组织界面增加分栏
|
2015-12-04 17:34:48 +08:00 |
|
cxt
|
8fe53468e1
|
作品追加附件
|
2015-12-04 16:21:11 +08:00 |
|
cxt
|
68a29d8131
|
学生提交作品后可点击重试重新上传作品
|
2015-12-01 15:18:14 +08:00 |
|
ouyangxuhua
|
6f9c89d67b
|
1.更改首页内容，不显示作者等信息，增加取消首页、编辑首页、删除首页等功能；
2.增加editor_of_documents表，记录文章编辑的作者、时间等，并显示首页的最后编辑人；
3.在首页编辑文章后，应返回首页。
|
2015-11-30 16:04:43 +08:00 |
|
lizanle
|
3c946c034a
|
Merge branch 'szzh' into dev_zanle
Conflicts:
db/schema.rb
kaminari分页添加上一页下一页
|
2015-11-30 11:07:53 +08:00 |
|
lizanle
|
582cd6f5d4
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
2015-11-27 18:47:02 +08:00 |
|
cxt
|
85aade79ce
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
public/stylesheets/courses.css
|
2015-11-27 15:21:32 +08:00 |
|
cxt
|
f7ac2b0ef5
|
老师查看学生的答卷结果
|
2015-11-27 15:19:13 +08:00 |
|
huang
|
36b1649fbd
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
2015-11-27 14:49:49 +08:00 |
|
ouyangxuhua
|
58365e8892
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/new_user.css
2.组织增加项目功能
|
2015-11-27 09:50:17 +08:00 |
|
ouyangxuhua
|
9c3aed8028
|
增加组织加入课程功能
|
2015-11-26 16:29:50 +08:00 |
|
lizanle
|
4efb660214
|
全站搜索
|
2015-11-26 09:57:53 +08:00 |