cxt
|
4f80e259e8
|
消息弹窗的延时显示
|
2016-06-21 11:16:45 +08:00 |
cxt
|
860068f7ed
|
新注册用户的留言
|
2016-06-21 11:03:50 +08:00 |
Your Name
|
d5631defb5
|
added xml to jenkins and added some gems
|
2016-06-20 17:53:56 +08:00 |
guange
|
1d6d100983
|
.
|
2016-06-20 17:37:35 +08:00 |
yuanke
|
64a4af21eb
|
Merge branch 'yuanke' into develop
|
2016-06-20 17:36:08 +08:00 |
yuanke
|
40792ff222
|
更新资源版本描述默认显示
|
2016-06-20 17:34:35 +08:00 |
guange
|
6f14b61cce
|
.
|
2016-06-20 17:28:21 +08:00 |
guange
|
4b813ef535
|
加入班级消息
|
2016-06-20 17:26:29 +08:00 |
yuanke
|
0ebbf29b54
|
Merge branch 'yuanke' into develop
|
2016-06-20 17:14:14 +08:00 |
yuanke
|
a5ffd013b9
|
修改更新资源版本的样式问题
|
2016-06-20 17:13:14 +08:00 |
guange
|
c940527694
|
.
|
2016-06-20 17:12:53 +08:00 |
guange
|
62a1b5de7c
|
加入班级更新
|
2016-06-20 17:04:42 +08:00 |
yuanke
|
301556b9c3
|
Merge branch 'yuanke' into develop
|
2016-06-20 16:41:23 +08:00 |
yuanke
|
fde06a2327
|
更新资源描述样式修改
|
2016-06-20 16:35:16 +08:00 |
huang
|
96e00f7bf3
|
jenkins连接
|
2016-06-20 16:21:37 +08:00 |
guange
|
29a815aeaf
|
添加weui
|
2016-06-20 16:09:04 +08:00 |
cxt
|
f4d67bc027
|
未读消息弹窗“点击展开”显示10条未读消息
|
2016-06-20 16:03:57 +08:00 |
guange
|
c6f04db19e
|
wechat
|
2016-06-20 15:50:52 +08:00 |
Tim
|
3548c23aad
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-20 15:43:15 +08:00 |
cxt
|
048bb7fed5
|
头像下拉菜单、未读消息的延时
|
2016-06-20 15:38:43 +08:00 |
guange
|
05ddbe5874
|
修改code
|
2016-06-20 15:28:19 +08:00 |
guange
|
b7230333dc
|
code获取修改
|
2016-06-20 15:21:13 +08:00 |
guange
|
3f98562c0f
|
打包
|
2016-06-20 14:45:19 +08:00 |
guange
|
61c117b8cb
|
重构老的代码,本地通过session来存放token, 所有的访问直接用老接口
|
2016-06-20 14:39:20 +08:00 |
huang
|
36e47fa8b1
|
代码质量分析,弹框参数传递
|
2016-06-20 14:21:40 +08:00 |
cxt
|
b26a6b5195
|
消息弹窗的链接无效
|
2016-06-20 11:24:34 +08:00 |
yuanke
|
0719313f01
|
Merge branch 'yuanke' into develop
|
2016-06-20 09:41:26 +08:00 |
yuanke
|
4b7fa3a040
|
修改有的组织不能修改资源描述的问题
|
2016-06-20 09:19:50 +08:00 |
guange
|
f40794282f
|
.
|
2016-06-17 18:54:24 +08:00 |
guange
|
762ca9c3cb
|
.
|
2016-06-17 18:50:43 +08:00 |
guange
|
9d19caa736
|
.
|
2016-06-17 18:48:27 +08:00 |
guange
|
b9280caf36
|
.
|
2016-06-17 18:46:15 +08:00 |
guange
|
64ad182a84
|
.
|
2016-06-17 18:42:58 +08:00 |
guange
|
a0c0a65d18
|
绑定用户迁移到接口
|
2016-06-17 18:37:26 +08:00 |
guange
|
7aec37bb3a
|
.
|
2016-06-17 18:25:55 +08:00 |
guange
|
98c6548e39
|
重写登录和注册
|
2016-06-17 18:18:03 +08:00 |
huang
|
fce93de296
|
500问题
|
2016-06-17 18:03:58 +08:00 |
huang
|
e4105b538a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-17 17:36:14 +08:00 |
huang
|
6af0bf7b83
|
组织样式
|
2016-06-17 17:35:46 +08:00 |
yuanke
|
f3014c3993
|
Merge branch 'yuanke' into develop
|
2016-06-17 17:25:53 +08:00 |
yuanke
|
948ec58248
|
作业二级回复未登录显示样式问题
|
2016-06-17 17:18:36 +08:00 |
cxt
|
3492f65a9b
|
编程作业匿评时的列表宽度调整
|
2016-06-17 16:57:11 +08:00 |
Tim
|
4b62a39b15
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-17 16:49:57 +08:00 |
cxt
|
7b1efe193d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-17 14:45:16 +08:00 |
cxt
|
eb3694dbe6
|
消息报500
|
2016-06-17 14:45:07 +08:00 |
yuanke
|
811afbdf33
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-17 14:43:25 +08:00 |
huang
|
7d68df79a0
|
组织合并凌彬代码500问题
|
2016-06-17 14:44:12 +08:00 |
yuanke
|
fde3fd0d94
|
新建贴吧跳入该贴吧帖子列表,组织栏目配置默认选择第一个栏目类型
|
2016-06-17 14:40:00 +08:00 |
yuanke
|
d6d9a366f2
|
Merge branch 'develop' into yuanke
Conflicts:
public/stylesheets/new_user.css
|
2016-06-17 14:36:12 +08:00 |
huang
|
0f17ac0e9e
|
Merge branch 'lingbing' into develop
Conflicts:
app/views/organizations/_org_custom_header.html.erb
|
2016-06-17 14:33:31 +08:00 |
huang
|
8741917823
|
访问统计 (自2016年5月)
|
2016-06-17 14:31:42 +08:00 |
yuanke
|
c51c73f225
|
所有回复添加未登录提示
|
2016-06-17 14:31:14 +08:00 |
cxt
|
a105f4eaf0
|
课程动态中:课程讨论区、课程通知
项目动态中:项目issue、项目新闻、项目讨论区
个人动态:如上动态
未登录时不显示齿轮
|
2016-06-17 14:09:43 +08:00 |
huang
|
88b838a89a
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-06-17 11:33:48 +08:00 |
huang
|
35ee17c4ca
|
Merge branch 'yuanke' into develop
|
2016-06-17 11:32:50 +08:00 |
huang
|
d0791253d9
|
quality
|
2016-06-17 11:29:49 +08:00 |
cxt
|
1dac05c6d1
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-17 11:26:58 +08:00 |
yuanke
|
3ae26a6530
|
组织配置页面 名师列表 热门项目 学霸 精品课程的右上角字样只对超级管理员显示,图片显示时如果已经带了链接则不增加点击弹框效果。
|
2016-06-17 11:23:49 +08:00 |
huang
|
fea21fe7cd
|
Merge branch 'develop' into rep_quality
|
2016-06-17 10:36:09 +08:00 |
huang
|
d127c6e12c
|
访问添加自某年某月
|
2016-06-17 09:45:10 +08:00 |
cxt
|
795917688c
|
留言内容无法展开、收起
|
2016-06-17 09:34:48 +08:00 |
cxt
|
28ee609eed
|
学生查看测验的统计结果
|
2016-06-16 16:58:59 +08:00 |
yuanke
|
70a762220a
|
组织、项目的资源文件增加描述修改及上传文件时候添加描述,并且所有操作对超级管理员开放
|
2016-06-16 16:55:25 +08:00 |
cxt
|
439841fbd7
|
从课程动态页面打开的匿评设置日期选择界面显示为英文,从作业页面打开的匿评设置日期选择界面为中文,应该统一为中文
|
2016-06-16 16:10:42 +08:00 |
cxt
|
30db43eb13
|
作业开启匿评之后,如果是普通作业,会提示学生提交的作业不会进入匿评,也不能对其他人进行匿评,如果是编程作业,在打开作业时则无此提示,应该统一,均进行提示
|
2016-06-16 15:58:34 +08:00 |
huang
|
312fa61489
|
输入框线条
|
2016-06-16 15:57:30 +08:00 |
huang
|
6707868915
|
登录页面新样式
|
2016-06-16 15:52:54 +08:00 |
cxt
|
e3ee99b486
|
消息通知中过滤掉已删除的课程消息、
at消息不显示
|
2016-06-16 15:46:16 +08:00 |
huang
|
d2d15710b5
|
解决chrome浏览器背景黄色问题
|
2016-06-16 15:25:43 +08:00 |
yuanke
|
f9f66bac7b
|
修改课程资源描述为空时提示
|
2016-06-16 14:15:46 +08:00 |
yuanke
|
7df91ebf70
|
修改课程资源描述空白的提示语
|
2016-06-16 14:14:54 +08:00 |
yuanke
|
4cd321f363
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-16 14:11:17 +08:00 |
yuanke
|
049a21c7d0
|
不上线的先还原
|
2016-06-16 14:08:54 +08:00 |
huang
|
072807fe37
|
1、登录下划线去掉2、登录改成注册3、默认的改成勾选协议
|
2016-06-16 14:07:37 +08:00 |
yuanke
|
82ebd1e4c9
|
Merge branch 'yuanke' into develop
|
2016-06-16 14:04:53 +08:00 |
yuanke
|
2781605670
|
课程资源描述增加可编辑
|
2016-06-16 14:04:12 +08:00 |
Tim
|
24458ecb48
|
table可拖拽,在线测验表格布局优化
|
2016-06-16 11:31:39 +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
|
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 |
cxt
|
03b92f8570
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-15 17:23:23 +08:00 |
yuanke
|
1023b94f0d
|
新建贴吧之后转入这个贴吧界面,组织配置栏目默认选择第一项
|
2016-06-15 17:22:39 +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 |
cxt
|
43192b8648
|
分组作业的弹框增加人数的验证、点击关闭弹框时还原弹框中的值
|
2016-06-15 17:04:53 +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 |
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 |
cxt
|
caa966c85a
|
分组作业的作品列表提示的修改
分组作业提交作品时的最小人数限制不起作用
|
2016-06-15 14:12:42 +08:00 |
Tim
|
f7832b00c9
|
更新历史版本时描述位置调整
|
2016-06-15 14:02:09 +08:00 |
guange
|
8fd4d518b2
|
添加邀请码
|
2016-06-15 13:44:28 +08:00 |
cxt
|
c50d307e89
|
分组作业添加成员后再次打开,数据未保存
|
2016-06-14 17:36:12 +08:00 |
guange
|
ada15b4212
|
格式上的调整, 现在可以分开写,但发布时打成一个js提高性能
|
2016-06-14 16:03:10 +08:00 |
cxt
|
254e1f44f6
|
评分设置提示的修改与提交时的判断
|
2016-06-14 15:44:03 +08:00 |
Linda
|
01bd394a59
|
门户首页按照祎欣0613版本设计修改
|
2016-06-14 15:08:13 +08:00 |
huang
|
5515fb660f
|
完成资源更新的时候 描述继承问题,并且可以修改描述
|
2016-06-14 14:47:02 +08:00 |
huang
|
d21df48961
|
代码质量分析弹框及参数传入
|
2016-06-14 14:10:33 +08:00 |
cxt
|
e7499c95c5
|
点击打开测验作品列表中某作品,在作品详情页面增加返回统计列表的快捷操作
|
2016-06-14 14:08:54 +08:00 |
cxt
|
6100abe0da
|
课程大纲
|
2016-06-14 10:38:11 +08:00 |
huang
|
c6bd5e6d31
|
饼状图
|
2016-06-14 09:57:53 +08:00 |
huang
|
9029fd91e0
|
rails 代码中调用shell命令调用
|
2016-06-14 09:57:29 +08:00 |
yuanke
|
44c9265fee
|
个人主页个性签名增加自动识别url
|
2016-06-13 15:29:15 +08:00 |
huang
|
0c25e3b13d
|
版本库质量分析 ssh链接
|
2016-06-13 15:21:29 +08:00 |
cxt
|
6c7237509d
|
“当前作品未进行评分,是否确定提交”改为“您当次评阅未对作品进行评分,分数将取上次的评分结果,若没有评分记录则不评分,是否确定提交?”
|
2016-06-13 14:08:30 +08:00 |
yuanke
|
e86419c28b
|
组织配置里面栏目类型默认为帖子
|
2016-06-13 13:35:01 +08:00 |
cxt
|
3a8a61e404
|
在精品课程列表增加“取消精品”列、在全部课程列表增加“开课学期”列,并支持排序
|
2016-06-13 11:10:28 +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
|
1cb63055cb
|
api可以通过openid来认证
|
2016-06-12 17:18:05 +08:00 |
cxt
|
02e2831980
|
管理员界面的留言列表优化
|
2016-06-12 17:17:37 +08:00 |
huang
|
d4d4e38c41
|
门户模式中含有三级域名的用户图像https问题
|
2016-06-12 16:48:35 +08:00 |
huang
|
9d3bb44682
|
简洁模式
|
2016-06-12 16:04:26 +08:00 |
cxt
|
be47331213
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-12 15:08:43 +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 |
cxt
|
00528bec60
|
学生列表没有分班就不显示分班列
|
2016-06-12 14:50:47 +08:00 |
cxt
|
d7c2ca896d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-12 14:21:03 +08:00 |
cxt
|
24f5e245df
|
鼠标经过消息通知时弹窗显示最新的5条未读消息
|
2016-06-12 14:20:55 +08:00 |
huang
|
928d71500d
|
门户模式--组织栏目没有动态时显示位置
|
2016-06-12 13:45:22 +08:00 |
guange
|
07760bcfca
|
优化
|
2016-06-12 13:42:53 +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
|
793b651393
|
压缩angularjs
|
2016-06-09 19:48:58 +08:00 |
yuanke
|
7504b353c9
|
组织报500问题修复
|
2016-06-08 16:50:13 +08:00 |
cxt
|
a1e49d9a81
|
Merge branch 'cxt_course' into develop
|
2016-06-08 15:24:00 +08:00 |
cxt
|
c0d167d2e2
|
项目缺陷动态的回复不显示
|
2016-06-08 15:23:19 +08:00 |
huang
|
871a4d2d7b
|
组织设为首页500问题
|
2016-06-08 13:15:08 +08:00 |
huang
|
3e3c300273
|
Merge branch 'cxt_course' into develop
|
2016-06-08 11:37:58 +08:00 |
huang
|
90aaaa544a
|
最新动态按创建时间排序
|
2016-06-08 11:36:32 +08:00 |
cxt
|
b6eb5a3668
|
还原作品列表的拖动
|
2016-06-08 11:28:20 +08:00 |
huang
|
2f9dcc8a31
|
文章点击500问题
|
2016-06-08 11:23:16 +08:00 |
huang
|
a138ee31ab
|
详情页面取消首页问题
|
2016-06-08 11:00:19 +08:00 |
huang
|
6cdccc3b08
|
设置首页显示问题
|
2016-06-08 10:53:56 +08:00 |
huang
|
49406681ef
|
详情页面留言为空的问题
|
2016-06-08 10:02:10 +08:00 |
huang
|
67f0cad331
|
组织网站动态新页面
|
2016-06-08 09:40:05 +08:00 |
huang
|
e4f48f046b
|
子页面没有内容显示
|
2016-06-08 09:16:57 +08:00 |
guange
|
b965698fdf
|
merge
|
2016-06-07 17:45:19 +08:00 |
huang
|
fdb1846f75
|
Merge branch 'hjq_beidou' into develop
|
2016-06-07 17:37:38 +08:00 |
huang
|
9c01bb63e7
|
配置页面管理员栏目权限控制
|
2016-06-07 17:36:33 +08:00 |
huang
|
a8b68d64ee
|
导航权限控制
|
2016-06-07 17:19:19 +08:00 |
huang
|
09ff5954bd
|
字体过长演示问题(模式二子页面)
|
2016-06-07 16:56:20 +08:00 |
guange
|
81e35de2b6
|
base
|
2016-06-07 16:47:06 +08:00 |
huang
|
c3db6afd75
|
模式二导航栏
|
2016-06-07 16:42:33 +08:00 |
huang
|
3e2810129b
|
课程留言动态过滤掉
|
2016-06-07 16:24:02 +08:00 |
cxt
|
385ff03c88
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-07 16:15:31 +08:00 |
cxt
|
768d91278d
|
微信提示信息的修改
|
2016-06-07 16:15:25 +08:00 |
huang
|
c5bccf1adb
|
组织动态按更新时间排序
|
2016-06-07 16:02:46 +08:00 |
Tim
|
c5e6514c18
|
作品列表排序图标float消除
|
2016-06-07 16:02:20 +08:00 |
cxt
|
de58cfb5e5
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-07 16:02:08 +08:00 |
cxt
|
196c92f9c4
|
动态回复最多只加赞三条,点击展开更多时才加载余下的回复
|
2016-06-07 16:02:00 +08:00 |
huang
|
acf4a64e6a
|
二级帖子子页面
|
2016-06-07 15:40:28 +08:00 |
Tim
|
1d44116841
|
作品列表可拖拽
|
2016-06-07 15:30:17 +08:00 |
huang
|
59988f17da
|
帖子目录界面
|
2016-06-07 14:48:43 +08:00 |
huang
|
1553eadc58
|
宽度改成1000二级目录模式二样式调整
|
2016-06-07 10:17:16 +08:00 |
Tim
|
253d9da345
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-06-07 09:01:53 +08:00 |
huang
|
d191792894
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-06-06 18:24:34 +08:00 |
huang
|
b8d49f0079
|
0
|
2016-06-06 18:24:12 +08:00 |
Tim
|
a96470ad66
|
Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
|
2016-06-06 16:42:53 +08:00 |
Tim
|
5b2c22d264
|
历史版本名称过长导致折行
|
2016-06-06 16:42:41 +08:00 |
huang
|
793978f196
|
组织--名师、学霸:如图搜索结果有多页,翻页后建议输入的搜索条件仍显示在搜索框内
|
2016-06-06 16:15:35 +08:00 |
huang
|
21197c95b3
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-06 15:11:59 +08:00 |
huang
|
bfa447c195
|
未登录状态下anonymos改为未登录
|
2016-06-06 15:11:07 +08:00 |
cxt
|
0bf46f2ecd
|
帮助中心的弹框
|
2016-06-06 15:03:21 +08:00 |
huang
|
df8df117a8
|
解决匿名用户登录问题(控制器和view)
|
2016-06-06 15:02:11 +08:00 |
Tim
|
a44cb47a26
|
组织未登录回复框提示
|
2016-06-06 14:41:18 +08:00 |
huang
|
d3c6c0ca99
|
二级目录未登录时回复提示
|
2016-06-06 14:29:33 +08:00 |
huang
|
c6d36bd738
|
未登录留言判断
|
2016-06-06 14:21:58 +08:00 |
cxt
|
91f7e950ee
|
正式版微信
|
2016-06-06 12:22:52 +08:00 |
cxt
|
6a25adb37e
|
最新动态改成我的动态,提示修改
|
2016-06-06 11:13:35 +08:00 |
cxt
|
75f12e3749
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-06 11:05:37 +08:00 |
cxt
|
ee12b3540b
|
消息弹窗的还原、微信配置修改
|
2016-06-06 11:05:25 +08:00 |
huang
|
7cce01872d
|
名字样式
|
2016-06-03 18:11:42 +08:00 |
cxt
|
fe22cfa5c5
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-03 18:02:41 +08:00 |
huang
|
e4ff4ad156
|
Merge branch 'cxt_course' into develop
|
2016-06-03 17:55:42 +08:00 |
huang
|
57f3cf713c
|
去掉搜索
|
2016-06-03 17:50:40 +08:00 |
huang
|
acc808f003
|
样式问题
|
2016-06-03 17:24:45 +08:00 |
cxt
|
dab24567f2
|
微信模板消息
|
2016-06-03 17:21:36 +08:00 |
huang
|
429deefadf
|
右一线条样式问题
|
2016-06-03 17:14:28 +08:00 |
cxt
|
07941233d8
|
题库点击发送到后,先输入一个不存在的课程ID,点击确定,在出现请先选择课程的提示后删除输入的ID,此时会显示出该用户所有的课程,包括已经删除的
|
2016-06-03 17:03:53 +08:00 |
huang
|
65bf816ea4
|
帖子设为首页后,不在模式二中显示问题
|
2016-06-03 17:03:35 +08:00 |
huang
|
ea19f19973
|
500问题
|
2016-06-03 16:30:20 +08:00 |
cxt
|
ffe447e5bc
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-06-03 16:28:23 +08:00 |
cxt
|
d27a050ffa
|
消息弹窗的显示
|
2016-06-03 16:28:11 +08:00 |
huang
|
c7866af1e8
|
组织编辑成员的时候样式乱的问题
|
2016-06-03 16:14:45 +08:00 |
huang
|
edbe882cc9
|
管理员栏目其它成员不可见
|
2016-06-03 15:56:04 +08:00 |
huang
|
43e586aa90
|
标题过长隐藏效果
|
2016-06-03 15:50:52 +08:00 |
huang
|
0b869aaaed
|
去掉定制功能
|
2016-06-03 15:40:11 +08:00 |
huang
|
b128ba5257
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/views/layouts/base_org2.html.erb
|
2016-06-03 14:58:37 +08:00 |
huang
|
e726a362d8
|
组织配置页面状态的更新
|
2016-06-03 14:56:38 +08:00 |
huang
|
1e34a4f174
|
显示样式一级添加二级目录权限
|
2016-06-03 14:43:20 +08:00 |