 lizanle
|
dcd441a9db
|
全站搜索
|
2015-11-26 16:43:10 +08:00 |
|
lizanle
|
4efb660214
|
全站搜索
|
2015-11-26 09:57:53 +08:00 |
 ouyangxuhua
|
866c2feaa1
|
修改组织模块的bug
|
2015-11-13 15:02:12 +08:00 |
|
ouyangxuhua
|
6ec27761fb
|
组织功能实现及缺陷修改
|
2015-11-12 20:57:41 +08:00 |
|
ouyangxuhua
|
21275e8b7b
|
组织模块功能缺陷修改
|
2015-11-12 17:52:47 +08:00 |
|
ouyangxuhua
|
283af137c6
|
组织模块动态及配置
|
2015-11-05 17:57:07 +08:00 |
 guange
|
be25a57eaf
|
同步用户bug解决
|
2015-11-01 21:49:07 +08:00 |
 cxt
|
c4816a0414
|
名字为空的用户创建博客时博客名称为登录名
|
2015-10-30 09:56:55 +08:00 |
 huang
|
4c61e7490b
|
Merge branch 'develop' into gitlab_guange
Conflicts:
db/schema.rb
|
2015-10-27 14:42:05 +08:00 |
|
lizanle
|
2a76461cd1
|
简单博客功能
|
2015-10-24 15:34:43 +08:00 |
|
huang
|
150ee3d28d
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
2015-10-16 09:07:38 +08:00 |
|
cxt
|
8abc97ae84
|
个人主页添加个人留言动态
|
2015-10-14 11:38:16 +08:00 |
|
cxt
|
b9b7f6fa9e
|
个人主页留言动态的实现
|
2015-10-13 16:51:44 +08:00 |
|
huang
|
7c1bb8b9ed
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
Gemfile
app/models/user.rb
db/schema.rb
lib/trustie.rb
解决冲突
|
2015-10-10 16:09:05 +08:00 |
|
huang
|
b49d19cdb2
|
添加注释
|
2015-09-21 15:32:28 +08:00 |
|
huang
|
b0ccf9037a
|
邮件邀请：
1、修改私有项目跳入403问题
2、增加同一个用户反复邀请的邮箱提醒。
3、修改邮箱的发送策略
|
2015-09-15 17:39:57 +08:00 |
|
huang
|
c0437ae992
|
作业截止时间提醒界面！
|
2015-09-11 14:41:23 +08:00 |
|
huang
|
66251c8d30
|
添加功能：管理员界面发送系统消息
|
2015-09-09 17:05:32 +08:00 |
|
huang
|
103d61056d
|
完成功能：
1、添加“新的消息”分类
2、新注册用户默认点击时间
|
2015-09-07 16:08:04 +08:00 |
|
huang
|
ecd0056f0a
|
1、完成消息点击记后图标不显示红点的功能。
2、首次登陆以“最后登录时间”为准，后面以点击时间为准
|
2015-09-07 11:13:15 +08:00 |
|
huang
|
a7eff50c61
|
消息留言发送：回复东家，回复人和东家只能一人收到消息
|
2015-08-27 10:32:45 +08:00 |
|
lizanle
|
1aa61acd79
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/public.css
|
2015-08-21 16:16:18 +08:00 |
|
lizanle
|
9138f46301
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/users_controller.rb
|
2015-08-21 14:10:50 +08:00 |
|
huang
|
ef45e41a40
|
新消息提醒。表情插入
|
2015-08-21 09:41:59 +08:00 |
|
huang
|
d18d1a9d81
|
用户留言添加
公共讨论区留言修改
|
2015-08-19 17:29:05 +08:00 |
|
huang
|
d657e9f3cc
|
新增 公共贴吧 消息通知
|
2015-08-19 11:06:39 +08:00 |
|
lizanle
|
89b9a5c09d
|
资源库
|
2015-08-15 17:06:41 +08:00 |
|
huang
|
9b98bdcf5c
|
1、消息看过则不提示（方法实现）
2、添加消息新按钮
|
2015-08-15 15:44:44 +08:00 |
|
huang
|
ed8c4ac906
|
不同类型消息发送
|
2015-08-15 02:11:18 +08:00 |
|
huang
|
17fad1f291
|
课程（所有消息）--发布作业、新闻、问卷界面
|
2015-08-14 17:05:27 +08:00 |
|
huang
|
c903325352
|
缺陷状态更新消息提醒
留言消息提醒
|
2015-08-13 16:55:25 +08:00 |
|
huang
|
5dd2befe88
|
添加消息看过后即不显示功能
|
2015-08-13 10:10:01 +08:00 |
|
huang
|
ee778b5968
|
1、增加issue消息提醒（发送给指派的人）
2、下拉框形式区分消息
3、相关关联
|
2015-08-12 17:45:17 +08:00 |
|
huang
|
5f87d5806b
|
解决留言消息提示中遗留的bug
|
2015-08-11 15:26:41 +08:00 |
|
huang
|
82747a7690
|
留言添加消息提示
|
2015-08-10 16:12:13 +08:00 |
 sw
|
11afcaf17c
|
没有昵称的用户显示为：匿名用户
个人主页留言换行
|
2015-08-01 15:14:45 +08:00 |
|
guange
|
7d0a53ec86
|
merge
|
2015-07-21 20:56:33 +08:00 |
|
guange
|
006ed66d7a
|
新注册用户可以同步到gitlab
|
2015-07-15 15:51:49 +08:00 |
|
huang
|
dae15840b8
|
新注册用户邮件默认缺省值按天发送
|
2015-07-07 14:45:46 +08:00 |
|
sw
|
f675211642
|
学生作品列表，没有真实姓名就显示login，作品附件导出也一样
|
2015-06-05 15:26:35 +08:00 |
|
sw
|
cc5171bc1d
|
解决冲突
|
2015-06-02 14:48:48 +08:00 |
|
huang
|
7197c33be4
|
注释掉暂时未完成的功能
|
2015-05-29 16:07:57 +08:00 |
|
huang
|
cae882b3d6
|
新增邮件状态表
相关关联
|
2015-05-28 14:44:04 +08:00 |
|
sw
|
dc1971f507
|
学生作品详细得分表，以及相关的关系
|
2015-05-19 11:18:19 +08:00 |
|
sw
|
08b469fa3c
|
学生作品匿评分配表
|
2015-05-19 10:56:41 +08:00 |
|
sw
|
3abfaed081
|
学生提交作品表，以及相关的关系
|
2015-05-19 10:36:30 +08:00 |
|
sw
|
a43a6289e4
|
新的老师布置的作业表添加，以及相关关系定义
|
2015-05-19 09:49:26 +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
|
5a876d9df1
|
邮件发送时，单个收件人会报错
|
2015-04-10 10:41:44 +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 |