 huang
|
b8058c3e12
|
用户邀请加入的时候增加拒绝功能
删除提示星系修改
申请加入模块样式调整
|
2015-04-14 19:34:01 +08:00 |
 sw
|
e4b2092c7f
|
实现项目成员列表增加成员，以及用户/角色留空时的提示信息
|
2015-04-14 16:56:32 +08:00 |
|
sw
|
fadca9128f
|
完成项目朋友圈、开发组、科研组直接的切换功能
|
2015-04-14 10:17:42 +08:00 |
|
sw
|
fb935f124c
|
完成修改项目界面
|
2015-04-11 17:04:48 +08:00 |
|
huang
|
d832514a55
|
新增项目成员列表
|
2015-04-08 11:24:40 +08:00 |
|
huang
|
12eaac5683
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/boards/_project_show.html.erb
public/javascripts/course.js
处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
|
2015-04-07 13:47:39 +08:00 |
 lizanle
|
84c2e39e6c
|
新闻评论出现错误。误将safe_attributes换为直接属性comments
|
2015-04-03 17:06:19 +08:00 |
|
lizanle
|
1009f7ac07
|
资源id判空
|
2015-04-03 16:35:46 +08:00 |
|
lizanle
|
717463076c
|
删除democontroller
|
2015-04-03 15:09:46 +08:00 |
|
sw
|
ec8e609ddc
|
打爆下载增加权限、增加打包下载功能
|
2015-04-03 13:10:18 +08:00 |
|
sw
|
a1a761266b
|
Merge branch 'szzh' into guange_dev
|
2015-04-03 11:38:27 +08:00 |
 guange
|
113e11f6cd
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
app/models/comment.rb
app/models/message.rb
app/models/news.rb
|
2015-04-03 11:34:39 +08:00 |
whimlex
|
2ef224556e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-03 11:31:08 +08:00 |
|
whimlex
|
aa64b47d74
|
资源按时间倒序显示；新建课程设置公开私有属性；课程动态（动态统计主要在作业和作品上存在问题，动态显示在作品和留言中存在权限问题）；课程动态格式调整
|
2015-04-03 11:30:48 +08:00 |
|
guange
|
893f6af856
|
用回rubyzip, zipruby有bug.
|
2015-04-03 11:29:37 +08:00 |
|
lizanle
|
ceb6af7365
|
课程相关模块添加编辑器
|
2015-04-03 11:19:15 +08:00 |
|
guange
|
56df5ce9a7
|
优化zip重复打包问题
|
2015-04-02 17:20:52 +08:00 |
|
guange
|
618e8c017c
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
db/schema.rb
|
2015-04-01 11:16:57 +08:00 |
 z9hang
|
5eac727584
|
项目资源模块功能完成（样式尚未调整，代码尚未应用）
|
2015-03-31 15:57:15 +08:00 |
|
guange
|
02e83ea776
|
将邮件发送放到后台进程中
|
2015-03-31 11:51:34 +08:00 |
|
z9hang
|
c4e9321e14
|
将attachment_candown方法提取到application_help里面
|
2015-03-31 10:03:52 +08:00 |
|
z9hang
|
e2eaae63f4
|
资源模块，默认按时间降序排列
|
2015-03-31 09:34:27 +08:00 |
|
z9hang
|
5bbc562abd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-30 17:15:07 +08:00 |
|
z9hang
|
eabcd4e92b
|
项目资源模块新界面（列表显示，排序等功能，样式尚未调）
|
2015-03-30 17:14:52 +08:00 |
|
sw
|
94ecc3e59e
|
1、课程新增成员分页控件样式
2、课程老师列表翻页不可用
|
2015-03-30 17:03:20 +08:00 |
|
guange
|
51dbc43ecf
|
修改apache中git认证文件路径，user.passwd ==> htdocs/user.passwd
|
2015-03-30 16:05:55 +08:00 |
|
sw
|
5640eae39b
|
删除课程成员
|
2015-03-30 15:59:57 +08:00 |
|
sw
|
ed02959e00
|
修改成员角色
|
2015-03-30 15:57:10 +08:00 |
|
sw
|
2af071a92e
|
课程添加成员后js提示
|
2015-03-30 14:55:41 +08:00 |
|
sw
|
98bf8dd494
|
课程成员列表显示
|
2015-03-30 11:20:16 +08:00 |
|
sw
|
72d683bdb7
|
加入课程与退出课程js刷新
|
2015-03-27 19:50:01 +08:00 |
|
guange
|
f139427f03
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
app/controllers/zipdown_controller.rb
app/views/bids/_homework_list.html.erb
config/routes.rb
db/schema.rb
public/javascripts/attachments.js
|
2015-03-27 18:17:46 +08:00 |
|
sw
|
21db854adb
|
Merge branch 'develop' into szzh
|
2015-03-27 17:45:08 +08:00 |
|
z9hang
|
ef7949584c
|
课程资源tag点击报错问题，回退后删除无效问题
|
2015-03-27 15:02:13 +08:00 |
|
sw
|
9af60424c2
|
去除错误代码
|
2015-03-27 14:14:11 +08:00 |
|
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
|
2015-03-27 14:13:49 +08:00 |
|
z9hang
|
61b220c913
|
课程资源库删除资源tag失效问题
|
2015-03-27 11:28:27 +08:00 |
|
sw
|
fcbcdffa44
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/stylesheets/courses.css
|
2015-03-27 09:33:41 +08:00 |
|
z9hang
|
ddecd61926
|
课程资源添加标签时无样式问题
|
2015-03-26 20:17:47 +08:00 |
|
sw
|
cba678a357
|
课程是否启用匿评
课程作业列表样式
加入与退出课程按钮样式
|
2015-03-26 19:01:22 +08:00 |
|
sw
|
ed92faaedd
|
关闭课程与重开课程js
|
2015-03-26 18:12:24 +08:00 |
|
sw
|
0d04eb745f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-03-26 17:18:27 +08:00 |
|
z9hang
|
35eb7e80af
|
讨论区留言分页
|
2015-03-26 16:17:33 +08:00 |
|
lizanle
|
5f203ec8c0
|
新建论坛或者回复,如果传图了，要更新资源的owner
|
2015-03-26 16:08:31 +08:00 |
|
z9hang
|
57dad3f3c7
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-03-26 15:55:21 +08:00 |
|
z9hang
|
8ef9779b46
|
修正课程讨论区样式。修正项目讨论区被影响的样式
|
2015-03-26 15:55:07 +08:00 |
|
sw
|
53eef164c9
|
新建课程时layout修改
|
2015-03-26 15:12:14 +08:00 |
|
sw
|
2bb7153131
|
去掉作业打包下载功能
|
2015-03-26 14:17:26 +08:00 |
|
sw
|
ab7d12e514
|
1、修改、删除分班是js方法重构
2、验证分班名是否重复重构
|
2015-03-26 11:30:00 +08:00 |
|
whimlex
|
4de0255ce6
|
邀请邮件国际化；js冲突
|
2015-03-26 10:45:14 +08:00 |