jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
socialforge/app/models
History
xianbo 806fae7b19 Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop 
Conflicts:
	app/controllers/account_controller.rb
	app/controllers/my_controller.rb
	app/controllers/projects_controller.rb
	app/controllers/users_controller.rb
	app/helpers/projects_helper.rb
	app/helpers/users_helper.rb
	app/models/project.rb
	app/models/user.rb
	app/models/user_extensions.rb
	app/views/account/register.html.erb
	app/views/bids/_bid_show.html.erb
	app/views/bids/_history.html.erb
	app/views/bids/_project_list.html.erb
	app/views/bids/show.html.erb
	app/views/files/index.html.erb
	app/views/layouts/base_bids.html.erb
	app/views/layouts/base_users.html.erb
	app/views/my/account.html.erb
	app/views/users/watch_bids.html.erb
	config/locales/en.yml
	config/locales/zh.yml
	config/routes.rb
	db/schema.rb
	lib/redmine.rb
	public/stylesheets/application.css
 		2013-09-23 20:18:03 +08:00
..
repository first commit 2013-08-01 10:33:49 +08:00
activity.rb 修改用户活动，用户主页的其他部分添加分页 2013-08-12 15:37:42 +08:00
attachment.rb first commit 2013-08-01 10:33:49 +08:00
auth_source.rb first commit 2013-08-01 10:33:49 +08:00
auth_source_ldap.rb first commit 2013-08-01 10:33:49 +08:00
bid.rb 将新闻添加进活动 2013-09-15 09:33:51 +08:00
biding_project.rb 添加备注 2013-08-04 10:59:25 +08:00
board.rb first commit 2013-08-01 10:33:49 +08:00
change.rb first commit 2013-08-01 10:33:49 +08:00
changeset.rb new version 2013-09-12 10:41:15 +08:00
comment.rb first commit 2013-08-01 10:33:49 +08:00
comment_observer.rb test 2013-08-22 16:42:13 +08:00
course.rb 课程合并 2013-09-23 08:44:48 +08:00
custom_field.rb first commit 2013-08-01 10:33:49 +08:00
custom_field_value.rb first commit 2013-08-01 10:33:49 +08:00
custom_value.rb first commit 2013-08-01 10:33:49 +08:00
document.rb first commit 2013-08-01 10:33:49 +08:00
document_category.rb first commit 2013-08-01 10:33:49 +08:00
document_category_custom_field.rb first commit 2013-08-01 10:33:49 +08:00
document_observer.rb test 2013-08-22 16:42:13 +08:00
enabled_module.rb first commit 2013-08-01 10:33:49 +08:00
enumeration.rb first commit 2013-08-01 10:33:49 +08:00
group.rb first commit 2013-08-01 10:33:49 +08:00
group_custom_field.rb first commit 2013-08-01 10:33:49 +08:00
homework_attach.rb 添加了提交作业 2013-09-13 21:52:24 +08:00
homework_for_course.rb new version 2013-09-12 10:41:15 +08:00
issue.rb 将issue加入活动中，添加读取活动数据的方法 2013-08-13 16:29:02 +08:00
issue_category.rb first commit 2013-08-01 10:33:49 +08:00
issue_custom_field.rb first commit 2013-08-01 10:33:49 +08:00
issue_observer.rb test 2013-08-22 16:42:13 +08:00
issue_priority.rb first commit 2013-08-01 10:33:49 +08:00
issue_priority_custom_field.rb first commit 2013-08-01 10:33:49 +08:00
issue_query.rb first commit 2013-08-01 10:33:49 +08:00
issue_relation.rb first commit 2013-08-01 10:33:49 +08:00
issue_status.rb first commit 2013-08-01 10:33:49 +08:00
journal.rb 解决冲突 2013-08-12 17:30:31 +08:00
journal_detail.rb first commit 2013-08-01 10:33:49 +08:00
journal_observer.rb test 2013-08-22 16:42:13 +08:00
journal_reply.rb 修改用户主页中与我相关部分的功能，现在可以查找在问题中的引用以及对指派给我的问题中的所有反馈 2013-08-11 10:36:55 +08:00
journals_for_message.rb 修改用户主页中与我相关部分的功能，现在可以查找在问题中的引用以及对指派给我的问题中的所有反馈 2013-08-11 10:36:55 +08:00
journals_for_message_observer.rb move 2013.8.29 2013-08-30 09:34:21 +08:00
mail_handler.rb first commit 2013-08-01 10:33:49 +08:00
mailer.rb 修改留言功能 2013-09-14 08:45:18 +08:00
member.rb first commit 2013-08-01 10:33:49 +08:00
member_role.rb first commit 2013-08-01 10:33:49 +08:00
message.rb 解决冲突 2013-08-12 17:30:31 +08:00
message_observer.rb test 2013-08-22 16:42:13 +08:00
news.rb 解决冲突 2013-08-12 17:30:31 +08:00
news_observer.rb test 2013-08-22 16:42:13 +08:00
praise_tread.rb 加入了对赞功能模块，同时预留了踩功能，但暂时不使用。 2013-08-08 17:01:56 +08:00
praise_tread_cache.rb 1.重新定义了顶和踩得规则： 2013-08-12 14:50:54 +08:00
principal.rb first commit 2013-08-01 10:33:49 +08:00
project.rb Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop 2013-09-23 20:18:03 +08:00
project_custom_field.rb first commit 2013-08-01 10:33:49 +08:00
project_info.rb 修改需求页面的一些细节，修改了更新问题的权限，现在更新问题的角色包括超级管理员，管理员，问题创建者，问题指派人员 2013-08-22 20:26:56 +08:00
project_status.rb new version 2013-09-12 10:41:15 +08:00
project_tags.rb first commit 2013-08-01 10:33:49 +08:00
query.rb first commit 2013-08-01 10:33:49 +08:00
repository.rb first commit 2013-08-01 10:33:49 +08:00
role.rb first commit 2013-08-01 10:33:49 +08:00
setting.rb first commit 2013-08-01 10:33:49 +08:00
share.rb 添加分享按钮 2013-08-03 20:09:04 +08:00
students_for_course.rb new version 2013-09-12 10:41:15 +08:00
teacher.rb new version 2013-09-12 10:41:15 +08:00
time_entry.rb first commit 2013-08-01 10:33:49 +08:00
time_entry_activity.rb first commit 2013-08-01 10:33:49 +08:00
time_entry_activity_custom_field.rb first commit 2013-08-01 10:33:49 +08:00
time_entry_custom_field.rb first commit 2013-08-01 10:33:49 +08:00
time_entry_query.rb first commit 2013-08-01 10:33:49 +08:00
token.rb first commit 2013-08-01 10:33:49 +08:00
tracker.rb first commit 2013-08-01 10:33:49 +08:00
user.rb Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop 2013-09-23 20:18:03 +08:00
user_custom_field.rb first commit 2013-08-01 10:33:49 +08:00
user_extensions.rb 修改了身份 2013-09-23 09:41:36 +08:00
user_preference.rb first commit 2013-08-01 10:33:49 +08:00
user_status.rb new version 2013-09-12 10:41:15 +08:00
version.rb first commit 2013-08-01 10:33:49 +08:00
version_custom_field.rb first commit 2013-08-01 10:33:49 +08:00
watcher.rb new version 2013-09-12 10:41:15 +08:00
watchers_of_projects.rb test 2013-08-22 16:42:13 +08:00
watchers_of_user.rb test 2013-08-22 16:42:13 +08:00
wiki.rb first commit 2013-08-01 10:33:49 +08:00
wiki_content.rb first commit 2013-08-01 10:33:49 +08:00
wiki_content_observer.rb test 2013-08-22 16:42:13 +08:00
wiki_page.rb first commit 2013-08-01 10:33:49 +08:00
wiki_redirect.rb first commit 2013-08-01 10:33:49 +08:00
workflow_permission.rb first commit 2013-08-01 10:33:49 +08:00
workflow_rule.rb first commit 2013-08-01 10:33:49 +08:00
workflow_transition.rb first commit 2013-08-01 10:33:49 +08:00