 cxt
|
0d05d04d2c
|
头像编辑的样式调整
|
9 years ago |
|
cxt
|
62e28f638c
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/views/layouts/_course_base_info.html.erb
app/views/layouts/base_projects.html.erb
app/views/layouts/new_base_user.html.erb
|
9 years ago |
|
cxt
|
774b5eca89
|
课程和项目的头像点击可编辑
|
9 years ago |
 Tim
|
a8f30fe85f
|
个人主页，课程，项目头像、logo增加编辑按钮
|
9 years ago |
|
cxt
|
f4b5a5cf4e
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
Tim
|
fbad4ecd8a
|
班级页面logo及行间距调整；测导航数字大小背景调整
|
9 years ago |
|
cxt
|
b33136c59b
|
班级问答区改成讨论区
|
9 years ago |
 daiao
|
a466fdd64e
|
强制修改基本资料：申请单位点击确定后，进入主页面；提问按钮不可用
|
9 years ago |
|
cxt
|
60beb2abab
|
首页左侧班级和项目列表的收藏功能
|
9 years ago |
|
cxt
|
56b74b755b
|
取消收藏
|
9 years ago |
|
cxt
|
7d89f69981
|
班级和项目收藏夹
|
9 years ago |
|
daiao
|
8b0c0925dd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
9 years ago |
|
cxt
|
6af43070c7
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
Tim
|
57ecffc130
|
班级新增收藏功能
|
9 years ago |
|
cxt
|
5d5bd88c88
|
个人主页：用户不应有修改他人头像的权限
|
9 years ago |
|
daiao
|
7e34062435
|
Merge branch 'dev_shcool' into develop
|
9 years ago |
|
cxt
|
572ad5a162
|
个人主页的课程和项目展开出现重复数据
|
9 years ago |
|
cxt
|
1374444ec1
|
左侧项目列表的展开
|
9 years ago |
|
Tim
|
f67336fbe5
|
课程信息单词折行
|
9 years ago |
|
cxt
|
35260f2f6d
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
daiao
|
4a9967674a
|
1. 强制编辑基本资料，在删除单位时给出消息通知
2. 单位名称申请提示一直显示
3. 申请单位的消息通知显示申请人头像，并连接到申请人主页
|
9 years ago |
|
cxt
|
bae0562b97
|
适用专业和先修课程的换行显示
|
9 years ago |
|
Tim
|
83323e7d18
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
Tim
|
ba7f9ed735
|
班级、项目侧导航文字缩小
|
9 years ago |
|
cxt
|
8de8035441
|
班级首页顶部加上主讲老师的链接
|
9 years ago |
|
cxt
|
65f6b0fc70
|
新建课程报500
|
9 years ago |
|
cxt
|
4a527dc84e
|
Merge branch 'cs_optimize_txz' into develop
|
9 years ago |
|
cxt
|
547aae0743
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
40dc9b761f
|
未配置课程的班级报404
|
9 years ago |
|
daiao
|
e89d7398aa
|
申请管理消息通知
|
9 years ago |
|
Tim
|
d4f08f6498
|
课程logo替换，邀请码样式更改，班级路径显示主讲教师
|
9 years ago |
|
cxt
|
aaaeb4b8da
|
子域名申请消息报错
|
9 years ago |
|
cxt
|
e7e873e0df
|
Merge branch 'dev_shcool' into develop
Conflicts:
app/helpers/users_helper.rb
|
9 years ago |
|
cxt
|
fb5a969fd3
|
消息弹窗
|
9 years ago |
|
cxt
|
3178700131
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
daiao
|
7fbca5f260
|
单位审查消息及其BUG修复
|
9 years ago |
|
cxt
|
0d86a28c54
|
我的作业
|
9 years ago |
 huang
|
dd768c2913
|
Merge branch 'cs_optimize_txz' into develop
Conflicts:
public/stylesheets/css/common.css
|
9 years ago |
|
Tim
|
56452d69f4
|
侧导航字体大小，颜色更改
|
9 years ago |
|
cxt
|
b7c05fed4a
|
首页样式和js调整
|
9 years ago |
|
cxt
|
6c7b53f7d4
|
首页左侧栏
|
9 years ago |
|
cxt
|
acc3ba121f
|
测试集的显示、新版分页
|
9 years ago |
|
cxt
|
718b13e6c1
|
新版题库
|
9 years ago |
|
huang
|
7658844a28
|
鼠标经过弹框消息提示
|
9 years ago |
|
daiao
|
911a769670
|
Merge branch 'develop' into dev_shcool
Conflicts:
app/models/applied_message.rb
|
9 years ago |
|
cxt
|
98a2ebd682
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
a41fbdb985
|
课程大纲报500
|
9 years ago |
|
huang
|
847cae6d41
|
Merge branch 'develop' into rep_quality
Conflicts:
app/models/applied_message.rb
db/schema.rb
|
9 years ago |
|
daiao
|
3251890c91
|
Merge branch 'rep_quality' into dev_shcool
Conflicts:
app/models/applied_message.rb
db/schema.rb
|
9 years ago |
|
daiao
|
430a93e4b2
|
单位名称列表功能代码
|
9 years ago |
|
cxt
|
02bee33ad2
|
身份切换加提示
|
9 years ago |
|
huang
|
0bf9b5c6e6
|
消息红点记录 个人主页添加加入项目入口
|
9 years ago |
|
huang
|
153efb7eda
|
局部刷新
|
9 years ago |
|
cxt
|
e3d538c3fa
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/_course_base_info.html.erb
db/schema.rb
|
9 years ago |
|
cxt
|
72977886c7
|
Merge branch 'cs_optimize_txz' into cxt_course
Conflicts:
app/views/layouts/_course_base_info.html.erb
|
9 years ago |
|
cxt
|
5a8d2407e2
|
放开新建课程、新建班级的权限
|
9 years ago |
|
cxt
|
335b82c046
|
加入班级的弹框
|
9 years ago |
|
cxt
|
a1a2b3dd33
|
Merge branch 'rep_quality' into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
848c56d54e
|
班级主页身份切换、成员管理页面的多重身份
|
9 years ago |
|
huang
|
a8fa4a55e3
|
项目申请消息发送
|
9 years ago |
|
cxt
|
e275cd9aa0
|
邀请码
|
9 years ago |
|
cxt
|
e2546cdcb7
|
邀请码的提示
|
9 years ago |
|
cxt
|
2fea69359d
|
非本课程成员无法看到邀请码
|
9 years ago |
|
Tim
|
52475099dc
|
博客设为主页后，文字整个容器宽度显示；班级配置图标菜单css冲突处理；大纲样式冲突处理
|
9 years ago |
|
cxt
|
a1149c1104
|
班级列表的公开私有
|
9 years ago |
|
cxt
|
aafe0aa4ae
|
删除班级留言时左侧导航栏的样式问题
|
9 years ago |
|
cxt
|
04207609cb
|
未配置课程的班级打开报500
|
9 years ago |
|
huang
|
774650c819
|
项目邀请码直接数据库读取，权限修改
|
9 years ago |
|
cxt
|
812481d5fa
|
非班级成员邀请码显示为*****
|
9 years ago |
|
huang
|
84d1adbf25
|
生成邀请码
|
9 years ago |
|
cxt
|
0564ddb6ea
|
课程大纲的回复
|
9 years ago |
|
cxt
|
6c7925a7b4
|
样式调整
|
9 years ago |
|
cxt
|
45fb2d0a3e
|
Merge branch 'develop' into cxt_course
|
9 years ago |
|
cxt
|
6d4835c6cc
|
样式调整
|
9 years ago |
|
huang
|
0e1a52726f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/base_syllabus.html.erb
|
9 years ago |
|
cxt
|
27afee03b2
|
编辑课程的英文名称时输入框不清空
|
9 years ago |
|
cxt
|
6b1116dfd1
|
课程的回复和名称的编辑
|
9 years ago |
|
cxt
|
9422e2886c
|
新版班级主页
|
9 years ago |
|
cxt
|
1e28ff880d
|
新版课程大纲
|
9 years ago |
|
Tim
|
53c515b8d1
|
课程大纲侧导航js控制
|
9 years ago |
|
Tim
|
78e4d37d8b
|
大纲base页引入弹框样式；作业列表调整
|
9 years ago |
|
Tim
|
e966972750
|
Merge branch 'develop' into cs_optimize_txz
Conflicts:
app/views/versions/index.html.erb
|
9 years ago |
|
cxt
|
b7e6725e1f
|
管理员界面的课程名称双击可点击
|
9 years ago |
|
Tim
|
2d1d3083d0
|
引入project.css
|
9 years ago |
|
Tim
|
c41a116378
|
博客上传附件后，编辑处文件夹图标显示；大纲引用css样式更改
|
9 years ago |
|
cxt
|
9bf853d2bb
|
管理员可修改课程名称和英文名称
|
9 years ago |
|
cxt
|
16cf8a56a1
|
管理员和老师可看到课程下的所有班级
|
9 years ago |
|
Tim
|
73b7b00db9
|
班级学生列表导航栏下拉框错位调整
|
9 years ago |
|
cxt
|
f0e456729e
|
过滤掉消息中的html
|
9 years ago |
|
Tim
|
a0db221ffc
|
Merge branch 'develop' into cs_optimize_txz
|
9 years ago |
|
cxt
|
c224f97905
|
样式调整、线下作业的作品评分、导出作业成绩报500
|
9 years ago |
|
cxt
|
290abeeaa4
|
班级名称的显示
|
9 years ago |
|
cxt
|
3b91adf689
|
课程大纲内的编辑图标的显示与隐藏
|
9 years ago |
|
cxt
|
37dd447fcb
|
Merge branch 'daiao_dev' into cxt_course
Conflicts:
app/views/admin/courses.html.erb
public/stylesheets/new_user.css
|
9 years ago |
|
cxt
|
da7509f64c
|
课程大纲的优化
|
9 years ago |
|
daiao
|
c621602050
|
修复当鼠标移至区域内才会显示icon
|
9 years ago |
|
cxt
|
a99b03ff76
|
管理员界面增加配置课程
|
9 years ago |
|
Tim
|
75475b6058
|
个人主页，课程，项目样式更新
|
9 years ago |
|
daiao
|
ad36a1b29e
|
修复课程下编辑框英文换行缺陷
|
9 years ago |
|
Tim
|
1658f78a7b
|
Merge branch 'develop' into cs_optimize_txz
Conflicts:
app/views/layouts/new_base.html.erb
app/views/layouts/new_base_user.html.erb
app/views/users/_user_resource_info.html.erb
|
9 years ago |
|
cxt
|
3ccdf7f9ae
|
课程问答区，项目讨论区的帖子消息通知应直接打开对应的帖子详情界面
|
9 years ago |
|
cxt
|
17a2686d42
|
班级左侧头部信息的样式调整
|
9 years ago |
|
cxt
|
23eefc2b7f
|
班级主页：建议将如图所示适当往上调一点，与左侧头像对齐
|
9 years ago |
 yuanke
|
447e624f36
|
课程大纲bug修复
|
9 years ago |
|
cxt
|
e834d09469
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
5a1090c0e1
|
bug修复
|
9 years ago |
|
cxt
|
6867a88a94
|
课程大纲样式调整
|
9 years ago |
|
cxt
|
0ff8f0a774
|
课程大纲的删除和课程大纲描述的删除
|
9 years ago |
|
cxt
|
25b5d74a42
|
课程大纲的修改
|
9 years ago |
|
cxt
|
18d677c5eb
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/courses.css
|
9 years ago |
|
cxt
|
2c1e0f534c
|
课程大纲
|
9 years ago |
|
yuanke
|
397c4cc2a5
|
1.重新发送注册邮件修改2.个人资料修改页面修改3.问题反馈处增加直接加入QQ群的按钮
|
9 years ago |
|
Tim
|
ba1db91a1e
|
css优化调整
|
9 years ago |
|
cxt
|
ac4218bfb0
|
课程大纲列表
|
9 years ago |
|
cxt
|
ebb697a49f
|
班级列表、课程大纲的编辑、回复、课程列表
|
9 years ago |
|
cxt
|
e066445036
|
课程大纲的显示和编辑
|
9 years ago |
|
cxt
|
383483de26
|
课程大纲的左侧栏base，新建课程大纲、新建班级的调整
|
9 years ago |
|
cxt
|
76e7c50bf4
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_reply_to.html.erb
|
9 years ago |
|
cxt
|
afc8fad7fd
|
通过邀请码加入课程
|
9 years ago |
|
cxt
|
ac629440b1
|
课程邀请码
|
9 years ago |
|
Tim
|
8a6bbf50a9
|
css文件替换
|
9 years ago |
|
cxt
|
44334913ee
|
未读消息弹窗漏了一条消息
|
9 years ago |
|
cxt
|
c4cea93a44
|
消息列表的“展开更多”指针手势修改
|
9 years ago |
|
cxt
|
4f80e259e8
|
消息弹窗的延时显示
|
9 years ago |
|
cxt
|
f4d67bc027
|
未读消息弹窗“点击展开”显示10条未读消息
|
9 years ago |
|
cxt
|
048bb7fed5
|
头像下拉菜单、未读消息的延时
|
9 years ago |
|
cxt
|
b26a6b5195
|
消息弹窗的链接无效
|
9 years ago |
|
huang
|
8741917823
|
访问统计 （自2016年5月）
|
9 years ago |
|
cxt
|
1dac05c6d1
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
d127c6e12c
|
访问添加自某年某月
|
9 years ago |
|
huang
|
5e3df51ad9
|
完成新版登录注册
|
9 years ago |
|
Tim
|
9cd1630651
|
优化css添加，将课程，项目，个人主页，组织首页样式替换，登录与个人主页详细css替换
|
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 |
|
huang
|
a2c5cc6da1
|
登录界面base及新页面
|
9 years ago |
|
yuanke
|
44c9265fee
|
个人主页个性签名增加自动识别url
|
9 years ago |
|
cxt
|
24f5e245df
|
鼠标经过消息通知时弹窗显示最新的5条未读消息
|
9 years ago |
|
huang
|
fdb1846f75
|
Merge branch 'hjq_beidou' into develop
|
9 years ago |
|
huang
|
1553eadc58
|
宽度改成1000二级目录模式二样式调整
|
9 years ago |
|
cxt
|
0bf46f2ecd
|
帮助中心的弹框
|
9 years ago |
|
cxt
|
ee12b3540b
|
消息弹窗的还原、微信配置修改
|
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
|
b128ba5257
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/views/layouts/base_org2.html.erb
|
9 years ago |
|
huang
|
3af115ee54
|
组织新版样式，及方法优化
|
9 years ago |
|
cxt
|
b833c1f0a4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
1396cae14c
|
消息弹框
|
9 years ago |
|
huang
|
0eb6dbe48a
|
Merge branch 'huang_temp2' into develop
Conflicts:
app/views/layouts/base_org2.html.erb
|
9 years ago |
|
huang
|
d047409d31
|
项目动态
|
9 years ago |
|
huang
|
ba344a86b5
|
颜色
|
9 years ago |
