 Tim
|
24458ecb48
|
table可拖拽，在线测验表格布局优化
|
9 years ago |
 huang
|
8f73cba44b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
41bb68d0e1
|
Merge branch 'hjq_login' into develop
|
9 years ago |
|
huang
|
5e3df51ad9
|
完成新版登录注册
|
9 years ago |
|
huang
|
aa42044199
|
注册登录
|
9 years ago |
|
huang
|
06f97d5cb7
|
注册页面（未完）
|
9 years ago |
 cxt
|
03b92f8570
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
 yuanke
|
1023b94f0d
|
新建贴吧之后转入这个贴吧界面,组织配置栏目默认选择第一项
|
9 years ago |
|
yuanke
|
ec4273fc49
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
yuanke
|
a17fb86a17
|
组织回复点登录直接跳入登录页面
|
9 years ago |
|
cxt
|
43192b8648
|
分组作业的弹框增加人数的验证、点击关闭弹框时还原弹框中的值
|
9 years ago |
|
huang
|
9b6f40bb02
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
a2c5cc6da1
|
登录界面base及新页面
|
9 years ago |
|
yuanke
|
5a7f7da1f7
|
新建贴吧和组织配置默认选项暂时还原。
|
9 years ago |
|
huang
|
d75a8bc35a
|
Merge branch 'hjq_beidou' into develop
|
9 years ago |
|
huang
|
45f185bf9b
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
huang
|
c15ef27fc0
|
管理员能看到组织资源
|
9 years ago |
|
yuanke
|
7b6e8fbc53
|
修改组织点击登录后可回复报500的BUG
|
9 years ago |
|
cxt
|
caa966c85a
|
分组作业的作品列表提示的修改
分组作业提交作品时的最小人数限制不起作用
|
9 years ago |
|
Tim
|
f7832b00c9
|
更新历史版本时描述位置调整
|
9 years ago |
|
cxt
|
c50d307e89
|
分组作业添加成员后再次打开，数据未保存
|
9 years ago |
guange
|
ada15b4212
|
格式上的调整, 现在可以分开写,但发布时打成一个js提高性能
|
9 years ago |
|
cxt
|
254e1f44f6
|
评分设置提示的修改与提交时的判断
|
9 years ago |
 Linda
|
01bd394a59
|
门户首页按照祎欣0613版本设计修改
|
9 years ago |
|
huang
|
5515fb660f
|
完成资源更新的时候 描述继承问题，并且可以修改描述
|
9 years ago |
|
huang
|
d21df48961
|
代码质量分析弹框及参数传入
|
9 years ago |
|
cxt
|
e7499c95c5
|
点击打开测验作品列表中某作品，在作品详情页面增加返回统计列表的快捷操作
|
9 years ago |
|
huang
|
c6bd5e6d31
|
饼状图
|
9 years ago |
|
yuanke
|
44c9265fee
|
个人主页个性签名增加自动识别url
|
9 years ago |
|
huang
|
0c25e3b13d
|
版本库质量分析 ssh链接
|
9 years ago |
|
cxt
|
6c7237509d
|
“当前作品未进行评分，是否确定提交”改为“您当次评阅未对作品进行评分，分数将取上次的评分结果，若没有评分记录则不评分，是否确定提交？”
|
9 years ago |
|
yuanke
|
e86419c28b
|
组织配置里面栏目类型默认为帖子
|
9 years ago |
|
cxt
|
3a8a61e404
|
在精品课程列表增加“取消精品”列、在全部课程列表增加“开课学期”列，并支持排序
|
9 years ago |
|
yuanke
|
3a46a409a9
|
Merge branch 'develop' into yuanke
|
9 years ago |
|
yuanke
|
f2903ae903
|
新建贴吧后自动跳入该贴吧
|
9 years ago |
|
guange
|
d3d31ca3a2
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
cxt
|
02e2831980
|
管理员界面的留言列表优化
|
9 years ago |
|
huang
|
d4d4e38c41
|
门户模式中含有三级域名的用户图像https问题
|
9 years ago |
|
huang
|
9d3bb44682
|
简洁模式
|
9 years ago |
|
cxt
|
be47331213
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
guange
|
cbc4f2f6fd
|
菜单更新
|
9 years ago |
|
huang
|
dcb3d8659b
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
9d36c74d7f
|
作业回复的删除
|
9 years ago |
|
cxt
|
00528bec60
|
学生列表没有分班就不显示分班列
|
9 years ago |
|
cxt
|
d7c2ca896d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
24f5e245df
|
鼠标经过消息通知时弹窗显示最新的5条未读消息
|
9 years ago |
|
huang
|
928d71500d
|
门户模式--组织栏目没有动态时显示位置
|
9 years ago |
|
guange
|
07760bcfca
|
优化
|
9 years ago |
|
huang
|
d18094cc92
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
78b445a7ae
|
组织历史数据迁移 模式术语修改， 配置页面域名长度问题
|
9 years ago |
|
guange
|
793b651393
|
压缩angularjs
|
9 years ago |
|
yuanke
|
7504b353c9
|
组织报500问题修复
|
9 years ago |
|
cxt
|
a1e49d9a81
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
c0d167d2e2
|
项目缺陷动态的回复不显示
|
9 years ago |
|
huang
|
871a4d2d7b
|
组织设为首页500问题
|
9 years ago |
|
huang
|
3e3c300273
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
b6eb5a3668
|
还原作品列表的拖动
|
9 years ago |
|
huang
|
2f9dcc8a31
|
文章点击500问题
|
9 years ago |
|
huang
|
a138ee31ab
|
详情页面取消首页问题
|
9 years ago |
|
huang
|
6cdccc3b08
|
设置首页显示问题
|
9 years ago |
|
huang
|
67f0cad331
|
组织网站动态新页面
|
9 years ago |
|
huang
|
e4f48f046b
|
子页面没有内容显示
|
9 years ago |
|
guange
|
b965698fdf
|
merge
|
9 years ago |
|
huang
|
fdb1846f75
|
Merge branch 'hjq_beidou' into develop
|
9 years ago |
|
huang
|
9c01bb63e7
|
配置页面管理员栏目权限控制
|
9 years ago |
|
huang
|
a8b68d64ee
|
导航权限控制
|
9 years ago |
|
huang
|
09ff5954bd
|
字体过长演示问题（模式二子页面）
|
9 years ago |
|
guange
|
81e35de2b6
|
base
|
9 years ago |
|
huang
|
c3db6afd75
|
模式二导航栏
|
9 years ago |
|
cxt
|
385ff03c88
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
Tim
|
c5e6514c18
|
作品列表排序图标float消除
|
9 years ago |
|
cxt
|
de58cfb5e5
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
cxt
|
196c92f9c4
|
动态回复最多只加赞三条，点击展开更多时才加载余下的回复
|
9 years ago |
|
huang
|
acf4a64e6a
|
二级帖子子页面
|
9 years ago |
|
Tim
|
1d44116841
|
作品列表可拖拽
|
9 years ago |
|
huang
|
59988f17da
|
帖子目录界面
|
9 years ago |
|
huang
|
1553eadc58
|
宽度改成1000二级目录模式二样式调整
|
9 years ago |
|
Tim
|
253d9da345
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
Tim
|
a96470ad66
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
Tim
|
5b2c22d264
|
历史版本名称过长导致折行
|
9 years ago |
|
huang
|
793978f196
|
组织--名师、学霸：如图搜索结果有多页，翻页后建议输入的搜索条件仍显示在搜索框内
|
9 years ago |
|
huang
|
21197c95b3
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
0bf46f2ecd
|
帮助中心的弹框
|
9 years ago |
|
huang
|
df8df117a8
|
解决匿名用户登录问题（控制器和view）
|
9 years ago |
|
Tim
|
a44cb47a26
|
组织未登录回复框提示
|
9 years ago |
|
huang
|
d3c6c0ca99
|
二级目录未登录时回复提示
|
9 years ago |
|
huang
|
c6d36bd738
|
未登录留言判断
|
9 years ago |
|
cxt
|
91f7e950ee
|
正式版微信
|
9 years ago |
|
cxt
|
75f12e3749
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
ee12b3540b
|
消息弹窗的还原、微信配置修改
|
9 years ago |
|
huang
|
7cce01872d
|
名字样式
|
9 years ago |
|
cxt
|
fe22cfa5c5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
57f3cf713c
|
去掉搜索
|
9 years ago |
|
huang
|
acc808f003
|
样式问题
|
9 years ago |
|
huang
|
429deefadf
|
右一线条样式问题
|
9 years ago |
|
huang
|
65bf816ea4
|
帖子设为首页后，不在模式二中显示问题
|
9 years ago |
|
huang
|
ea19f19973
|
500问题
|
9 years ago |
|
cxt
|
ffe447e5bc
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
d27a050ffa
|
消息弹窗的显示
|
9 years ago |
|
huang
|
c7866af1e8
|
组织编辑成员的时候样式乱的问题
|
9 years ago |
|
huang
|
43e586aa90
|
标题过长隐藏效果
|
9 years ago |
|
huang
|
0b869aaaed
|
去掉定制功能
|
9 years ago |
|
huang
|
b128ba5257
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/views/layouts/base_org2.html.erb
|
9 years ago |
|
huang
|
1e34a4f174
|
显示样式一级添加二级目录权限
|
9 years ago |
|
huang
|
875a604780
|
热点项目描述内容的字数
|
9 years ago |
|
huang
|
fa2437cdf6
|
添加课程学期
|
9 years ago |
|
huang
|
1f43ecb8ed
|
隐藏与配置界面一致，
|
9 years ago |
|
huang
|
2d2e9c540a
|
默认图片及顺序
|
9 years ago |
|
huang
|
7be18b80b4
|
组织链接
|
9 years ago |
|
huang
|
3af115ee54
|
组织新版样式，及方法优化
|
9 years ago |
|
huang
|
a0f722837b
|
精品课程加入到左模式二
|
9 years ago |
|
huang
|
a1200a41b0
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
9 years ago |
|
huang
|
ca3b072f85
|
热门项目按照项目得分排序及设置界面中默认设置
|
9 years ago |
|
Tim
|
3c6c617d09
|
门户样式冲突问题
|
9 years ago |
|
cxt
|
b833c1f0a4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
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
|
9 years ago |
|
Tim
|
bb9c9ddddf
|
添加链接鼠标覆盖蓝色效果
|
9 years ago |
|
cxt
|
1396cae14c
|
消息弹框
|
9 years ago |
|
huang
|
fa03867cc2
|
样式神略问题
|
9 years ago |
|
huang
|
6fbad6d53d
|
右二优化
|
9 years ago |
|
huang
|
0eb6dbe48a
|
Merge branch 'huang_temp2' into develop
Conflicts:
app/views/layouts/base_org2.html.erb
|
9 years ago |
|
huang
|
257165dbaf
|
模式二中添加课程定配
|
9 years ago |
|
huang
|
e2848f4dec
|
创建栏目时默认状态
|
9 years ago |
|
huang
|
dc4f927c39
|
完成右二模式
|
9 years ago |
|
huang
|
52bc4aab81
|
右二（未完）
|
9 years ago |
|
huang
|
0b3ec0322f
|
右一模式
|
9 years ago |
|
huang
|
e05e6ba53d
|
样式对齐问题
|
9 years ago |
|
huang
|
5d880db18e
|
详情页面没登陆可以回复
|
9 years ago |
|
huang
|
fb1a13a522
|
隐藏版本库功能
|
9 years ago |
|
huang
|
d047409d31
|
项目动态
|
9 years ago |
|
huang
|
ba344a86b5
|
颜色
|
9 years ago |
|
huang
|
d532cd3c6c
|
权限
|
9 years ago |
|
huang
|
e374b1679f
|
权限
|
9 years ago |
|
huang
|
135e50b2e7
|
链接
|
9 years ago |
|
huang
|
1f073c19ae
|
域名问题
|
9 years ago |
|
Tim
|
ed46ca0735
|
可拖拽作业列表
|
9 years ago |
|
huang
|
22cafdbd05
|
二级目录弹出
|
9 years ago |
|
huang
|
eecf12eda6
|
添加链接
|
9 years ago |
|
huang
|
76732a3034
|
新模式有一
|
9 years ago |
|
cxt
|
747128750c
|
Merge branch 'weixin_guange' into cxt_course
|
9 years ago |
|
huang
|
e5eeba90f6
|
组织精品课程，热门项目
|
9 years ago |
|
huang
|
27a9170318
|
组织添加设为精品项目，热门课程
|
9 years ago |
|
Tim
|
308f247c71
|
可拖拽调整
|
9 years ago |
|
cxt
|
32dca93b59
|
统一项目反馈、课程留言、讨论区的回复显示：显示留言者姓名
|
9 years ago |
|
cxt
|
fa73171818
|
点击“课程活跃度”和“课程英雄榜”跳到学生列表，并分别以“活跃度”、“英雄榜”倒序排列
|
9 years ago |
|
huang
|
b1cb4e5f94
|
完成左一的配置
|
9 years ago |
|
cxt
|
5097abbe1e
|
Merge branch 'develop' into cxt_course
|
9 years ago |
|
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
|
9 years ago |
|
Tim
|
513fe1a93d
|
作品列表可拖拽
|
9 years ago |
|
huang
|
2acc545896
|
完成组织左二模式
|
9 years ago |
|
huang
|
5c27aee2bd
|
模式二课程模块 定义公共方法（显示描述内容以省略号结束）
|
9 years ago |
|
huang
|
9ecdf0892b
|
完成左三模式的配置
|
9 years ago |
|
guange
|
814fde878e
|
从后台获取openid即可
|
9 years ago |
|
huang
|
91ae3d8b39
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
a96fafd704
|
模式三（未完）
|
9 years ago |
|
cxt
|
ed84783f26
|
私有课程作业的公开作品
|
9 years ago |
|
huang
|
8d56d8556f
|
完成模式6
|
9 years ago |
|
huang
|
bb7204846f
|
新版资源类型定制模式6
|
9 years ago |
|
huang
|
6bfe344cbf
|
组织模式一左侧权限控制
|
9 years ago |
|
huang
|
8f897cbf89
|
组织管理员模式，二级目录局部刷新
|
9 years ago |
|
huang
|
c369b271a0
|
组织管理员配置后的权限控制及局部刷新
|
9 years ago |
|
huang
|
c333a0c55d
|
组织管理员提供学霸功能
|
9 years ago |
|
huang
|
c57c575c84
|
新版组织静态页面模板
|
9 years ago |
|
cxt
|
f024764e29
|
课内学生看到的学生列表中学生“姓名”不应显示昵称
|
9 years ago |
|
huang
|
471ed7cbd2
|
组织logo获取，添加样式图片
|
9 years ago |
|
cxt
|
d4c0e9754a
|
课程描述展开后应显示“收起描述信息”
|
9 years ago |
|
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
|
9 years ago |
|
huang
|
698e4bd7b3
|
header
|
9 years ago |
|
Tim
|
9cc749bd57
|
门户样式统一，防止冲突
|
9 years ago |
|
huang
|
46e4f2c143
|
组织新base框架
|
9 years ago |
|
guange
|
8b623e3a0c
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
9 years ago |
|
guange
|
bb30709fa1
|
window close
|
9 years ago |
|
guange
|
63b9aaefe2
|
window close
|
9 years ago |
|
guange
|
be94d445a9
|
window close
|
9 years ago |
|
guange
|
622d71c476
|
已绑定成功的，直接提示
|
9 years ago |
|
cxt
|
0cafebb3a2
|
新闻列表的点赞
|
9 years ago |
|
huang
|
94dd8befc8
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
f7cb9bdffd
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
huang
|
12ac353de9
|
北斗新base
|
9 years ago |
|
yuanke
|
e650dca1ed
|
修改用户反馈中二级回复 回复框不消失的问题
|
9 years ago |
|
cxt
|
086ccedc08
|
先隐藏作业信息，再点击查询或分班后“显示作业信息”的按钮不见了
|
9 years ago |
|
cxt
|
1535c4cd07
|
编辑分组作业时的基于项目实施总是默认选中
|
9 years ago |
|
yuanke
|
d08809bfbd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/project.css
|
9 years ago |
|
huang
|
ff14809237
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
227a668413
|
分组匿评的显示
|
9 years ago |
|
cxt
|
7599bf75a3
|
分组作业不关联项目时的作品列表样式调整
|
9 years ago |
|
Tim
|
5f27519c67
|
table可拖拽
|
9 years ago |
|
cxt
|
400a470a2b
|
作品列表的样式调整
|
9 years ago |
|
cxt
|
03d70e8c9a
|
作品列表：当先进行作品搜索或选择分班操作后，然后点击“隐藏作业信息”，再点击“显示作业信息”无反应 （测验列表也一起修复了）
|
9 years ago |
|
cxt
|
3b33732e6f
|
学生列表的姓名、学号、分班和加入时间做成不可点击的
|
9 years ago |
|
yuanke
|
cfc3751f6f
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
huang
|
c7bf29b0c9
|
组织切换问题
|
9 years ago |
|
huang
|
f3a1a7371d
|
资源过多最下面点击更新版本的时候弹框没有居中
|
9 years ago |
|
huang
|
fb46062640
|
项目、课程、组织资源列表发送无法弹框问题
|
9 years ago |
|
huang
|
74384d10a5
|
组织 论坛编辑
|
9 years ago |
|
huang
|
213b0f75b0
|
Merge branch 'hjq_resource' into develop
|
9 years ago |
|
huang
|
ab4aa0f06f
|
公共资源多个资源发送功能
|
9 years ago |
|
cxt
|
ff974d6901
|
Merge branch 'weixin_guange' into develop
Conflicts:
app/views/wechats/login.html.erb
|
9 years ago |
|
cxt
|
4d5ee5a722
|
微信的欢迎图片及欢迎词的修改,测试版的配置
|
9 years ago |
|
guange
|
e4653426d2
|
将openid存到session
|
9 years ago |
