 sw
|
20d97848e7
|
作业界面增加默认值显示
|
11 years ago |
|
sw
|
f3fefe50f1
|
1、增加flash显示样式
2、修改老师创建作业完成的js
3、修改老师创建作业界面样式
|
11 years ago |
 z9hang
|
cb278e65a2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/javascripts/course.js
public/stylesheets/courses.css
|
11 years ago |
|
z9hang
|
d44bbe9de1
|
课程通知界面新建通知修改
|
11 years ago |
|
sw
|
5139ac30dc
|
修改老师新建作业界面
|
11 years ago |
|
z9hang
|
aaf14d5d1a
|
修改课程通知页面
|
11 years ago |
|
sw
|
36bd04cc7a
|
国际化课程作业列表
|
11 years ago |
|
sw
|
aa240a759a
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
z9hang
|
587a739c76
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
sw
|
b6b479f6f9
|
1、增加开启关闭匿评时弹框
2、增加js调用是等待的样式
|
11 years ago |
|
z9hang
|
26feaba6e8
|
去掉旧的资源样式的引用
|
11 years ago |
|
sw
|
69d1fdb699
|
111111111111111
|
11 years ago |
|
sw
|
3418c9ccee
|
1、修改course/homewrok方法
2、修改course的作业列表显示
|
11 years ago |
|
sw
|
3bd0bf3c49
|
1、添加标签url修改
2、删除标签是js页面刷新
|
11 years ago |
|
sw
|
46410c8e8d
|
1、修改删除TAG后js刷新页面
2、删除课程TAG时增加提示
|
11 years ago |
|
sw
|
308568d668
|
未登录用户不容许给课程添加标签
|
11 years ago |
|
sw
|
e4ea97486b
|
课程增加添加标签功能
|
11 years ago |
|
sw
|
7541a83b16
|
改课程首页用新建问卷
|
11 years ago |
|
sw
|
90df8056c8
|
1、修改分页控件中省略号颜色
2、更新样式文件
3、修改课程首页用新建问卷换行
|
11 years ago |
|
sw
|
258d9bf33a
|
1、调整分页控件显示样式
2、修改课程动态分页算法
3、更新样式文件
|
11 years ago |
|
sw
|
b9ed34f86e
|
1、右边内容区域、增加js：最短为左侧长度
2、修改课程首页动态显示
3、修改course.css文件
|
11 years ago |
|
sw
|
d92ac2d909
|
1、课程跳到其他页面后没有分块
2、修改course_show界面
|
11 years ago |
|
sw
|
423849ca84
|
加入课程、退出课程、配置、关闭、复制等按钮
|
11 years ago |
|
sw
|
1c30b8c81c
|
1、增加获取某个课程动态数的方法
2、修改首页配置、关闭、复制课程等按钮的样式
|
11 years ago |
|
sw
|
8f5d8c86a3
|
新版样式header调整
|
11 years ago |
|
sw
|
64b0646281
|
base_course基本完成
|
11 years ago |
|
sw
|
e7cce1fd28
|
修改项目html错误
|
11 years ago |
|
sw
|
642cf80bf8
|
调整课程主页分块显示
|
11 years ago |
|
sw
|
278854156a
|
调整课程信息样式
|
11 years ago |
|
sw
|
16872597b6
|
实现课程搜索
|
11 years ago |
|
sw
|
ec1ff6dfc3
|
1、修改课程界面未登录时，先显示注册，再显示登录
2、增加课程相关的css引用
3、增加top、left、content的静态页面
|
11 years ago |
|
sw
|
4d60a6dabc
|
1、修改版权
2、增加footer
|
11 years ago |
|
sw
|
4c482e1fac
|
完成新的用户反馈界面
|
11 years ago |
|
sw
|
d2c7861706
|
1、添加缺少图片
2、修改意见反馈框默认为关闭
3、修改css中部分图片链接错误
|
11 years ago |
|
sw
|
e4c0c840bf
|
1、完成课程模块导航栏样式调整
2、修改意见反馈默认在右下角位置
3、调整我的课程、我的项目js
4、ruby生成的菜单栏添加样式及部分方法重写
5、封装部分页面的ruby代码到helper
|
11 years ago |
|
sw
|
747a109638
|
1、添加CSS文件
2、调整首页HTML
3、去掉base_header中没用的erb语句
|
11 years ago |
|
sw
|
88d6b25ace
|
1、修改意见反馈图片
2、去掉个人首页权限判断
|
11 years ago |
|
sw
|
3b0a229c43
|
1.修改意见反馈框默认关闭
2、FIle--->资源库
|
11 years ago |
|
sw
|
e4895731ae
|
Merge branch 'develop' into szzh
|
11 years ago |
whimlex
|
aee987d634
|
邀请Trustie用户
|
11 years ago |
|
sw
|
e4e56e01b1
|
修改项目邀请用户失败时的提示
|
11 years ago |
|
sw
|
ca7c970094
|
修改意见反馈框位置
|
11 years ago |
|
z9hang
|
da23b4fd21
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
ff65bf4ba5
|
app自动更新功能功能，无法下载问题修正
|
11 years ago |
 huang
|
cc5a22f2c6
|
修改新建按钮样式
|
11 years ago |
|
sw
|
aa8d1741f9
|
修改项目发送邮箱时的正则验证
|
11 years ago |
|
huang
|
da02f3fbb4
|
去掉项目标签为空提示
|
11 years ago |
|
sw
|
368a3ce1fa
|
修改项目创建时间显示不正确
|
11 years ago |
|
huang
|
1ed542af09
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
huang
|
a010c800d6
|
修改权限库为空情况下403问题
修改项目标题样式
确认发送国际化
添加小图标
|
11 years ago |
|
z9hang
|
e165dd6572
|
修改编码
|
11 years ago |
|
z9hang
|
2ccb7ff387
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
ed674d960c
|
课程动态国际化问题
|
11 years ago |
|
whimlex
|
cef923b8a8
|
邮件邀请用户国际化
|
11 years ago |
|
huang
|
fb907094f8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
47e1427ead
|
左侧工具栏添加功能：左侧统计数目为零的手不显示
|
11 years ago |
|
whimlex
|
28321deeb5
|
邮件邀请用户
|
11 years ago |
|
whimlex
|
18422ecf6a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/projects/invite_members_by_mail.html.erb
|
11 years ago |
|
whimlex
|
1e5fac32b4
|
添加邮箱验证
|
11 years ago |
|
sw
|
fd8edc9a02
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
2b28448397
|
Merge branch 'guange_dev' into szzh
|
11 years ago |
|
huang
|
ab57e7e432
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
96b2627fda
|
修改邮件居中样式及提示
|
11 years ago |
|
sw
|
362bad594f
|
修改项目发送邮件邀请页面样式，以及提示
|
11 years ago |
|
whimlex
|
3a1f0aec55
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
5f88ffc5d0
|
项目邀请用户国际化，js判断邮件格式
|
11 years ago |
|
sw
|
7dc6f76060
|
Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev
|
11 years ago |
|
sw
|
78039a726e
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
|
sw
|
ceb6ccf908
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
971c278de5
|
#2026 作业创建时间->截至时间
|
11 years ago |
|
huang
|
77bf3be20d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_users.html.erb
|
11 years ago |
|
huang
|
b809e8844c
|
修改项目中添加标签按钮显示异常
|
11 years ago |
|
z9hang
|
2d05c3273f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
8190403380
|
app添加忘记密码接口，课程动态接口代码优化（去掉其中的中文）
|
11 years ago |
|
sw
|
d18e9ff66b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
312d7660b2
|
增加邀请成功后的提示
邀请成功后跳转页面修改
调整翻页控件的样式
|
11 years ago |
|
huang
|
4bfc72dc28
|
用新表统计动态
修改关注样式
|
11 years ago |
|
sw
|
2ee04d55f2
|
修改项目邀请用户的界面
|
11 years ago |
|
huang
|
6fa5863665
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
0ba7ef0560
|
修改邮箱邀请时，邮件为空时提示错误
|
11 years ago |
|
z9hang
|
7e7da7e445
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
a05061af73
|
#1859 课程--资源库：全站搜索中“选入我的其他课程”弹出的课程列表中包括当前课程
|
11 years ago |
|
sw
|
717be2b045
|
修改部分用户的用户首页报错
|
11 years ago |
|
sw
|
5340ad7fc1
|
修改组织首页不显示私有项目
|
11 years ago |
|
sw
|
69eecf49d1
|
还原冲突
|
11 years ago |
|
sw
|
2ac2c1848c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
11 years ago |
|
whimlex
|
6f4ef81eb9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
65ee3fdc74
|
项目主页国际化，项目主页JS冲突解决
|
11 years ago |
|
sw
|
5258b7585b
|
处理冲突还原代码
|
11 years ago |
|
huang
|
64bbbff879
|
添加里程碑
|
11 years ago |
|
sw
|
b27bb34662
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
11 years ago |
|
huang
|
c773e0fd39
|
JS冲突，去掉多余标点
|
11 years ago |
|
huang
|
29655838f0
|
项目超过的部分用“展示更多信息”拉开
|
11 years ago |
|
huang
|
c36db9fd63
|
项目左侧按钮实现配置-模块进行显示/隐藏管理
|
11 years ago |
|
whimlex
|
11da65c9ad
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
config/locales/en.yml
config/locales/zh.yml
|
11 years ago |
|
whimlex
|
57c8575470
|
新版项目模块国际化，目前完成各项目主页，项目动态，项目评分
|
11 years ago |
|
sw
|
4b831c9e65
|
#2001 项目--工具集中wiki-“查看差别”中有html标签
|
11 years ago |
|
huang
|
3ee9ac2b50
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
11 years ago |
|
huang
|
8f0af4c00d
|
修改了未登陆情况下通过URL访问不允访问的
|
11 years ago |
|
sw
|
04e5aee3c2
|
版本库和新建版本库两个不同的权限
|
11 years ago |
