 guange
|
56df5ce9a7
|
优化zip重复打包问题
|
2015-04-02 17:20:52 +08:00 |
|
guange
|
0118b10725
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-04-02 09:45:13 +08:00 |
 lizanle
|
073ef00bb7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-04-02 08:48:34 +08:00 |
|
lizanle
|
552c27c51d
|
课程作业学生提问问题计数修改
|
2015-04-02 08:48:01 +08:00 |
|
guange
|
9cefb9f339
|
每日发送取日期不对
|
2015-04-01 17:47:04 +08:00 |
|
guange
|
0099ab9f9a
|
去除以前的邮件规则
|
2015-04-01 16:44:40 +08:00 |
|
guange
|
243bac8fed
|
除了mail_notification == all 的，其他都不即时发邮件
|
2015-04-01 16:41:23 +08:00 |
|
guange
|
3ea33aa847
|
新建news报500
|
2015-04-01 13:14:15 +08:00 |
|
guange
|
b23892e29e
|
在application中去除observer
|
2015-04-01 11:19:49 +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 |
|
guange
|
89e0602983
|
邮件发送去除 observer, 一句代码的功能隐藏在别的文件里，很难注意到
|
2015-04-01 11:12:55 +08:00 |
 z9hang
|
5eac727584
|
项目资源模块功能完成（样式尚未调整，代码尚未应用）
|
2015-03-31 15:57:15 +08:00 |
|
guange
|
27e123f9fd
|
const_defined?小错误
|
2015-03-31 12:02:33 +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
|
43af61d684
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-31 09:34:48 +08:00 |
|
z9hang
|
e2eaae63f4
|
资源模块，默认按时间降序排列
|
2015-03-31 09:34:27 +08:00 |
|
guange
|
efdfa67c64
|
日报homework created_on to created_at
|
2015-03-30 21:32:48 +08:00 |
|
guange
|
77134c8dde
|
将每日邮件移入crontab
|
2015-03-30 20:56:42 +08:00 |
 sw
|
a65fd92bf4
|
Merge branch 'szzh' into develop
|
2015-03-30 18:06:03 +08:00 |
|
sw
|
b344bf3ea6
|
分页空间样式调整
|
2015-03-30 18:04:52 +08:00 |
|
sw
|
a84af9d138
|
课程私有资源不显示在没有权限查看的用户上
|
2015-03-30 17:44:40 +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
|
5954ced7a7
|
Merge branch 'develop' into szzh
|
2015-03-30 17:09:20 +08:00 |
|
sw
|
4817e2e1a7
|
新建课程取消后返回host_course
|
2015-03-30 17:04:36 +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
|
de0403580e
|
新增课程成员时增加默认选项
|
2015-03-30 16:03:24 +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
|
083a3b9de6
|
1、课程成员列表显示昵称
2、添加课程成员功能
|
2015-03-30 13:47:19 +08:00 |
|
sw
|
98bf8dd494
|
课程成员列表显示
|
2015-03-30 11:20:16 +08:00 |
|
sw
|
046536230c
|
增加课程配置界面、成员的基本信息以及相关js
|
2015-03-30 10:47:23 +08:00 |
|
sw
|
e7da022564
|
课程界面默认图片路径修改
|
2015-03-30 10:11:11 +08:00 |
|
guange
|
c1ed8bd36d
|
#2096 course、forge的邮件通知系统，改为可以每日一报、一事一报、不报
|
2015-03-29 12:33:33 +08:00 |
|
sw
|
ba518f0bd9
|
Merge branch 'szzh' into develop
|
2015-03-27 20:05:57 +08:00 |
|
sw
|
cee08d9c58
|
修改加入课程弹出框样式
|
2015-03-27 20:05:00 +08:00 |
|
sw
|
72d683bdb7
|
加入课程与退出课程js刷新
|
2015-03-27 19:50:01 +08:00 |
|
sw
|
6cd56c339a
|
Merge branch 'develop' into szzh
|
2015-03-27 19:03:56 +08:00 |
|
sw
|
cc27fca8aa
|
加入当前分班按钮样式
|
2015-03-27 19:03:38 +08:00 |
|
sw
|
1315740e7b
|
Merge branch 'szzh' into develop
|
2015-03-27 18:21:09 +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
|
ef6526b4a7
|
Merge branch 'szzh' into develop
|
2015-03-27 17:45:56 +08:00 |
|
sw
|
21db854adb
|
Merge branch 'develop' into szzh
|
2015-03-27 17:45:08 +08:00 |
|
sw
|
fcc4275a36
|
Merge branch 'sw_new_course' into szzh
|
2015-03-27 17:44:29 +08:00 |
|
sw
|
c0fc22ea72
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-27 17:44:14 +08:00 |
|
sw
|
20e80944a5
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-03-27 17:43:56 +08:00 |
|
sw
|
728f2896d8
|
windows下无法打断点
|
2015-03-27 17:43:19 +08:00 |