 lizanle
|
ceb6af7365
|
课程相关模块添加编辑器
|
10 years ago |
 sw
|
94ecc3e59e
|
1、课程新增成员分页控件样式
2、课程老师列表翻页不可用
|
11 years ago |
|
sw
|
b9031095d4
|
Merge branch 'szzh' into sw_new_course
Conflicts:
Gemfile
app/controllers/courses_controller.rb
app/views/attachments/_form.html.erb
app/views/attachments/_form_course.html.erb
app/views/files/_attachement_list.html.erb
app/views/layouts/base.html.erb
app/views/layouts/base_projects.html.erb
config/locales/zh.yml
public/javascripts/attachments.js
|
11 years ago |
|
lizanle
|
d1bc2b85d0
|
kindeditor。
|
11 years ago |
whimlex
|
1452e09154
|
邮件邀请邮箱格式自动填充；部分国际化
|
11 years ago |
|
sw
|
1ab0215592
|
修改课程动态报错
|
11 years ago |
|
sw
|
90df8056c8
|
1、修改分页控件中省略号颜色
2、更新样式文件
3、修改课程首页用新建问卷换行
|
11 years ago |
|
sw
|
258d9bf33a
|
1、调整分页控件显示样式
2、修改课程动态分页算法
3、更新样式文件
|
11 years ago |
|
sw
|
8f5d8c86a3
|
新版样式header调整
|
11 years ago |
guange
|
fdee890694
|
git优化上线文档补充
|
11 years ago |
|
guange
|
c45850eb8a
|
git hook改为异步
|
11 years ago |
|
guange
|
dc29ccf3b7
|
1. git仓库新建时加入hook代码
2. 对现有的旧hook代码进行更新的rake任务
|
11 years ago |
|
sw
|
ec1ff6dfc3
|
1、修改课程界面未登录时，先显示注册，再显示登录
2、增加课程相关的css引用
3、增加top、left、content的静态页面
|
11 years ago |
|
sw
|
e4c0c840bf
|
1、完成课程模块导航栏样式调整
2、修改意见反馈默认在右下角位置
3、调整我的课程、我的项目js
4、ruby生成的菜单栏添加样式及部分方法重写
5、封装部分页面的ruby代码到helper
|
11 years ago |
|
guange
|
39f1fb879f
|
对Gemfile作了一些优化
1. 源可以从taobao源安装
2. 所有放在lib下的gem删除，从网上下载
|
11 years ago |
|
guange
|
08eae0e5eb
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
ab6c21314d
|
#1503 老师发布的作业可以在课程动态中显示了
|
11 years ago |
|
whimlex
|
5732f0ed03
|
国际化问题修改，新添加en.yml存在中文字符，格式问题
|
11 years ago |
|
whimlex
|
a4a9b2dfdd
|
国际化插件
|
11 years ago |
|
sw
|
770704790d
|
还原修改
|
11 years ago |
|
sw
|
c6788e2f40
|
修复首页报错
|
11 years ago |
 huang
|
f898e2aa91
|
16:22
|
11 years ago |
 z9hang
|
c1c05067e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/admin_controller.rb
db/schema.rb
|
11 years ago |
|
huang
|
9e2c479590
|
new project
|
11 years ago |
|
z9hang
|
3334299808
|
app版本管理功能（表添加，页面部分添加）
|
11 years ago |
 alan
|
22ac578ede
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
alan
|
f374bfd7e2
|
修复《窗口跳转问题》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
4bfc4493eb
|
添加《邮件周日发送》功能，修改《贴吧》邮件发送策略
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
whimlex
|
22aae1910b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/_search_project.html.erb
config/locales/en.yml
config/locales/zh.yml
|
11 years ago |
|
whimlex
|
59a2c8283a
|
国际化结构调整
|
11 years ago |
|
alan
|
d61199f66b
|
merge szzh
|
11 years ago |
|
alan
|
4ebd34722d
|
email_verifier 插件
|
11 years ago |
|
alan
|
2f168dd4d7
|
修改《课程动态》样式
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
lizanle
|
0785384813
|
修改bug，课程动态报错
|
11 years ago |
|
lizanle
|
43e9f738c0
|
添加注释，修改变量命名
|
11 years ago |
|
lizanle
|
475ef12cd5
|
添加注释，修改变量命名
|
11 years ago |
|
lizanle
|
6c76cacb61
|
解决项目动态很慢，数据量很大的问题
|
11 years ago |
|
lizanle
|
d112c5a911
|
调整了注释
|
11 years ago |
|
lizanle
|
6c02c96342
|
去掉了增加时间跨度的代码
|
11 years ago |
|
lizanle
|
0147b30133
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
Gemfile
|
11 years ago |
|
alan
|
432e3a05f2
|
增加贴吧创建，发帖时发送邮件功能，修改《邮件重发多次》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
lizanle
|
aca74bf937
|
Merge remote-tracking branch 'origin/dev_zanle' into szzh
Conflicts:
Gemfile
app/views/welcome/index.html.erb
|
11 years ago |
|
alan
|
90925edce2
|
修改《意见反馈页面css引起的css错乱》和《课程首页动态太少》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
9f807438d6
|
教师数目显示：-1 ，同时动态大量不显示。是不是只显示近期3个月的？
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
lizanle
|
10cde37582
|
cache using version
|
11 years ago |
|
sw
|
8dc9b223b1
|
修改竞赛模块，重复评分不会以最后一次评分为准的BUG
|
11 years ago |
|
sw
|
f934824175
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
d8e9dba404
|
#1647 正式版--资源搜索窗口搜索课程资源进行下载返回500错误（资源可见性判断修复）
|
11 years ago |
|
sw
|
9a61354328
|
1.评分、评论作为一个action发送到服务器
2.修改作业的show方法获取参数不正确的问题
|
11 years ago |
|
sw
|
512f16a036
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
