whimlex
|
3faec141ce
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-18 18:03:17 +08:00 |
whimlex
|
7e8ee49298
|
资源库国际化
|
2015-03-18 18:02:54 +08:00 |
z9hang
|
9d686349da
|
用户搜索接口添加按昵称或姓名搜索
|
2015-03-18 17:31:35 +08:00 |
z9hang
|
52f2a31b84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-18 17:21:44 +08:00 |
z9hang
|
fd2c3e8201
|
修改课程动态接口
|
2015-03-18 17:21:19 +08:00 |
huang
|
4ae5e2af7c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-18 15:50:34 +08:00 |
huang
|
6498002c71
|
修改项目文档中附件上传无法保存、附件编辑的时候无法显示的bug
原因:里面逻辑判断错误
|
2015-03-18 15:50:00 +08:00 |
guange
|
c45850eb8a
|
git hook改为异步
|
2015-03-18 14:42:11 +08:00 |
guange
|
dc29ccf3b7
|
1. git仓库新建时加入hook代码
2. 对现有的旧hook代码进行更新的rake任务
|
2015-03-18 11:22:05 +08:00 |
lizanle
|
b4f99c75da
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-03-18 10:17:33 +08:00 |
lizanle
|
e49bb18b62
|
cotroller修改:删除记录的同时删除对应的文件
|
2015-03-18 10:17:22 +08:00 |
z9hang
|
86c4a7f45d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-18 09:25:46 +08:00 |
z9hang
|
930486d21e
|
#2024 course主页:点击进入非当前用户的所在学校,如图,不显示“我的课程”了
|
2015-03-18 09:25:26 +08:00 |
lizanle
|
41f302c467
|
cotroller修改
|
2015-03-18 08:53:36 +08:00 |
lizanle
|
112b7fb27f
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-03-18 08:53:05 +08:00 |
lizanle
|
da69443913
|
需要插入资源上传的时候插入数据库记录
|
2015-03-18 08:52:49 +08:00 |
guange
|
6c87cd40c1
|
加入git回调接口
|
2015-03-17 20:52:12 +08:00 |
whimlex
|
85c51cac21
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-17 18:04:56 +08:00 |
whimlex
|
cfaf788e37
|
新版项目成员,关注者,资源库国际化;修改国际化缺失的bug
|
2015-03-17 18:04:35 +08:00 |
huang
|
216bc57004
|
1、进入项目子讨论区之后的页面
2、修改火狐浏览器“展开信息”异常
|
2015-03-17 17:21:49 +08:00 |
huang
|
003b088091
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-17 17:03:57 +08:00 |
huang
|
4111e2a940
|
1、讨论区新子界面
2、项目右侧优化
|
2015-03-17 17:02:32 +08:00 |
sw
|
1e897687d0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-17 16:01:45 +08:00 |
whimlex
|
e8da6ef871
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-17 15:07:51 +08:00 |
whimlex
|
50fe8f2bb7
|
项目配置模块
|
2015-03-17 15:06:15 +08:00 |
z9hang
|
274295c948
|
#2033 项目--更多--新闻:编辑新闻相关问题
|
2015-03-17 14:55:21 +08:00 |
z9hang
|
36554aa90a
|
#2041 项目--问题跟踪:成功新建缺陷给出的提示信息错误
|
2015-03-17 10:11:38 +08:00 |
lizanle
|
86020804c9
|
ok
|
2015-03-17 09:42:04 +08:00 |
lizanle
|
c77c1a81a4
|
html
|
2015-03-17 09:41:10 +08:00 |
lizanle
|
f94222cac7
|
html
|
2015-03-17 09:40:45 +08:00 |
lizanle
|
33669017bf
|
controller
|
2015-03-17 09:40:31 +08:00 |
lizanle
|
39cbeced87
|
model类
|
2015-03-17 09:39:12 +08:00 |
lizanle
|
0c86ba210d
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
db/schema.rb
|
2015-03-17 09:38:24 +08:00 |
lizanle
|
4817b3106e
|
kindeditor资源类
|
2015-03-17 09:36:20 +08:00 |
lizanle
|
5c4a62dcc4
|
DiscussDemo代码
|
2015-03-16 15:29:13 +08:00 |
sw
|
88d6b25ace
|
1、修改意见反馈图片
2、去掉个人首页权限判断
|
2015-03-16 09:28:18 +08:00 |
guange
|
e798b7242b
|
Merge remote branch 'remotes/origin/szzh' into guange_dev
|
2015-03-15 23:10:48 +08:00 |
guange
|
f3d6d7c384
|
#2037 issue列表默认显示顺序改为最后更新的倒序
|
2015-03-15 16:02:49 +08:00 |
guange
|
366fbcd4d4
|
#2105 fixed ie8下新建帖子时上传附件导致不能发表问题
|
2015-03-14 12:29:09 +08:00 |
guange
|
bcb162c600
|
#1968 解决IE8不能上传的问题, 只是解决,体验还是没有chrome,firefox的好
|
2015-03-14 12:01:08 +08:00 |
sw
|
3b0a229c43
|
1.修改意见反馈框默认关闭
2、FIle--->资源库
|
2015-03-13 18:01:16 +08:00 |
sw
|
e4895731ae
|
Merge branch 'develop' into szzh
|
2015-03-13 17:48:12 +08:00 |
whimlex
|
aee987d634
|
邀请Trustie用户
|
2015-03-13 17:47:58 +08:00 |
sw
|
e4e56e01b1
|
修改项目邀请用户失败时的提示
|
2015-03-13 17:46:09 +08:00 |
sw
|
ca7c970094
|
修改意见反馈框位置
|
2015-03-13 17:27:24 +08:00 |
z9hang
|
da23b4fd21
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-13 17:10:43 +08:00 |
z9hang
|
ff65bf4ba5
|
app自动更新功能功能,无法下载问题修正
|
2015-03-13 17:10:22 +08:00 |
huang
|
cc5a22f2c6
|
修改新建按钮样式
|
2015-03-13 16:16:38 +08:00 |
sw
|
aa8d1741f9
|
修改项目发送邮箱时的正则验证
|
2015-03-13 15:46:00 +08:00 |
huang
|
da02f3fbb4
|
去掉项目标签为空提示
|
2015-03-13 15:45:10 +08:00 |
sw
|
368a3ce1fa
|
修改项目创建时间显示不正确
|
2015-03-13 15:40:19 +08:00 |
huang
|
1ed542af09
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
2015-03-13 15:40:06 +08:00 |
huang
|
a010c800d6
|
修改权限库为空情况下403问题
修改项目标题样式
确认发送国际化
添加小图标
|
2015-03-13 15:37:54 +08:00 |
z9hang
|
e165dd6572
|
修改编码
|
2015-03-13 13:41:26 +08:00 |
z9hang
|
2ccb7ff387
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-13 11:56:13 +08:00 |
z9hang
|
ed674d960c
|
课程动态国际化问题
|
2015-03-13 11:55:57 +08:00 |
guange
|
08eae0e5eb
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-03-13 11:30:25 +08:00 |
whimlex
|
cef923b8a8
|
邮件邀请用户国际化
|
2015-03-13 09:46:05 +08:00 |
guange
|
ab6c21314d
|
#1503 老师发布的作业可以在课程动态中显示了
|
2015-03-12 21:57:35 +08:00 |
huang
|
fb907094f8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-12 19:32:51 +08:00 |
huang
|
47e1427ead
|
左侧工具栏添加功能:左侧统计数目为零的手不显示
|
2015-03-12 19:29:44 +08:00 |
whimlex
|
28321deeb5
|
邮件邀请用户
|
2015-03-12 18:04:12 +08:00 |
whimlex
|
18422ecf6a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/projects/invite_members_by_mail.html.erb
|
2015-03-12 17:50:15 +08:00 |
whimlex
|
1e5fac32b4
|
添加邮箱验证
|
2015-03-12 17:48:31 +08:00 |
sw
|
fd8edc9a02
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-12 17:34:25 +08:00 |
sw
|
2b28448397
|
Merge branch 'guange_dev' into szzh
|
2015-03-12 17:33:18 +08:00 |
huang
|
ab57e7e432
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-12 17:23:28 +08:00 |
huang
|
96b2627fda
|
修改邮件居中样式及提示
|
2015-03-12 17:22:52 +08:00 |
sw
|
362bad594f
|
修改项目发送邮件邀请页面样式,以及提示
|
2015-03-12 17:18:18 +08:00 |
whimlex
|
3a1f0aec55
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-12 17:14:12 +08:00 |
whimlex
|
5f88ffc5d0
|
项目邀请用户国际化,js判断邮件格式
|
2015-03-12 17:13:46 +08:00 |
sw
|
7dc6f76060
|
Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev
|
2015-03-12 17:09:32 +08:00 |
sw
|
78039a726e
|
Merge branch 'szzh' into guange_dev
|
2015-03-12 17:09:20 +08:00 |
sw
|
ceb6ccf908
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-12 17:06:04 +08:00 |
sw
|
971c278de5
|
#2026 作业创建时间->截至时间
|
2015-03-12 17:02:47 +08:00 |
huang
|
77bf3be20d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_users.html.erb
|
2015-03-12 16:49:42 +08:00 |
huang
|
b809e8844c
|
修改项目中添加标签按钮显示异常
|
2015-03-12 16:42:18 +08:00 |
z9hang
|
2d05c3273f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-12 16:33:43 +08:00 |
z9hang
|
8190403380
|
app添加忘记密码接口,课程动态接口代码优化(去掉其中的中文)
|
2015-03-12 16:33:31 +08:00 |
sw
|
d18e9ff66b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-12 16:32:31 +08:00 |
sw
|
312d7660b2
|
增加邀请成功后的提示
邀请成功后跳转页面修改
调整翻页控件的样式
|
2015-03-12 16:32:20 +08:00 |
huang
|
4bfc72dc28
|
用新表统计动态
修改关注样式
|
2015-03-12 15:56:03 +08:00 |
sw
|
2ee04d55f2
|
修改项目邀请用户的界面
|
2015-03-12 15:46:24 +08:00 |
huang
|
6fa5863665
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-12 15:14:16 +08:00 |
huang
|
0ba7ef0560
|
修改邮箱邀请时,邮件为空时提示错误
|
2015-03-12 15:13:41 +08:00 |
z9hang
|
7e7da7e445
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-12 11:18:00 +08:00 |
z9hang
|
a05061af73
|
#1859 课程--资源库:全站搜索中“选入我的其他课程”弹出的课程列表中包括当前课程
|
2015-03-12 11:17:36 +08:00 |
sw
|
717be2b045
|
修改部分用户的用户首页报错
|
2015-03-12 10:29:19 +08:00 |
sw
|
5340ad7fc1
|
修改组织首页不显示私有项目
|
2015-03-12 10:20:28 +08:00 |
sw
|
69eecf49d1
|
还原冲突
|
2015-03-12 09:52:57 +08:00 |
sw
|
2ac2c1848c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
2015-03-12 09:52:50 +08:00 |
whimlex
|
6f4ef81eb9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-12 09:48:09 +08:00 |
whimlex
|
65ee3fdc74
|
项目主页国际化,项目主页JS冲突解决
|
2015-03-12 09:47:42 +08:00 |
sw
|
5258b7585b
|
处理冲突还原代码
|
2015-03-12 09:36:03 +08:00 |
huang
|
64bbbff879
|
添加里程碑
|
2015-03-12 09:03:25 +08:00 |
sw
|
b27bb34662
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
2015-03-12 09:00:12 +08:00 |
huang
|
c773e0fd39
|
JS冲突,去掉多余标点
|
2015-03-12 08:42:39 +08:00 |
huang
|
29655838f0
|
项目超过的部分用“展示更多信息”拉开
|
2015-03-11 23:50:37 +08:00 |
huang
|
c36db9fd63
|
项目左侧按钮实现配置-模块进行显示/隐藏管理
|
2015-03-11 22:42:42 +08:00 |
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
|
2015-03-11 17:27:02 +08:00 |