 huang
|
d1e11d4260
|
代码审查后代码简化
|
10 years ago |
|
huang
|
eead7962cf
|
资源申请权限控制
|
10 years ago |
|
huang
|
b0e4ed5ab3
|
请求分享如果自己在项目的话则不需要申请
|
10 years ago |
|
huang
|
13ac7ef273
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
 cxt
|
6aa20c9edf
|
消息通知的内容没有过滤用Tab键空格引起的特殊符号
|
10 years ago |
|
huang
|
3985c190bf
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
0f2f4717b6
|
作业列表增加序号和翻页、按创建时间倒排
|
10 years ago |
|
huang
|
11bc6b1e6c
|
配置500问题
|
10 years ago |
|
huang
|
5ee6c9e5d3
|
子域名添加成员问题
|
10 years ago |
guange
|
f217b3f510
|
去除用户名域名
|
10 years ago |
|
huang
|
79e57e2b7f
|
代码和并冲突处理及连接参数
|
10 years ago |
|
huang
|
e8afcf9157
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/helpers/organizations_helper.rb
app/views/organizations/_org_subfield_rightM2.html.erb
|
10 years ago |
|
huang
|
39c753fd25
|
名师列表排序
|
10 years ago |
|
huang
|
467ee60657
|
名师默认显示5个，没有则不显示
|
10 years ago |
|
huang
|
33a3b22430
|
Merge branch 'hjq_beidou' into develop
Conflicts:
db/schema.rb
public/stylesheets/org2.css
|
10 years ago |
|
huang
|
3853d5b7ad
|
右三模式定制
|
10 years ago |
|
cxt
|
0f61994252
|
点击作业动态优秀排行中学生链接，在打开的作品列表中自动定位到该学生作品并默认打开该作品
|
10 years ago |
|
cxt
|
7481d96166
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/admin_controller.rb
config/routes.rb
lib/redmine.rb
|
10 years ago |
|
cxt
|
5baf467d13
|
作品评分不覆盖
|
10 years ago |
|
huang
|
cabac5914c
|
学生统计数
|
10 years ago |
|
huang
|
99d9a28828
|
名师榜sql查询
|
10 years ago |
|
huang
|
5880a12290
|
sql查询
|
10 years ago |
|
huang
|
6474444cc7
|
用户连接 id变成用户名
|
10 years ago |
|
huang
|
a98678e001
|
列表中类型显示方法封装
|
10 years ago |
|
huang
|
878bcc8cf1
|
栏目创建类型添加老师、学生类型
|
10 years ago |
|
cxt
|
b8f7672424
|
项目动态的更新时间更新到作业动态中
|
10 years ago |
|
huang
|
00d0bc0ce1
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
0a989daf31
|
Merge branch 'cxt_course' into develop
Conflicts:
app/helpers/application_helper.rb
public/stylesheets/courses.css
public/stylesheets/new_user.css
|
10 years ago |
|
cxt
|
10d26f89d9
|
作业列表的二级回复
|
10 years ago |
|
huang
|
c3a016607b
|
解决冲突
|
10 years ago |
|
huang
|
9e0176bc55
|
Merge branch 'hjq_beidou' into develop
Conflicts:
app/controllers/organizations_controller.rb
app/helpers/organizations_helper.rb
db/schema.rb
public/images/homepage_icon.png
public/stylesheets/new_user.css
|
10 years ago |
|
huang
|
0b43fb5502
|
隐藏可见及箭头的局部刷新
|
10 years ago |
|
huang
|
231f8f3526
|
二级目录中设置了隐藏，鼠标经过的时候不显示内容及 框框
|
10 years ago |
|
huang
|
a0ea2c7e5d
|
模式二3在配置整合
|
10 years ago |
|
huang
|
ccea42cc8b
|
项目和课程的动态只参与五种配置
|
10 years ago |
|
huang
|
8dfe95dfd1
|
配置页面新建二级域名样式
|
10 years ago |
|
huang
|
5e8ff06140
|
Merge branch 'yuanke' into develop
|
10 years ago |
|
cxt
|
1cad1626e0
|
解决冲突
|
10 years ago |
 yuanke
|
b199a6b8b2
|
列表人气排序修改
|
10 years ago |
|
yuanke
|
1353c27f64
|
Merge branch 'yuanke' into develop
Conflicts:
app/helpers/application_helper.rb
|
10 years ago |
|
yuanke
|
f8abd46ae9
|
列表修改
|
10 years ago |
|
yuanke
|
1da8288fe7
|
列表显示修改
|
10 years ago |
|
huang
|
1685449381
|
二级目录框架及结构
|
10 years ago |
|
yuanke
|
f185c59e90
|
Merge branch 'yuanke' into develop
|
10 years ago |
|
yuanke
|
2cb9f0cd05
|
组织还原
|
10 years ago |
|
yuanke
|
dc53b86a4e
|
Merge branch 'cxt_course' into yuanke
Conflicts:
app/controllers/student_work_controller.rb
db/schema.rb
|
10 years ago |
|
yuanke
|
647e6a7f92
|
Merge branch 'yuanke' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
config/locales/zh.yml
db/schema.rb
|
10 years ago |
|
huang
|
9fbf713709
|
完成组织二级域名
|
10 years ago |
|
cxt
|
3aa891acf6
|
Merge branch 'cxt_course' into develop
Conflicts:
app/controllers/student_work_controller.rb
app/views/praise_tread/_praise.html.erb
db/schema.rb
|
10 years ago |
|
cxt
|
766026e3cf
|
教师评分为最终评分
|
10 years ago |
|
yuanke
|
4258790453
|
Merge branch 'hjq_beidou' into yuanke_1
Conflicts:
db/schema.rb
public/stylesheets/project.css
|
10 years ago |
|
cxt
|
78c7db1150
|
Merge branch 'weixin_guange' into develop
|
10 years ago |
|
cxt
|
0222038899
|
缺陷模板消息改为对项目所有人发送、可屏蔽微信模板消息
|
10 years ago |
|
huang
|
d8f71da1fb
|
完成模块8配置
|
10 years ago |
|
huang
|
255d7e07bc
|
北斗新界面样式
|
10 years ago |
|
huang
|
dae6a5ecae
|
配置八种类型更新
|
10 years ago |
|
cxt
|
da73d2b004
|
Merge branch 'cxt_course' into develop
|
10 years ago |
|
cxt
|
9b4c275869
|
作品动态添加追加附件功能
|
10 years ago |
|
huang
|
cccc2a7eb7
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
ab8c1a0bad
|
Merge branch 'hjq_beidou' into develop
|
10 years ago |
|
huang
|
e8048f8eb7
|
完成版本库时间UTC与北京时间的转换
时间国际化问题
|
10 years ago |
|
cxt
|
06f15735fe
|
Merge branch 'weixin_guange' into develop
|
10 years ago |
|
cxt
|
ef987d6bf7
|
模板消息中有html标签
|
10 years ago |
|
huang
|
ad3d27d6b0
|
版本库文件目录
|
10 years ago |
|
huang
|
adc17c5038
|
代码优化
文件目录动态获取接口
文件目录显示样式
|
10 years ago |
|
huang
|
7259d607dc
|
Merge branch 'hjq_beidou' into develop
|
10 years ago |
|
huang
|
8064fe6c46
|
讨论区新建帖子代码优化
|
10 years ago |
|
cxt
|
e5b07c6c12
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
10 years ago |
|
cxt
|
5e1284605f
|
Merge branch 'hjq_beidou' into cxt_course
Conflicts:
app/views/layouts/new_base_user.html.erb
|
10 years ago |
|
huang
|
acf4e15f09
|
统计数左侧刷新
|
10 years ago |
|
cxt
|
2befcd6634
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/new_base_user.html.erb
|
10 years ago |
|
cxt
|
062af3c57a
|
作业积分出现负分
|
10 years ago |
|
cxt
|
70afbb3323
|
姓名的判断、
|
10 years ago |
|
cxt
|
1882cd8f4f
|
用户姓名不显示
|
10 years ago |
|
guange
|
aa9cb4e579
|
merge
|
10 years ago |
|
cxt
|
8f7c6f49b7
|
api的修改
|
10 years ago |
|
cxt
|
6c527a9a54
|
点赞的api
|
10 years ago |
|
huang
|
2162d7d4b8
|
组织banner上传功能
|
10 years ago |
 Yiang Gan
|
af2bd66847
|
回复api
|
10 years ago |
|
Yiang Gan
|
536394663a
|
微信消息模板
|
10 years ago |
|
huang
|
f662bfa40b
|
组织科配置
|
10 years ago |
|
huang
|
c431658333
|
setting中后台编辑
|
10 years ago |
|
huang
|
1ccb3a2c41
|
Merge branch 'hjq_beidou' of http://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
c6f6030e10
|
组织新样式
|
10 years ago |
|
cxt
|
893fad2b48
|
组织配置里的栏目 “排列做成可编辑的”
|
10 years ago |
|
huang
|
bded9f2e98
|
图片自动获取功能
|
10 years ago |
|
huang
|
7c55356ace
|
组织新界面修改
|
10 years ago |
|
Yiang Gan
|
9cebcfdd2d
|
动态api调整
|
10 years ago |
|
Yiang Gan
|
4de598873f
|
动态和作业的api
|
10 years ago |
|
huang
|
8a6a1b94ee
|
组织资源的统计与权限
|
10 years ago |
|
huang
|
d28a46c48a
|
北斗资源库板块
|
10 years ago |
|
huang
|
80cd5089a4
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
2b9ddf3594
|
组织新版
|
10 years ago |
|
cxt
|
ed0eb4aff3
|
学生作品详情无法打开
|
10 years ago |
|
huang
|
b8463fcca5
|
北斗
|
10 years ago |
|
huang
|
8f0038c3ff
|
tag
|
10 years ago |
|
huang
|
dea1c13a64
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/migrate/20160324074942_add_index_to_forge_activities.rb
|
10 years ago |
 alan
|
46951f7af9
|
Merge branch 'develop' into alan_develop
Conflicts:
app/views/student_work/_student_work_list.html.erb
app/views/users/_user_activities.html.erb
app/views/users/_user_message_course.html.erb
|
10 years ago |
 ouyangxuhua
|
b581a13736
|
Merge branch 'develop' into ouyangxuhua
|
10 years ago |
|
huang
|
ff2340baf9
|
课程统计信息优化
|
10 years ago |
|
huang
|
cb4b26762d
|
课程base优化
|
10 years ago |
|
alan
|
13e265b7d2
|
优化 layouts/_user_projects 和 layouts/_user_courses页面
|
10 years ago |
|
ouyangxuhua
|
1579a86f9f
|
老师给学生的作品打分后，学生再次编辑，要给老师和助教发消息提示
|
10 years ago |
|
alan
|
a165657915
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
alan
|
9273e37a5b
|
优化SQL查询：1，members与users表关联查询； 2，blogs表单查询
|
10 years ago |
 linchun
|
6284b8d4f9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
84703a3e01
|
组织配置中的添加成员，链接使用https://www形式
|
10 years ago |
|
ouyangxuhua
|
a1fbe8b886
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
b5964fba0b
|
组织超链接问题
|
10 years ago |
|
huang
|
bff20ee072
|
英雄榜数据显示问题
|
10 years ago |
|
linchun
|
d3635067b7
|
Merge remote-tracking branch 'remotes/origin/develop' into linchun
|
10 years ago |
|
huang
|
4999b47b44
|
项目去掉ID
|
10 years ago |
|
ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
10 years ago |
|
huang
|
7e0aa44b68
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_user_message_userfeedaback.html.erb
|
10 years ago |
|
huang
|
28cb1755d8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/files/_org_subfield_list.html.erb
db/schema.rb
|
10 years ago |
|
cxt
|
6b8ae56ce4
|
Merge branch 'alan_develop' into develop
|
10 years ago |
|
cxt
|
d72aa3a93c
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/homework_common_controller.rb
app/views/student_work/show.js.erb
public/javascripts/application.js
public/stylesheets/base.css
public/stylesheets/public_new.css
|
10 years ago |
|
alan
|
a4e2fd741e
|
删除issue，返回页面不变
|
10 years ago |
|
linchun
|
34c9f54510
|
完成了管理员界面学校列表
|
10 years ago |
|
ouyangxuhua
|
baf547417e
|
组织下的链接用Setting.protocol表示协议
|
10 years ago |
|
ouyangxuhua
|
ea6de1407e
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/helpers/application_helper.rb
|
10 years ago |
|
ouyangxuhua
|
dcadadae03
|
退出和用户的链接使用https:// +Setting.host_name
|
10 years ago |
|
ouyangxuhua
|
da1b27cd38
|
Merge branch 'ouyang' of https://git.trustie.net/jacknudt/trustieforge into ouyang
|
10 years ago |
|
cxt
|
2ce2134f0b
|
浏览器tab的title，显示用户姓名，不是登录名
|
10 years ago |
|
ouyangxuhua
|
b716e593b5
|
组织下的链接问题
|
10 years ago |
|
ouyangxuhua
|
098844a910
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/helpers/application_helper.rb
app/views/organizations/_org_course_homework.html.erb
app/views/organizations/_org_course_news.html.erb
app/views/organizations/_org_project_issue.html.erb
app/views/organizations/_project_message.html.erb
app/views/organizations/_show_org_document.html.erb
app/views/users/_user_message_course.html.erb
|
10 years ago |
|
ouyangxuhua
|
2a46d60433
|
组织下的链接的host_name均使用Setting.host_name
|
10 years ago |
|
huang
|
bf4116906f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/public.css
|
10 years ago |
|
huang
|
2b21213b7f
|
公共资源库，排序
|
10 years ago |
|
ouyangxuhua
|
402b0e9c24
|
域名都使用Setting.host_name获取主机名
|
10 years ago |
|
ouyangxuhua
|
15dfaf67b2
|
测试版环境，登陆注册改成https://test.forge.
|
10 years ago |
|
ouyangxuhua
|
a2e6f0ee5f
|
1.登陆退出使用www;2.对于有多个标签的组织资源，过滤条件中的“其他”应该显示
|
10 years ago |
|
ouyangxuhua
|
a7312a6191
|
修改游客下载组织资源的权限
|
10 years ago |
|
ouyangxuhua
|
f496761325
|
将is_default_field方法放到application_helper.rb中，避免报错；退出链接不带子域名
|
10 years ago |
|
cxt
|
98f7ad19f6
|
Merge branch 'linchun' into develop
|
10 years ago |
|
linchun
|
8c145c9d39
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
ef5625ccdf
|
延期发布的课程资源设为公开后不应对学生可见
|
10 years ago |
|
cxt
|
0d8052da28
|
老师把学生加入某一个分班
|
10 years ago |
|
ouyangxuhua
|
766569afa6
|
1.组织下的课程作业，设置评分等按钮点击没反应的问题修复；更新项目/课程的活动，相应地更新组织的活动的更新时间
|
10 years ago |
|
ouyangxuhua
|
f917e96a12
|
组织栏目中的链接的url更新
|
10 years ago |
|
ouyangxuhua
|
a51ca428be
|
组织中，增加调整栏目显示顺序的功能
|
10 years ago |
|
huang
|
53e164048d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
2a1eac02a9
|
Merge branch 'hjq_new_course' into szzh
|
10 years ago |
|
huang
|
f469e51202
|
课程模块/通知、作业、留言、发帖，删除的时候统计数字递减
|
10 years ago |
|
ouyangxuhua
|
5d1d56fbb3
|
组织下链接改成https://www.形式
|
10 years ago |
|
ouyangxuhua
|
6e21229b4c
|
组织用户链接
|
10 years ago |
|
ouyangxuhua
|
4442d286ce
|
组织下的用户连接改成https://www.……形式
|
10 years ago |
|
linchun
|
3e70db4e82
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
c3eb8e05cd
|
组织的私有资源，数量一致
|
10 years ago |
|
ouyangxuhua
|
ce187b4212
|
组织资源下载权限控制
|
10 years ago |
