 huang
|
0a989daf31
|
Merge branch 'cxt_course' into develop
Conflicts:
app/helpers/application_helper.rb
public/stylesheets/courses.css
public/stylesheets/new_user.css
|
2016-05-06 18:12:08 +08:00 |
 cxt
|
620cc83d4b
|
"从题库选用作业"暂时只提供公共作业和我的作业
|
2016-05-06 17:56:56 +08:00 |
|
cxt
|
10d26f89d9
|
作业列表的二级回复
|
2016-05-06 17:36:28 +08:00 |
|
huang
|
ae298f9b55
|
帖子详情页面添加编辑功能
|
2016-05-06 14:57:36 +08:00 |
|
huang
|
a5be092c16
|
二级目录帖子列表中添加编辑功能
|
2016-05-06 14:42:13 +08:00 |
|
huang
|
df1c70880a
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_homework_repository.html.erb
public/stylesheets/new_user.css
|
2016-05-06 12:22:43 +08:00 |
|
huang
|
572a051b04
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/users_controller.rb
app/views/blogs/_article.html.erb
app/views/layouts/new_base_user.html.erb
|
2016-05-06 11:35:27 +08:00 |
|
huang
|
aefcb78926
|
新base
|
2016-05-06 10:28:21 +08:00 |
|
huang
|
6e7d20c410
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-06 10:17:18 +08:00 |
|
huang
|
9e0176bc55
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/controllers/organizations_controller.rb
app/helpers/organizations_helper.rb
db/schema.rb
public/images/homepage_icon.png
public/stylesheets/new_user.css
|
2016-05-06 10:16:56 +08:00 |
|
huang
|
885b6f6092
|
隐藏掉“综合”选项，分页每页显示20个
|
2016-05-06 10:12:30 +08:00 |
|
cxt
|
0fafbffa49
|
项目的更新加到作业的最后更新时间中
|
2016-05-06 08:52:54 +08:00 |
|
huang
|
d0db711449
|
编辑功能
|
2016-05-05 18:47:32 +08:00 |
|
huang
|
02d6186045
|
二级域名讨论帖子添加删除链接
|
2016-05-05 16:43:20 +08:00 |
|
huang
|
e0c011948c
|
二级域名的隐藏和显示
|
2016-05-05 15:16:14 +08:00 |
 yuanke
|
b82a1c1162
|
讨论区计算回复数的一个BUG
|
2016-05-05 14:52:58 +08:00 |
 guange
|
72f5f5b795
|
加入组织
|
2016-05-05 14:52:10 +08:00 |
|
huang
|
79cd36f297
|
二级域名排序
|
2016-05-05 14:39:27 +08:00 |
|
guange
|
17282083a6
|
merge
|
2016-05-05 14:07:37 +08:00 |
|
guange
|
88fd2cbfb6
|
Merge remote-tracking branch 'origin/develop' into guange_dev
|
2016-05-05 14:07:29 +08:00 |
|
guange
|
dfdd301f2f
|
sso同步登录功能完成
|
2016-05-05 14:06:47 +08:00 |
|
huang
|
6d28d0becd
|
二级域名的删除功能
|
2016-05-05 12:27:35 +08:00 |
|
huang
|
2920f21c95
|
二级域名编辑功能自动刷新
|
2016-05-05 11:28:28 +08:00 |
|
huang
|
d86fec6f03
|
模式6没有内容的显示
|
2016-05-04 19:30:01 +08:00 |
|
huang
|
33bf4fafa6
|
模式4没有内容的显示情况
|
2016-05-04 19:12:53 +08:00 |
|
huang
|
04b2aee166
|
板块一没有图片的显示情况
|
2016-05-04 18:50:25 +08:00 |
|
guange
|
df41f7328f
|
json解析换成rails的
|
2016-05-04 17:25:24 +08:00 |
|
huang
|
2996daef71
|
二级域名局部刷新
|
2016-05-04 17:06:32 +08:00 |
|
guange
|
eaad006d17
|
safe base64
|
2016-05-04 16:54:12 +08:00 |
|
cxt
|
06586f9e4b
|
导出作业成绩中添加作品描述的导出
|
2016-05-04 16:43:37 +08:00 |
|
guange
|
e9834f108a
|
修改pwd
|
2016-05-04 16:35:39 +08:00 |
|
yuanke
|
9dc92fe817
|
列表优化
|
2016-05-04 16:28:40 +08:00 |
|
guange
|
ff23df4f12
|
oss之前不用检验登录
|
2016-05-04 16:21:53 +08:00 |
|
cxt
|
6c184b9248
|
题库的分享请求
|
2016-05-04 16:17:37 +08:00 |
|
huang
|
8dfe95dfd1
|
配置页面新建二级域名样式
|
2016-05-04 15:50:53 +08:00 |
|
guange
|
e8adcf8cc7
|
添加sso model
|
2016-05-04 15:40:18 +08:00 |
|
huang
|
8a14ce004f
|
以弹框模式显示二级目录
|
2016-05-04 15:05:54 +08:00 |
|
guange
|
0635c1e98b
|
添加单点登录controller
|
2016-05-04 14:05:46 +08:00 |
|
cxt
|
467af47386
|
私有题库的作业详情页面不显示
|
2016-05-04 11:13:52 +08:00 |
|
huang
|
578982faba
|
subdomain 404跳转
|
2016-05-04 11:08:16 +08:00 |
|
yuanke
|
411ae6f89e
|
1.修改贴吧分页显示问题2列表优化
|
2016-05-04 11:03:08 +08:00 |
|
huang
|
fd543828ac
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/controllers/sub_document_comments_controller.rb
app/views/sub_document_comments/_show_newstyle.html.erb
app/views/sub_document_comments/show.html.erb
|
2016-05-04 09:46:26 +08:00 |
|
huang
|
557e731343
|
模式二添加回复功能，模式一回复超过三行则隐藏
|
2016-05-04 09:45:02 +08:00 |
|
cxt
|
70910c5238
|
“我的作业”中不应出现已删除课程的作业
|
2016-05-04 09:40:18 +08:00 |
 Tim
|
399f757811
|
0
|
2016-05-04 09:01:51 +08:00 |
|
huang
|
39dd62580a
|
完成2级目录详情页面
|
2016-05-03 20:08:40 +08:00 |
|
huang
|
a9059c4c2e
|
帖子添加编辑删除功能
|
2016-05-03 19:32:38 +08:00 |
|
huang
|
48002eb247
|
二级目录讨论区添加帖子回复功能
|
2016-05-03 19:03:28 +08:00 |
|
huang
|
4489bc13d7
|
课程列表按创建时间排序
|
2016-05-03 18:17:03 +08:00 |
|
yuanke
|
8b672cc7c3
|
项目、课程列表增加更新时间
|
2016-05-03 17:57:24 +08:00 |