Commit Graph

52 Commits

Author SHA1 Message Date
guange a1d3bbbfa9 解决ruby2.3执行sql出错的bug 2016-08-01 19:17:16 +08:00
huang 343e9d9434 修改日志分割关闭 2016-05-13 11:32:50 +08:00
guange 6ae4cd0767 merge 2016-03-21 16:02:30 +08:00
guange 24a278d7d6 加上atall 2016-03-11 18:50:37 +08:00
guange 445bae6de9 patch mysql5.7的create table 2016-03-01 16:13:13 +08:00
ouyangxuhua d2267106c2 修复team.trustie.net的侧栏点击后没有显示栏目内容的问题 2016-02-23 13:07:42 +08:00
guange eed6250145 secdomain问题 2016-02-02 17:36:11 +08:00
guange 28035dfc47 子域名处理 2016-02-02 12:40:00 +08:00
guange bb0ff4a14c elasticsearch在开发环境下的补丁,默认不开启 2016-01-29 20:31:25 +08:00
guange c298adda7c 子域名路由实现 2016-01-14 20:37:56 +08:00
houxiang 5f2e6284ce 增加了两个template文件,大家下拉代码后将template文件复制去掉后尾的template就行 2015-12-18 09:21:05 +08:00
huang 074d8f62c2 delete the two config files on gitlab 2015-12-17 11:16:46 +08:00
lizanle 4efb660214 全站搜索 2015-11-26 09:57:53 +08:00
huang aa4710d872 git中忽略配置文件
提交记录新界面
修改获取用户路径
2015-10-30 15:46:06 +08:00
guange f1af041f24 gitlab key 更改 2015-10-18 13:56:10 +08:00
guange 9d8596a14c 新增gitlab adapter用于适配gitlab命令 2015-08-01 18:48:55 +08:00
guange 59a4b4656b change git config 2015-07-16 20:46:04 +08:00
guange 006ed66d7a 新注册用户可以同步到gitlab 2015-07-15 15:51:49 +08:00
guange 797ed5081d 同步登录 2015-06-30 22:12:34 +08:00
alan 799f561d77 Merge branch 'szzh' into memcached_alan
Conflicts:
	Gemfile
	app/views/issues/index.html.erb
	db/schema.rb

Signed-off-by: alan <547533434@qq.com>
2015-05-20 17:42:26 +08:00
guange 86af233042 修正autologin多终端登录问题 2015-05-05 11:45:58 +08:00
alan 54078e114c redis缓存服务器的搭建以及对首页的缓存设置
Signed-off-by: alan <547533434@qq.com>
2015-05-04 15:20:40 +08:00
huang 95c5e6ac83 Merge branch 'szzh' into dev_hjq
Conflicts:
	app/helpers/application_helper.rb
	app/helpers/files_helper.rb
	app/helpers/members_helper.rb
	app/models/journals_for_message.rb
	app/models/mailer.rb
	app/models/user.rb
	app/views/attachments/_form.html.erb
	app/views/bids/_new_homework_form.html.erb
	app/views/boards/_project_show.html.erb
	app/views/courses/_courses_jours.html.erb
	app/views/courses/feedback.html.erb
	app/views/courses/new_homework.html.erb
	app/views/courses/settings.html.erb
	app/views/issues/_list.html.erb
	app/views/issues/new.html.erb
	app/views/messages/_project_show.html.erb
	app/views/messages/edit.html.erb
	app/views/news/_project_news.html.erb
	app/views/projects/invite_members.html.erb
	app/views/projects/settings/_modules.html.erb
	app/views/projects/show.html.erb
	config/configuration.yml
	config/locales/zh.yml
	db/schema.rb
	public/assets/kindeditor/kindeditor.js
	public/javascripts/course.js
	public/stylesheets/courses.css
	public/stylesheets/public.css
2015-04-16 10:26:03 +08:00
guange eb4d9a4ffc 1. 将session改为跨子域。 2. 将session的存储改到files/cache_store下,用于nfs 2015-04-13 20:44:46 +08:00
guange f94184bc81 个人动态权限部分性能优化 2015-04-10 16:27:26 +08:00
guange e6780cc2fb 加入delayedjob配置文件 2015-04-10 10:47:41 +08:00
huang 12eaac5683 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/views/boards/_project_show.html.erb
	public/javascripts/course.js

处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
2015-04-07 13:47:39 +08:00
guange 56df5ce9a7 优化zip重复打包问题 2015-04-02 17:20:52 +08:00
guange 77134c8dde 将每日邮件移入crontab 2015-03-30 20:56:42 +08:00
guange c1ed8bd36d #2096 course、forge的邮件通知系统,改为可以每日一报、一事一报、不报 2015-03-29 12:33:33 +08:00
lizanle a0e8abb5ea kindeditor配置文件 2015-03-16 15:31:11 +08:00
lizanle de233cb52a issue2012,分页显示方式修改 2015-03-11 15:30:24 +08:00
lizanle 77f81ac171 kaminari分页配置 2015-03-07 14:32:34 +08:00
alan f374bfd7e2 修复《窗口跳转问题》
Signed-off-by: alan <547533434@qq.com>
2015-03-02 14:47:50 +08:00
alan 4bfc4493eb 添加《邮件周日发送》功能,修改《贴吧》邮件发送策略
Signed-off-by: alan <547533434@qq.com>
2015-02-11 20:23:50 +08:00
alan 6f9e2bad63 mail weekly 2015-02-06 18:15:08 +08:00
alan 3484fd34bb merge dev_zanle branch
Signed-off-by: alan <547533434@qq.com>
2015-01-31 10:47:09 +08:00
lizanle ff80bea0c2 添加Kaminari配置文件,并给出了比较详细的注释 2015-01-30 17:25:27 +08:00
lizanle c543a28cc8 重写url_helper link_to_unless方法,给Kaminari当前页添加样式 2015-01-30 17:24:26 +08:00
lizanle 3637d1906d Merge branch 'szzh' into dev_zanle
Conflicts:
	Gemfile
	config/routes.rb
2015-01-28 12:38:32 +08:00
lizanle ae74dff89b 添加注释 2015-01-23 09:46:55 +08:00
lizanle 43c5feb1f7 补丁:修改日志还没有关闭就被重命名的bug:
https://bugs.ruby-lang.org/issues/7303
2015-01-22 10:06:16 +08:00
z9hang 0f9915fc2a Merge branch 'szzh' into api
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/bids_controller.rb
	app/controllers/users_controller.rb
	db/schema.rb
2015-01-13 15:12:05 +08:00
z9hang 899ac6f654 添加作品列表导出excel功能 2014-12-30 14:29:30 +08:00
guange 41d9af1ab9 auto reload api folder in development mode. 2014-12-09 15:16:47 +08:00
sw f0cee20f11 tt 2014-07-31 09:52:52 +08:00
sw 41d983e904 取消过期缺陷邮件的发送(很有问题)!!! 2014-07-31 09:45:46 +08:00
sw 01ea6238a4 修复竞赛通知描述过长时报错的BUG 2014-07-30 10:48:33 +08:00
sw c1bbd8a535 对于设置了完成日期的缺陷,到日期还没解决,给相关人员发一个通知邮件 2014-07-29 14:29:59 +08:00
sw 6d5f72326f 增加定时任务 2014-07-25 11:09:47 +08:00