huang
|
06f97d5cb7
|
注册页面(未完)
|
2016-06-15 17:24:46 +08:00 |
cxt
|
03b92f8570
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-15 17:23:23 +08:00 |
yuanke
|
1023b94f0d
|
新建贴吧之后转入这个贴吧界面,组织配置栏目默认选择第一项
|
2016-06-15 17:22:39 +08:00 |
yuanke
|
ec4273fc49
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-15 17:08:24 +08:00 |
yuanke
|
a17fb86a17
|
组织回复点登录直接跳入登录页面
|
2016-06-15 17:07:29 +08:00 |
cxt
|
43192b8648
|
分组作业的弹框增加人数的验证、点击关闭弹框时还原弹框中的值
|
2016-06-15 17:04:53 +08:00 |
huang
|
9b6f40bb02
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-15 15:43:42 +08:00 |
huang
|
a2c5cc6da1
|
登录界面base及新页面
|
2016-06-15 15:41:13 +08:00 |
yuanke
|
5a7f7da1f7
|
新建贴吧和组织配置默认选项暂时还原。
|
2016-06-15 15:34:13 +08:00 |
huang
|
d75a8bc35a
|
Merge branch 'hjq_beidou' into develop
|
2016-06-15 14:49:10 +08:00 |
huang
|
45f185bf9b
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-06-15 14:38:16 +08:00 |
huang
|
c15ef27fc0
|
管理员能看到组织资源
|
2016-06-15 14:36:38 +08:00 |
yuanke
|
7b6e8fbc53
|
修改组织点击登录后可回复报500的BUG
|
2016-06-15 14:33:25 +08:00 |
cxt
|
caa966c85a
|
分组作业的作品列表提示的修改
分组作业提交作品时的最小人数限制不起作用
|
2016-06-15 14:12:42 +08:00 |
Tim
|
f7832b00c9
|
更新历史版本时描述位置调整
|
2016-06-15 14:02:09 +08:00 |
cxt
|
c50d307e89
|
分组作业添加成员后再次打开,数据未保存
|
2016-06-14 17:36:12 +08:00 |
guange
|
ada15b4212
|
格式上的调整, 现在可以分开写,但发布时打成一个js提高性能
|
2016-06-14 16:03:10 +08:00 |
cxt
|
254e1f44f6
|
评分设置提示的修改与提交时的判断
|
2016-06-14 15:44:03 +08:00 |
Linda
|
01bd394a59
|
门户首页按照祎欣0613版本设计修改
|
2016-06-14 15:08:13 +08:00 |
huang
|
5515fb660f
|
完成资源更新的时候 描述继承问题,并且可以修改描述
|
2016-06-14 14:47:02 +08:00 |
huang
|
d21df48961
|
代码质量分析弹框及参数传入
|
2016-06-14 14:10:33 +08:00 |
cxt
|
e7499c95c5
|
点击打开测验作品列表中某作品,在作品详情页面增加返回统计列表的快捷操作
|
2016-06-14 14:08:54 +08:00 |
huang
|
c6bd5e6d31
|
饼状图
|
2016-06-14 09:57:53 +08:00 |
yuanke
|
44c9265fee
|
个人主页个性签名增加自动识别url
|
2016-06-13 15:29:15 +08:00 |
huang
|
0c25e3b13d
|
版本库质量分析 ssh链接
|
2016-06-13 15:21:29 +08:00 |
cxt
|
6c7237509d
|
“当前作品未进行评分,是否确定提交”改为“您当次评阅未对作品进行评分,分数将取上次的评分结果,若没有评分记录则不评分,是否确定提交?”
|
2016-06-13 14:08:30 +08:00 |
yuanke
|
e86419c28b
|
组织配置里面栏目类型默认为帖子
|
2016-06-13 13:35:01 +08:00 |
cxt
|
3a8a61e404
|
在精品课程列表增加“取消精品”列、在全部课程列表增加“开课学期”列,并支持排序
|
2016-06-13 11:10:28 +08:00 |
yuanke
|
3a46a409a9
|
Merge branch 'develop' into yuanke
|
2016-06-13 09:46:17 +08:00 |
yuanke
|
f2903ae903
|
新建贴吧后自动跳入该贴吧
|
2016-06-13 09:45:11 +08:00 |
guange
|
d3d31ca3a2
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-06-12 17:18:34 +08:00 |
cxt
|
02e2831980
|
管理员界面的留言列表优化
|
2016-06-12 17:17:37 +08:00 |
huang
|
d4d4e38c41
|
门户模式中含有三级域名的用户图像https问题
|
2016-06-12 16:48:35 +08:00 |
huang
|
9d3bb44682
|
简洁模式
|
2016-06-12 16:04:26 +08:00 |
cxt
|
be47331213
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-12 15:08:43 +08:00 |
guange
|
cbc4f2f6fd
|
菜单更新
|
2016-06-12 15:05:45 +08:00 |
huang
|
dcb3d8659b
|
Merge branch 'cxt_course' into develop
|
2016-06-12 15:02:33 +08:00 |
cxt
|
9d36c74d7f
|
作业回复的删除
|
2016-06-12 14:59:00 +08:00 |
cxt
|
00528bec60
|
学生列表没有分班就不显示分班列
|
2016-06-12 14:50:47 +08:00 |
cxt
|
d7c2ca896d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-12 14:21:03 +08:00 |
cxt
|
24f5e245df
|
鼠标经过消息通知时弹窗显示最新的5条未读消息
|
2016-06-12 14:20:55 +08:00 |
huang
|
928d71500d
|
门户模式--组织栏目没有动态时显示位置
|
2016-06-12 13:45:22 +08:00 |
guange
|
07760bcfca
|
优化
|
2016-06-12 13:42:53 +08:00 |
huang
|
d18094cc92
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-12 13:36:53 +08:00 |
huang
|
78b445a7ae
|
组织历史数据迁移 模式术语修改, 配置页面域名长度问题
|
2016-06-12 13:36:35 +08:00 |
guange
|
793b651393
|
压缩angularjs
|
2016-06-09 19:48:58 +08:00 |
yuanke
|
7504b353c9
|
组织报500问题修复
|
2016-06-08 16:50:13 +08:00 |
cxt
|
a1e49d9a81
|
Merge branch 'cxt_course' into develop
|
2016-06-08 15:24:00 +08:00 |
cxt
|
c0d167d2e2
|
项目缺陷动态的回复不显示
|
2016-06-08 15:23:19 +08:00 |
huang
|
871a4d2d7b
|
组织设为首页500问题
|
2016-06-08 13:15:08 +08:00 |
huang
|
3e3c300273
|
Merge branch 'cxt_course' into develop
|
2016-06-08 11:37:58 +08:00 |
cxt
|
b6eb5a3668
|
还原作品列表的拖动
|
2016-06-08 11:28:20 +08:00 |
huang
|
2f9dcc8a31
|
文章点击500问题
|
2016-06-08 11:23:16 +08:00 |
huang
|
a138ee31ab
|
详情页面取消首页问题
|
2016-06-08 11:00:19 +08:00 |
huang
|
6cdccc3b08
|
设置首页显示问题
|
2016-06-08 10:53:56 +08:00 |
huang
|
67f0cad331
|
组织网站动态新页面
|
2016-06-08 09:40:05 +08:00 |
huang
|
e4f48f046b
|
子页面没有内容显示
|
2016-06-08 09:16:57 +08:00 |
guange
|
b965698fdf
|
merge
|
2016-06-07 17:45:19 +08:00 |
huang
|
fdb1846f75
|
Merge branch 'hjq_beidou' into develop
|
2016-06-07 17:37:38 +08:00 |
huang
|
9c01bb63e7
|
配置页面管理员栏目权限控制
|
2016-06-07 17:36:33 +08:00 |
huang
|
a8b68d64ee
|
导航权限控制
|
2016-06-07 17:19:19 +08:00 |
huang
|
09ff5954bd
|
字体过长演示问题(模式二子页面)
|
2016-06-07 16:56:20 +08:00 |
guange
|
81e35de2b6
|
base
|
2016-06-07 16:47:06 +08:00 |
huang
|
c3db6afd75
|
模式二导航栏
|
2016-06-07 16:42:33 +08:00 |
cxt
|
385ff03c88
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-07 16:15:31 +08:00 |
Tim
|
c5e6514c18
|
作品列表排序图标float消除
|
2016-06-07 16:02:20 +08:00 |
cxt
|
de58cfb5e5
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-07 16:02:08 +08:00 |
cxt
|
196c92f9c4
|
动态回复最多只加赞三条,点击展开更多时才加载余下的回复
|
2016-06-07 16:02:00 +08:00 |
huang
|
acf4a64e6a
|
二级帖子子页面
|
2016-06-07 15:40:28 +08:00 |
Tim
|
1d44116841
|
作品列表可拖拽
|
2016-06-07 15:30:17 +08:00 |
huang
|
59988f17da
|
帖子目录界面
|
2016-06-07 14:48:43 +08:00 |
huang
|
1553eadc58
|
宽度改成1000二级目录模式二样式调整
|
2016-06-07 10:17:16 +08:00 |
Tim
|
253d9da345
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-07 09:01:53 +08:00 |
Tim
|
a96470ad66
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-06-06 16:42:53 +08:00 |
Tim
|
5b2c22d264
|
历史版本名称过长导致折行
|
2016-06-06 16:42:41 +08:00 |
huang
|
793978f196
|
组织--名师、学霸:如图搜索结果有多页,翻页后建议输入的搜索条件仍显示在搜索框内
|
2016-06-06 16:15:35 +08:00 |
huang
|
21197c95b3
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-06 15:11:59 +08:00 |
cxt
|
0bf46f2ecd
|
帮助中心的弹框
|
2016-06-06 15:03:21 +08:00 |
huang
|
df8df117a8
|
解决匿名用户登录问题(控制器和view)
|
2016-06-06 15:02:11 +08:00 |
Tim
|
a44cb47a26
|
组织未登录回复框提示
|
2016-06-06 14:41:18 +08:00 |
huang
|
d3c6c0ca99
|
二级目录未登录时回复提示
|
2016-06-06 14:29:33 +08:00 |
huang
|
c6d36bd738
|
未登录留言判断
|
2016-06-06 14:21:58 +08:00 |
cxt
|
91f7e950ee
|
正式版微信
|
2016-06-06 12:22:52 +08:00 |
cxt
|
75f12e3749
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-06 11:05:37 +08:00 |
cxt
|
ee12b3540b
|
消息弹窗的还原、微信配置修改
|
2016-06-06 11:05:25 +08:00 |
huang
|
7cce01872d
|
名字样式
|
2016-06-03 18:11:42 +08:00 |
cxt
|
fe22cfa5c5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-03 18:02:41 +08:00 |
huang
|
57f3cf713c
|
去掉搜索
|
2016-06-03 17:50:40 +08:00 |
huang
|
acc808f003
|
样式问题
|
2016-06-03 17:24:45 +08:00 |
huang
|
429deefadf
|
右一线条样式问题
|
2016-06-03 17:14:28 +08:00 |
huang
|
65bf816ea4
|
帖子设为首页后,不在模式二中显示问题
|
2016-06-03 17:03:35 +08:00 |
huang
|
ea19f19973
|
500问题
|
2016-06-03 16:30:20 +08:00 |
cxt
|
ffe447e5bc
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-03 16:28:23 +08:00 |
cxt
|
d27a050ffa
|
消息弹窗的显示
|
2016-06-03 16:28:11 +08:00 |
huang
|
c7866af1e8
|
组织编辑成员的时候样式乱的问题
|
2016-06-03 16:14:45 +08:00 |
huang
|
43e586aa90
|
标题过长隐藏效果
|
2016-06-03 15:50:52 +08:00 |
huang
|
0b869aaaed
|
去掉定制功能
|
2016-06-03 15:40:11 +08:00 |
huang
|
b128ba5257
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/views/layouts/base_org2.html.erb
|
2016-06-03 14:58:37 +08:00 |
huang
|
1e34a4f174
|
显示样式一级添加二级目录权限
|
2016-06-03 14:43:20 +08:00 |
huang
|
875a604780
|
热点项目描述内容的字数
|
2016-06-03 14:31:49 +08:00 |
huang
|
fa2437cdf6
|
添加课程学期
|
2016-06-03 14:28:12 +08:00 |
huang
|
1f43ecb8ed
|
隐藏与配置界面一致,
|
2016-06-03 14:19:52 +08:00 |
huang
|
2d2e9c540a
|
默认图片及顺序
|
2016-06-03 14:14:50 +08:00 |
huang
|
7be18b80b4
|
组织链接
|
2016-06-03 13:45:53 +08:00 |
huang
|
3af115ee54
|
组织新版样式,及方法优化
|
2016-06-03 12:42:02 +08:00 |
huang
|
a0f722837b
|
精品课程加入到左模式二
|
2016-06-03 10:47:57 +08:00 |
huang
|
a1200a41b0
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-06-03 10:31:52 +08:00 |
huang
|
ca3b072f85
|
热门项目按照项目得分排序及设置界面中默认设置
|
2016-06-03 10:31:29 +08:00 |
Tim
|
3c6c617d09
|
门户样式冲突问题
|
2016-06-03 10:08:54 +08:00 |
cxt
|
b833c1f0a4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-03 09:13:19 +08:00 |
Tim
|
57bb2f69a4
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/views/organizations/_org_custom_right2.html.erb
|
2016-06-03 09:12:36 +08:00 |
Tim
|
bb9c9ddddf
|
添加链接鼠标覆盖蓝色效果
|
2016-06-03 09:11:49 +08:00 |
cxt
|
1396cae14c
|
消息弹框
|
2016-06-03 08:59:17 +08:00 |
huang
|
fa03867cc2
|
样式神略问题
|
2016-06-03 08:56:54 +08:00 |
huang
|
6fbad6d53d
|
右二优化
|
2016-06-03 08:45:43 +08:00 |
huang
|
0eb6dbe48a
|
Merge branch 'huang_temp2' into develop
Conflicts:
app/views/layouts/base_org2.html.erb
|
2016-06-03 08:30:31 +08:00 |
huang
|
257165dbaf
|
模式二中添加课程定配
|
2016-06-02 21:32:56 +08:00 |
huang
|
e2848f4dec
|
创建栏目时默认状态
|
2016-06-02 21:10:07 +08:00 |
huang
|
dc4f927c39
|
完成右二模式
|
2016-06-02 21:01:39 +08:00 |
huang
|
52bc4aab81
|
右二(未完)
|
2016-06-02 18:46:15 +08:00 |
huang
|
0b3ec0322f
|
右一模式
|
2016-06-02 18:41:00 +08:00 |
huang
|
e05e6ba53d
|
样式对齐问题
|
2016-06-02 18:04:00 +08:00 |
huang
|
5d880db18e
|
详情页面没登陆可以回复
|
2016-06-02 17:54:12 +08:00 |
huang
|
fb1a13a522
|
隐藏版本库功能
|
2016-06-02 17:05:51 +08:00 |
huang
|
d047409d31
|
项目动态
|
2016-06-02 16:01:58 +08:00 |
huang
|
ba344a86b5
|
颜色
|
2016-06-02 14:59:32 +08:00 |
huang
|
d532cd3c6c
|
权限
|
2016-06-02 14:58:13 +08:00 |
huang
|
e374b1679f
|
权限
|
2016-06-02 14:54:54 +08:00 |
huang
|
135e50b2e7
|
链接
|
2016-06-02 14:54:04 +08:00 |
huang
|
1f073c19ae
|
域名问题
|
2016-06-02 13:57:07 +08:00 |
Tim
|
ed46ca0735
|
可拖拽作业列表
|
2016-06-02 13:45:06 +08:00 |
huang
|
22cafdbd05
|
二级目录弹出
|
2016-06-02 13:43:30 +08:00 |
huang
|
eecf12eda6
|
添加链接
|
2016-06-02 13:32:50 +08:00 |
huang
|
76732a3034
|
新模式有一
|
2016-06-02 13:17:38 +08:00 |
cxt
|
747128750c
|
Merge branch 'weixin_guange' into cxt_course
|
2016-06-02 10:42:04 +08:00 |
huang
|
e5eeba90f6
|
组织精品课程,热门项目
|
2016-06-02 09:52:06 +08:00 |
huang
|
27a9170318
|
组织添加设为精品项目,热门课程
|
2016-06-01 17:38:41 +08:00 |
Tim
|
308f247c71
|
可拖拽调整
|
2016-06-01 16:09:01 +08:00 |
cxt
|
32dca93b59
|
统一项目反馈、课程留言、讨论区的回复显示:显示留言者姓名
|
2016-06-01 15:35:26 +08:00 |
cxt
|
fa73171818
|
点击“课程活跃度”和“课程英雄榜”跳到学生列表,并分别以“活跃度”、“英雄榜”倒序排列
|
2016-06-01 14:58:59 +08:00 |
huang
|
b1cb4e5f94
|
完成左一的配置
|
2016-06-01 14:31:42 +08:00 |
cxt
|
5097abbe1e
|
Merge branch 'develop' into cxt_course
|
2016-06-01 14:22:43 +08:00 |
Tim
|
3b55e9e39b
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/student_work/_evaluation_un_title.html.erb
app/views/student_work/_evaluation_un_work.html.erb
|
2016-06-01 13:59:01 +08:00 |
Tim
|
513fe1a93d
|
作品列表可拖拽
|
2016-06-01 13:46:05 +08:00 |
huang
|
2acc545896
|
完成组织左二模式
|
2016-06-01 10:24:50 +08:00 |
huang
|
5c27aee2bd
|
模式二课程模块 定义公共方法(显示描述内容以省略号结束)
|
2016-06-01 09:08:08 +08:00 |
huang
|
9ecdf0892b
|
完成左三模式的配置
|
2016-05-31 20:45:54 +08:00 |
guange
|
814fde878e
|
从后台获取openid即可
|
2016-05-31 20:19:45 +08:00 |
huang
|
91ae3d8b39
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
2016-05-31 18:38:05 +08:00 |
huang
|
a96fafd704
|
模式三(未完)
|
2016-05-31 18:37:21 +08:00 |
cxt
|
ed84783f26
|
私有课程作业的公开作品
|
2016-05-31 17:03:50 +08:00 |
huang
|
8d56d8556f
|
完成模式6
|
2016-05-31 16:03:48 +08:00 |
huang
|
bb7204846f
|
新版资源类型定制模式6
|
2016-05-31 14:41:50 +08:00 |
huang
|
6bfe344cbf
|
组织模式一左侧权限控制
|
2016-05-31 13:59:29 +08:00 |
huang
|
8f897cbf89
|
组织管理员模式,二级目录局部刷新
|
2016-05-31 13:47:05 +08:00 |
huang
|
c369b271a0
|
组织管理员配置后的权限控制及局部刷新
|
2016-05-31 11:24:47 +08:00 |
huang
|
c333a0c55d
|
组织管理员提供学霸功能
|
2016-05-31 10:31:08 +08:00 |
huang
|
c57c575c84
|
新版组织静态页面模板
|
2016-05-30 16:24:51 +08:00 |
cxt
|
f024764e29
|
课内学生看到的学生列表中学生“姓名”不应显示昵称
|
2016-05-30 14:59:05 +08:00 |
huang
|
471ed7cbd2
|
组织logo获取,添加样式图片
|
2016-05-30 14:58:46 +08:00 |
cxt
|
d4c0e9754a
|
课程描述展开后应显示“收起描述信息”
|
2016-05-30 14:51:54 +08:00 |
huang
|
81ab73e286
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/views/organizations/_org_custom_header.html.erb
|
2016-05-30 14:48:12 +08:00 |
huang
|
698e4bd7b3
|
header
|
2016-05-30 14:41:53 +08:00 |
Tim
|
9cc749bd57
|
门户样式统一,防止冲突
|
2016-05-30 14:38:57 +08:00 |
huang
|
46e4f2c143
|
组织新base框架
|
2016-05-30 14:23:52 +08:00 |
guange
|
8b623e3a0c
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-05-27 22:59:11 +08:00 |
guange
|
bb30709fa1
|
window close
|
2016-05-27 22:54:57 +08:00 |
guange
|
63b9aaefe2
|
window close
|
2016-05-27 22:22:09 +08:00 |
guange
|
be94d445a9
|
window close
|
2016-05-27 22:19:49 +08:00 |
guange
|
622d71c476
|
已绑定成功的,直接提示
|
2016-05-27 22:14:41 +08:00 |
cxt
|
0cafebb3a2
|
新闻列表的点赞
|
2016-05-27 17:14:37 +08:00 |
huang
|
94dd8befc8
|
Merge branch 'yuanke' into develop
|
2016-05-27 17:13:39 +08:00 |
huang
|
f7cb9bdffd
|
Merge branch 'cxt_course' into develop
|
2016-05-27 17:13:01 +08:00 |
huang
|
12ac353de9
|
北斗新base
|
2016-05-27 17:08:50 +08:00 |
yuanke
|
e650dca1ed
|
修改用户反馈中二级回复 回复框不消失的问题
|
2016-05-27 17:06:34 +08:00 |
cxt
|
086ccedc08
|
先隐藏作业信息,再点击查询或分班后“显示作业信息”的按钮不见了
|
2016-05-27 16:45:04 +08:00 |
cxt
|
1535c4cd07
|
编辑分组作业时的基于项目实施总是默认选中
|
2016-05-27 15:54:55 +08:00 |
yuanke
|
d08809bfbd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/project.css
|
2016-05-27 15:34:55 +08:00 |
huang
|
ff14809237
|
Merge branch 'cxt_course' into develop
|
2016-05-27 15:30:35 +08:00 |
cxt
|
227a668413
|
分组匿评的显示
|
2016-05-27 15:15:14 +08:00 |
cxt
|
7599bf75a3
|
分组作业不关联项目时的作品列表样式调整
|
2016-05-27 15:04:56 +08:00 |
Tim
|
5f27519c67
|
table可拖拽
|
2016-05-27 14:44:32 +08:00 |
cxt
|
400a470a2b
|
作品列表的样式调整
|
2016-05-27 14:42:12 +08:00 |
cxt
|
03d70e8c9a
|
作品列表:当先进行作品搜索或选择分班操作后,然后点击“隐藏作业信息”,再点击“显示作业信息”无反应 (测验列表也一起修复了)
|
2016-05-27 14:27:54 +08:00 |
cxt
|
3b33732e6f
|
学生列表的姓名、学号、分班和加入时间做成不可点击的
|
2016-05-27 14:15:26 +08:00 |
yuanke
|
cfc3751f6f
|
Merge branch 'yuanke' into develop
|
2016-05-27 14:01:02 +08:00 |
huang
|
c7bf29b0c9
|
组织切换问题
|
2016-05-27 12:46:11 +08:00 |
huang
|
f3a1a7371d
|
资源过多最下面点击更新版本的时候弹框没有居中
|
2016-05-27 10:43:50 +08:00 |
huang
|
fb46062640
|
项目、课程、组织资源列表发送无法弹框问题
|
2016-05-27 10:20:15 +08:00 |
huang
|
74384d10a5
|
组织 论坛编辑
|
2016-05-27 10:06:25 +08:00 |
huang
|
213b0f75b0
|
Merge branch 'hjq_resource' into develop
|
2016-05-27 09:33:44 +08:00 |
huang
|
ab4aa0f06f
|
公共资源多个资源发送功能
|
2016-05-27 09:32:24 +08:00 |
cxt
|
ff974d6901
|
Merge branch 'weixin_guange' into develop
Conflicts:
app/views/wechats/login.html.erb
|
2016-05-26 15:32:00 +08:00 |
cxt
|
4d5ee5a722
|
微信的欢迎图片及欢迎词的修改,测试版的配置
|
2016-05-26 15:27:31 +08:00 |
guange
|
e4653426d2
|
将openid存到session
|
2016-05-26 12:59:15 +08:00 |
huang
|
0a7d1f1efc
|
公共资源库添加资源多个发送功能,修复项目、课程多个发送的bug
|
2016-05-25 17:54:53 +08:00 |
cxt
|
8257770ec9
|
课程和项目留言的点赞
|
2016-05-25 16:20:01 +08:00 |
cxt
|
c8467a50a0
|
自己可以给自己点赞
|
2016-05-25 16:19:41 +08:00 |
cxt
|
5c9ec49457
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-25 15:27:00 +08:00 |
cxt
|
09b831c189
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-25 14:57:59 +08:00 |
cxt
|
d9bd13c2fc
|
复制课程报500
|
2016-05-25 14:57:46 +08:00 |
huang
|
457cf72263
|
断行样式
发送JS
|
2016-05-25 14:08:05 +08:00 |
huang
|
0a8d21ea55
|
公共资源底端发送JS
|
2016-05-25 14:05:09 +08:00 |
huang
|
415b624e0b
|
样式问题
|
2016-05-25 11:07:36 +08:00 |
huang
|
2abb68c00c
|
组织代码公共部分整理
|
2016-05-25 10:54:49 +08:00 |
huang
|
b6de2dbd2d
|
发布作业导入资源
|
2016-05-25 09:44:30 +08:00 |
huang
|
4280d79eab
|
Merge branch 'develop' into hjq_beidou
|
2016-05-25 09:11:55 +08:00 |
huang
|
197f054c18
|
注释掉申请私有资源功能
|
2016-05-25 09:10:41 +08:00 |
huang
|
d1e11d4260
|
代码审查后代码简化
|
2016-05-25 08:58:58 +08:00 |
huang
|
b38bd0c1e5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-24 20:13:42 +08:00 |
cxt
|
ed2f413949
|
代码还原
|
2016-05-24 20:04:06 +08:00 |
cxt
|
fc3b47e3aa
|
测验统计结果的js问题
|
2016-05-24 16:37:21 +08:00 |
huang
|
a4f2ebb73b
|
Merge branch 'develop' into hjq_beidou
|
2016-05-24 16:12:27 +08:00 |
huang
|
a7a2be6a4b
|
作业导入资源问题
|
2016-05-24 16:01:02 +08:00 |
Tim
|
1c0a68e57b
|
组织配置成员tab,搜索结果太多导致换页断行问题
|
2016-05-24 15:47:22 +08:00 |
Tim
|
65c7719ed2
|
设置大纲图标在讨论区换行显示问题
|
2016-05-24 15:18:11 +08:00 |
cxt
|
ccf29c980a
|
作业列表搜索作业:搜索结果中包括不包含关键字的作业、作业回复框加载不出
|
2016-05-24 10:34:36 +08:00 |
huang
|
bc0e24d39e
|
资源引用代码注释
|
2016-05-24 10:28:17 +08:00 |
huang
|
ed7c6cbcfe
|
组织新建帖子增减status状态
|
2016-05-24 09:40:16 +08:00 |
yuanke
|
e7d20c2b98
|
1.项目用户反馈、课程留言区增加自动识别URL功能
2.所有自动识别URL区域的链接颜色都改为#15bccf
|
2016-05-24 09:11:50 +08:00 |
huang
|
0e03798f6e
|
组织框架结构(yeild)修改
|
2016-05-23 16:24:32 +08:00 |
yuanke
|
5eff3db9e8
|
1.问答区时间排序BUG修复、只显示更新时间、发贴人放左下角、内容截断一点
2.KE编辑器输入内容时需有一点下边距
3.KE中编辑使用段落显示时有颜色的问题
|
2016-05-23 15:58:32 +08:00 |
cxt
|
2afce9d563
|
隐藏导入作业的申请题库
|
2016-05-23 14:05:28 +08:00 |
huang
|
a60356091b
|
issue中添加类型tag
|
2016-05-23 11:02:21 +08:00 |
cxt
|
820e594fec
|
题库的私有作业显示作业详情
|
2016-05-23 10:53:49 +08:00 |
cxt
|
c3ec7289b7
|
Merge branch 'develop' into cxt_course
|
2016-05-23 09:51:59 +08:00 |
huang
|
eead7962cf
|
资源申请权限控制
|
2016-05-21 11:39:50 +08:00 |
huang
|
66709b16e5
|
Merge branch 'yuanke' into develop
|
2016-05-20 22:09:58 +08:00 |
huang
|
27d029271b
|
Merge branch 'cxt_course' into develop
|
2016-05-20 22:08:45 +08:00 |
huang
|
86ff725b8a
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-20 22:08:32 +08:00 |
yuanke
|
76006ef3e7
|
组织一级二级帖子删除文章问题
|
2016-05-20 22:07:33 +08:00 |
huang
|
039d11e862
|
资源发送权限问题
|
2016-05-20 21:48:51 +08:00 |
Tim
|
51cd9c6dd1
|
学号溢出bug
|
2016-05-20 21:47:31 +08:00 |
huang
|
0fcd8ae86d
|
导入资源鼠标点击效果
|
2016-05-20 21:10:53 +08:00 |
huang
|
cdde844e44
|
Merge branch 'cxt_course' into develop
|
2016-05-20 21:01:30 +08:00 |
huang
|
f94806bcdf
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-05-20 21:01:18 +08:00 |
huang
|
e512154ea9
|
古剑删除描述一致
|
2016-05-20 21:00:36 +08:00 |
huang
|
d9241d5dca
|
组织栏目帖子设为首页后显示在栏目中
|
2016-05-20 20:55:43 +08:00 |
Tim
|
dd4786d639
|
作品列表查看详情定位
|
2016-05-20 20:44:13 +08:00 |
huang
|
166a97dc0c
|
注释
|
2016-05-20 20:37:11 +08:00 |
huang
|
acb6d5892d
|
Merge branch 'yuanke' into develop
|
2016-05-20 20:31:39 +08:00 |
huang
|
90bb940290
|
资源下载链接问题
|
2016-05-20 20:27:32 +08:00 |
yuanke
|
d4be470e5f
|
1.组织二级帖子文章回复不了
2.组织二级帖子文章点进详情页面删除不了文章
|
2016-05-20 20:08:46 +08:00 |
Tim
|
5f4a9304fe
|
提交成绩后,列表成绩没刷新修改;分组作业列表宽度调整
|
2016-05-20 20:05:39 +08:00 |
huang
|
3ffe131a73
|
删除的提示
|
2016-05-20 20:02:17 +08:00 |
huang
|
f308b24f5a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-20 19:52:57 +08:00 |
huang
|
baf7e1dbc0
|
没有连接点击不刷新页面
|
2016-05-20 19:52:42 +08:00 |
Tim
|
1c7efa247e
|
老师提交分数后格式混乱修改
|
2016-05-20 19:13:55 +08:00 |
cxt
|
f517fc5a11
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-05-20 19:11:16 +08:00 |
cxt
|
56a151a7b4
|
学生打开的作品列表中不应通过下拉列表访问到挂起的作业
|
2016-05-20 19:11:09 +08:00 |