whimlex
|
93838f604d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
3837e1fcf5
|
申请加入：附件上传
|
10 years ago |
 lizanle
|
cdad43fdfc
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
a4567396e4
|
如果没有上传图片就会报空指针
|
10 years ago |
 z9hang
|
0d8786f7dd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
74d1ebed4e
|
课程资源中样式显示问题
|
10 years ago |
 sw
|
a596662791
|
Merge branch 'guange_dev' into szzh
|
10 years ago |
|
sw
|
7c9d007785
|
Merge branch 'szzh' into guange_dev
|
10 years ago |
guange
|
7decf34cc7
|
Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev
|
10 years ago |
|
guange
|
92b72c995a
|
纠正合并
|
10 years ago |
|
sw
|
7085beb3ab
|
Merge branch 'guange_dev' into szzh
|
10 years ago |
|
sw
|
0c4f88ca29
|
Merge branch 'szzh' into guange_dev
|
10 years ago |
|
guange
|
e007920cb6
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
Gemfile
app/views/attachments/_form.html.erb
|
10 years ago |
|
sw
|
6edbb3c7ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
45475c3612
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
6995ead66c
|
项目ID
|
10 years ago |
 dingxu
|
f4dff55377
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
dingxu
|
073cb07f70
|
邀请平台用户：角色、用户都为空添加提示、单一角色提示信息修改、
展开条样式修改
|
10 years ago |
|
whimlex
|
b400c9bb11
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
10 years ago |
|
whimlex
|
b95852dfcd
|
附件上传国际化：修改页面一些bug：用户主页个人得分身份信息修改
|
10 years ago |
|
dingxu
|
7b3af413cd
|
邮件邀请加入项目:如果邮箱已被注册或为空时给出提示
|
10 years ago |
|
dingxu
|
79588489e2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
dingxu
|
440855c0e6
|
修改项目tag样式
|
10 years ago |
|
z9hang
|
191261e47f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
2a3a70b7d5
|
app接口部分信息国际化
|
10 years ago |
|
lizanle
|
0424fc55db
|
项目资源数显示错误
|
10 years ago |
|
lizanle
|
966f93012d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
c209bccba0
|
项目资源数显示错误
|
10 years ago |
 huang
|
f5b528dc4d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
371f25b61f
|
修改邀请页面分页异常（冲突引起）
|
10 years ago |
|
z9hang
|
5a1492964a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
28a61c2617
|
课程搜索接口无法搜到自己的私有课程问题
|
10 years ago |
|
huang
|
23847bb0ab
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
39193a0d71
|
修改邀请中按钮样式
|
10 years ago |
 alan
|
cf3d836cf3
|
删除邮件发送时出现《"亲爱的Trustie用户，您好！"》
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
huang
|
7e40ea7604
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
1cdf397bc0
|
修改关注、申请方法中样式
|
10 years ago |
|
whimlex
|
3faec141ce
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
7e8ee49298
|
资源库国际化
|
10 years ago |
|
z9hang
|
9d686349da
|
用户搜索接口添加按昵称或姓名搜索
|
10 years ago |
|
z9hang
|
52f2a31b84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
z9hang
|
fd2c3e8201
|
修改课程动态接口
|
10 years ago |
|
huang
|
4ae5e2af7c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
6498002c71
|
修改项目文档中附件上传无法保存、附件编辑的时候无法显示的bug
原因：里面逻辑判断错误
|
10 years ago |
|
guange
|
fdee890694
|
git优化上线文档补充
|
10 years ago |
|
guange
|
c45850eb8a
|
git hook改为异步
|
10 years ago |
|
guange
|
dc29ccf3b7
|
1. git仓库新建时加入hook代码
2. 对现有的旧hook代码进行更新的rake任务
|
10 years ago |
|
lizanle
|
b4f99c75da
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
e49bb18b62
|
cotroller修改：删除记录的同时删除对应的文件
|
10 years ago |
|
z9hang
|
86c4a7f45d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
