 cxt
|
a96d8ce5a4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-22 17:29:29 +08:00 |
|
cxt
|
e09f795171
|
附件的显示
|
2016-01-22 17:05:58 +08:00 |
|
cxt
|
338c224846
|
课程配置页面的结束学期可修改
|
2016-01-22 15:17:11 +08:00 |
 ouyangxuhua
|
600f5de32e
|
个人动态进入个人博客编辑后，跳转到个人首页
|
2016-01-21 16:11:06 +08:00 |
|
ouyangxuhua
|
b8ae62db84
|
Merge branch 'szzh' into dev_hjq
|
2016-01-21 15:32:18 +08:00 |
|
ouyangxuhua
|
c303f7ff3f
|
将分享的js方法统一，分享文件、通知等均可复用
|
2016-01-21 14:33:31 +08:00 |
|
cxt
|
247924af26
|
动态内容显示不全
|
2016-01-21 11:24:26 +08:00 |
|
cxt
|
f15847371c
|
附件显示过长
|
2016-01-21 10:36:30 +08:00 |
|
cxt
|
1ff244ad98
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-01-20 18:38:00 +08:00 |
|
cxt
|
3b180aca90
|
用户个人留言页面的改版
|
2016-01-20 18:37:47 +08:00 |
 Tim
|
c7edf0d73b
|
弹框样式修改
|
2016-01-20 17:55:20 +08:00 |
|
ouyangxuhua
|
340d404ecd
|
组织栏目的通知增加查、改、删功能
|
2016-01-20 17:23:02 +08:00 |
|
Tim
|
ffba281de5
|
弹框蓝色边框与关闭键替换
|
2016-01-20 16:03:28 +08:00 |
|
cxt
|
b64fc1771d
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
2016-01-20 09:27:29 +08:00 |
|
Tim
|
cd3a1e59dd
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2016-01-19 17:03:10 +08:00 |
|
Tim
|
04fded784e
|
单词折行样式
|
2016-01-19 17:02:46 +08:00 |
|
cxt
|
6e56a0706a
|
动态描述中的单词折行
|
2016-01-19 16:53:34 +08:00 |
|
cxt
|
7f7d0ac6f7
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/layouts/base_courses.html.erb
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
2016-01-18 17:12:56 +08:00 |
|
cxt
|
df57b13ce0
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
app/helpers/application_helper.rb
|
2016-01-18 10:16:09 +08:00 |
|
cxt
|
020135cbc2
|
作业动态显示优秀作品、关联项目的样式修改
|
2016-01-18 10:13:31 +08:00 |
 huang
|
eecdc26b2f
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/organizations/_org_course_homework.html.erb
app/views/users/_user_homework_detail.html.erb
|
2016-01-15 15:42:36 +08:00 |
|
huang
|
c936304314
|
课程默认收起
|
2016-01-15 15:37:17 +08:00 |
|
Tim
|
50849baade
|
侧导航“+”号图标调小
|
2016-01-15 15:27:03 +08:00 |
|
cxt
|
25cc959576
|
Merge branch 'szzh' into develop
Conflicts:
app/views/layouts/_user_courses.html.erb
app/views/org_subfields/show.html.erb
app/views/organizations/_subfield_list.html.erb
app/views/users/_resource_share_for_orgs.html.erb
|
2016-01-14 18:22:57 +08:00 |
|
ouyangxuhua
|
0f0f1ae056
|
Merge branch 'dev_hjq' into szzh
Conflicts:
db/schema.rb
|
2016-01-14 17:54:16 +08:00 |
|
ouyangxuhua
|
6b7ce68e4a
|
各种bug解决
|
2016-01-14 17:52:48 +08:00 |
|
huang
|
09d2796ca7
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
public/stylesheets/new_user.css
处理冲突
|
2016-01-14 17:35:25 +08:00 |
|
Tim
|
13e289dfb5
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
public/stylesheets/new_user.css
|
2016-01-14 16:07:06 +08:00 |
|
Tim
|
8feea07825
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2016-01-14 15:59:50 +08:00 |
|
huang
|
440be81587
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
处理冲突
|
2016-01-14 15:02:30 +08:00 |
|
ouyangxuhua
|
a1f8db65fc
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
2016-01-14 14:40:13 +08:00 |
|
ouyangxuhua
|
307d382568
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-14 14:38:08 +08:00 |
|
Tim
|
893e5dc7f3
|
针对课程370的精品课程样式设计
|
2016-01-13 18:33:22 +08:00 |
|
Tim
|
f0347c9166
|
精品课程图标
|
2016-01-13 18:16:19 +08:00 |
 guange
|
d935532f8d
|
课程讨论区at功能
|
2016-01-13 17:50:08 +08:00 |
|
Tim
|
88895ff262
|
英文文本强制折行修复
|
2016-01-13 16:36:34 +08:00 |
|
huang
|
4b26e77478
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/models/issue.rb
app/models/message.rb
app/models/news.rb
处理冲突
|
2016-01-13 16:28:00 +08:00 |
|
ouyangxuhua
|
897eabd57a
|
修改快捷菜单权限问题及样式
|
2016-01-13 16:21:37 +08:00 |
|
huang
|
05cf2d24dc
|
新项目积分系统
讨论区回复加入得分系统
版本库行号显示错误问题
|
2016-01-13 15:29:29 +08:00 |
|
ouyangxuhua
|
7bcf995eaf
|
Merge branch 'develop' into dev_hjq
Conflicts:
db/schema.rb
public/stylesheets/share.css
|
2016-01-13 09:58:14 +08:00 |
|
ouyangxuhua
|
d5fc0277a2
|
3.2组织资源的样式更新
|
2016-01-12 16:43:40 +08:00 |
|
cxt
|
e5f8c4c4a8
|
测试结果的对齐显示
|
2016-01-11 17:00:29 +08:00 |
|
ouyangxuhua
|
25a24f72e5
|
快捷菜单使用新的样式及链接
|
2016-01-11 16:44:52 +08:00 |
|
cxt
|
a93539da5e
|
课程学期往前推一个学期
|
2016-01-11 11:07:03 +08:00 |
|
ouyangxuhua
|
09c7728201
|
样式更新
|
2016-01-11 10:35:25 +08:00 |
|
guange
|
d4d1fe65b3
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-08 23:01:33 +08:00 |
|
guange
|
e96496ddcd
|
avatar.js和attachments.js冲突,导致头像不能上传
|
2016-01-08 23:01:16 +08:00 |
|
huang
|
5d68d185d5
|
资源样式冲突
|
2016-01-08 21:24:25 +08:00 |
|
cxt
|
a206a1d7f1
|
样式
|
2016-01-08 20:43:33 +08:00 |
|
ouyangxuhua
|
0ac99571de
|
样式调整
|
2016-01-08 19:50:17 +08:00 |