 huang
|
6474444cc7
|
用户连接 id变成用户名
|
2016-05-10 09:00:59 +08:00 |
 guange
|
e8adcf8cc7
|
添加sso model
|
2016-05-04 15:40:18 +08:00 |
|
guange
|
aa9cb4e579
|
merge
|
2016-04-08 10:44:36 +08:00 |
|
huang
|
185ad829cd
|
项目访问速度优化
|
2016-03-24 09:36:46 +08:00 |
|
guange
|
6ae4cd0767
|
merge
|
2016-03-21 16:02:30 +08:00 |
 ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
2016-03-17 16:18:30 +08:00 |
 alan
|
0ac12f3400
|
Merge branch 'FX-alan-admin-deleteuser-500' into alan_develop
|
2016-03-16 11:16:52 +08:00 |
|
ouyangxuhua
|
a7312a6191
|
修改游客下载组织资源的权限
|
2016-03-14 14:43:30 +08:00 |
|
alan
|
3eaa4b08a3
|
解决删除用户报500错误
|
2016-03-14 11:06:29 +08:00 |
|
alan
|
2f5ce553e2
|
refactor user find
|
2016-03-14 10:46:02 +08:00 |
|
alan
|
ce6d63ccaf
|
重构user.find
|
2016-03-14 10:24:50 +08:00 |
|
guange
|
a83cb2a1fa
|
merge
|
2016-02-28 21:28:54 +08:00 |
|
ouyangxuhua
|
125f00689b
|
把组织未读消息加入铃铛消息提醒中
|
2016-01-29 17:49:20 +08:00 |
|
ouyangxuhua
|
a15f7fa97b
|
系统管理员增加组织管理员的权限
|
2016-01-22 09:54:20 +08:00 |
|
guange
|
349f511c12
|
开发环境不要弄9200报错
|
2016-01-19 14:56:52 +08:00 |
|
guange
|
571196ad2d
|
wechat model完善
|
2016-01-19 12:00:13 +08:00 |
|
guange
|
e80149c6c8
|
@7008找不到的问题
|
2016-01-10 15:38:45 +08:00 |
|
guange
|
bb94a41435
|
红点中包含at的消息
|
2015-12-21 15:11:41 +08:00 |
|
guange
|
fc63dfcb7b
|
消息通知
|
2015-12-17 15:14:52 +08:00 |
|
guange
|
4f57e48b92
|
merge
|
2015-12-14 18:20:32 +08:00 |
|
guange
|
d1315e35b5
|
merge
|
2015-12-14 17:26:40 +08:00 |
|
guange
|
91b245ad2c
|
lastname为空时也可以加,可以省掉查询extensions的语句
|
2015-12-12 18:06:59 +08:00 |
 cxt
|
bb2f49439e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2015-12-11 15:00:35 +08:00 |
|
cxt
|
a3715051b1
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-11 14:59:13 +08:00 |
|
cxt
|
f880ccd749
|
分组作业
|
2015-12-11 14:57:09 +08:00 |
|
huang
|
f2c1595d0d
|
1、同步没成功检测程序
2、注册验证修改
|
2015-12-09 16:57:12 +08:00 |
 lizanle
|
2fbad38522
|
优化排序参数
用于排序的字段最好不要分词
不然就是多值字段的排序会浪费大量的内存
|
2015-12-09 12:57:25 +08:00 |
|
cxt
|
a9f6e817b4
|
分组作业关联项目
|
2015-12-08 17:37:15 +08:00 |
|
guange
|
af31946586
|
issue列表开启AT功能
|
2015-12-06 15:03:12 +08:00 |
|
lizanle
|
1103a114a0
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-12-01 10:36:16 +08:00 |
|
lizanle
|
b2bca65025
|
分片默认为5
|
2015-12-01 10:33:57 +08:00 |
|
guange
|
52a0da83c4
|
匿名用户留言问题.
|
2015-11-30 21:52:05 +08:00 |
|
lizanle
|
96290ad975
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
2015-11-27 18:47:19 +08:00 |
|
lizanle
|
582cd6f5d4
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
2015-11-27 18:47:02 +08:00 |
|
lizanle
|
e710f443c2
|
全站搜索
|
2015-11-27 15:17:17 +08:00 |
|
lizanle
|
7cb39d1754
|
全站搜索
|
2015-11-27 10:40:58 +08:00 |
|
lizanle
|
ee47187a61
|
全站搜索
|
2015-11-27 09:52:51 +08:00 |
|
lizanle
|
dcd441a9db
|
全站搜索
|
2015-11-26 16:43:10 +08:00 |
|
lizanle
|
4efb660214
|
全站搜索
|
2015-11-26 09:57:53 +08:00 |
|
huang
|
c8b1cae947
|
建立贡献榜表及相关关联
部分页面
按总分排序（英雄榜）
部分页面（未完成）
|
2015-11-25 15:16:33 +08:00 |
|
cxt
|
62d80c27d6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-11-16 08:59:54 +08:00 |
 sw
|
466f3c4cc3
|
数据库修改以及一对一，一对多，多对多等关系的确立
|
2015-11-13 15:47:39 +08:00 |
|
ouyangxuhua
|
866c2feaa1
|
修改组织模块的bug
|
2015-11-13 15:02:12 +08:00 |
|
sw
|
bbf087fa67
|
数据库的修改以及model数据关系的确定
|
2015-11-13 14:40:14 +08:00 |
|
ouyangxuhua
|
6ec27761fb
|
组织功能实现及缺陷修改
|
2015-11-12 20:57:41 +08:00 |
|
ouyangxuhua
|
21275e8b7b
|
组织模块功能缺陷修改
|
2015-11-12 17:52:47 +08:00 |
|
ouyangxuhua
|
283af137c6
|
组织模块动态及配置
|
2015-11-05 17:57:07 +08:00 |
|
guange
|
be25a57eaf
|
同步用户bug解决
|
2015-11-01 21:49:07 +08:00 |
|
cxt
|
c4816a0414
|
名字为空的用户创建博客时博客名称为登录名
|
2015-10-30 09:56:55 +08:00 |
|
huang
|
4c61e7490b
|
Merge branch 'develop' into gitlab_guange
Conflicts:
db/schema.rb
|
2015-10-27 14:42:05 +08:00 |