 huang
|
072807fe37
|
1、登录下划线去掉2、登录改成注册3、默认的改成勾选协议
|
2016-06-16 14:07:37 +08:00 |
|
huang
|
24b12513e5
|
铃铛颜色
|
2016-06-16 11:16:41 +08:00 |
|
huang
|
8f73cba44b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-16 10:36:40 +08:00 |
|
huang
|
41bb68d0e1
|
Merge branch 'hjq_login' into develop
|
2016-06-16 10:36:30 +08:00 |
|
huang
|
474c183050
|
导航颜色一致
|
2016-06-16 10:35:53 +08:00 |
|
huang
|
5e3df51ad9
|
完成新版登录注册
|
2016-06-16 10:21:21 +08:00 |
|
huang
|
aa42044199
|
注册登录
|
2016-06-15 17:58:02 +08:00 |
|
huang
|
06f97d5cb7
|
注册页面（未完）
|
2016-06-15 17:24:46 +08:00 |
 yuanke
|
ec4273fc49
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-15 17:08:24 +08:00 |
|
yuanke
|
a17fb86a17
|
组织回复点登录直接跳入登录页面
|
2016-06-15 17:07:29 +08:00 |
|
huang
|
9b6f40bb02
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-15 15:43:42 +08:00 |
|
huang
|
a2c5cc6da1
|
登录界面base及新页面
|
2016-06-15 15:41:13 +08:00 |
|
yuanke
|
5a7f7da1f7
|
新建贴吧和组织配置默认选项暂时还原。
|
2016-06-15 15:34:13 +08:00 |
|
huang
|
d75a8bc35a
|
Merge branch 'hjq_beidou' into develop
|
2016-06-15 14:49:10 +08:00 |
|
yuanke
|
b08f6e307a
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/org_subfields_controller.rb
|
2016-06-15 14:44:02 +08:00 |
|
huang
|
45f185bf9b
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-06-15 14:38:16 +08:00 |
|
huang
|
c15ef27fc0
|
管理员能看到组织资源
|
2016-06-15 14:36:38 +08:00 |
|
yuanke
|
7b6e8fbc53
|
修改组织点击登录后可回复报500的BUG
|
2016-06-15 14:33:25 +08:00 |
 Tim
|
f7832b00c9
|
更新历史版本时描述位置调整
|
2016-06-15 14:02:09 +08:00 |
|
huang
|
e7c856be0b
|
组织域名500问题
|
2016-06-15 09:30:36 +08:00 |
|
huang
|
5515fb660f
|
完成资源更新的时候 描述继承问题，并且可以修改描述
|
2016-06-14 14:47:02 +08:00 |
|
yuanke
|
44c9265fee
|
个人主页个性签名增加自动识别url
|
2016-06-13 15:29:15 +08:00 |
|
yuanke
|
e86419c28b
|
组织配置里面栏目类型默认为帖子
|
2016-06-13 13:35:01 +08:00 |
|
yuanke
|
3a46a409a9
|
Merge branch 'develop' into yuanke
|
2016-06-13 09:46:17 +08:00 |
|
yuanke
|
f2903ae903
|
新建贴吧后自动跳入该贴吧
|
2016-06-13 09:45:11 +08:00 |
 guange
|
0a82de1cf4
|
中文问题
|
2016-06-12 17:25:47 +08:00 |
|
guange
|
d3d31ca3a2
|
Merge remote-tracking branch 'origin/develop' into weixin_guange
|
2016-06-12 17:18:34 +08:00 |
|
guange
|
637411f258
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-06-12 17:18:19 +08:00 |
|
guange
|
1cb63055cb
|
api可以通过openid来认证
|
2016-06-12 17:18:05 +08:00 |
|
huang
|
d4d4e38c41
|
门户模式中含有三级域名的用户图像https问题
|
2016-06-12 16:48:35 +08:00 |
|
huang
|
9d3bb44682
|
简洁模式
|
2016-06-12 16:04:26 +08:00 |
|
txz
|
0e63a3a24c
|
指派文字显示不全
|
2016-06-12 15:37:52 +08:00 |
|
guange
|
15e074417c
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-06-12 15:06:41 +08:00 |
|
guange
|
cbc4f2f6fd
|
菜单更新
|
2016-06-12 15:05:45 +08:00 |
|
huang
|
dcb3d8659b
|
Merge branch 'cxt_course' into develop
|
2016-06-12 15:02:33 +08:00 |
|
huang
|
c9021eb70f
|
版本库附件打包下载从配置文件获取
|
2016-06-12 15:01:28 +08:00 |
 cxt
|
9d36c74d7f
|
作业回复的删除
|
2016-06-12 14:59:00 +08:00 |
|
txz
|
719774f159
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-06-12 14:52:29 +08:00 |
|
txz
|
b57f6fbc65
|
微信回复框增加padding
|
2016-06-12 14:52:24 +08:00 |
|
cxt
|
00528bec60
|
学生列表没有分班就不显示分班列
|
2016-06-12 14:50:47 +08:00 |
|
huang
|
1a1fde778f
|
Merge branch 'develop' into hjq_beidou
|
2016-06-12 13:49:58 +08:00 |
|
huang
|
928d71500d
|
门户模式--组织栏目没有动态时显示位置
|
2016-06-12 13:45:22 +08:00 |
|
guange
|
07760bcfca
|
优化
|
2016-06-12 13:42:53 +08:00 |
|
guange
|
d3c45fd133
|
使用jquery1.3比较小
|
2016-06-12 13:40:14 +08:00 |
|
huang
|
d18094cc92
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-12 13:36:53 +08:00 |
|
huang
|
78b445a7ae
|
组织历史数据迁移 模式术语修改， 配置页面域名长度问题
|
2016-06-12 13:36:35 +08:00 |
|
guange
|
36fedd4d15
|
Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange
|
2016-06-12 10:21:07 +08:00 |
|
guange
|
793b651393
|
压缩angularjs
|
2016-06-09 19:48:58 +08:00 |
|
yuanke
|
7504b353c9
|
组织报500问题修复
|
2016-06-08 16:50:13 +08:00 |
|
yuanke
|
994bb3ad20
|
Merge branch 'develop' into yuanke
|
2016-06-08 16:39:14 +08:00 |