20130905

delete_all_data
201309051810

1.權限判斷修正，getStatusLevel的return statusLevel（0~3）
2.「新增數據」，第二個「失誤」label改成「犯規」
3.「新增、編輯球員」，按取消後回到上一頁
4.「新增、編輯記錄」，按取消後回到上一頁
201309051837

1.「刪除球員」，刪除後回到球員清單
2.修正「球員清單」中的新增球員、新增賽事無法帶tid
3.修正刪除「記錄」後轉址失效
4.修正從「修改資料」無法回到「我的球隊」連結
Merge branch 'linkbug' into Eric
Merge branch 'Eric' into develop
201309051842

胖子修正錯誤連結
20130905
Merge branch 'Andy' of https://github.com/nt46/Imagic into Andy

Conflicts:
	db/development.sqlite3
	log/development.log
201309051855

1.「賽事紀錄」，修正無編輯權限時，點選檢視連結錯誤
2.「單場紀錄」(Record.index)，「返回按鈕」，若未登入修正為:back,有登入則反回賽事紀錄首頁
201309061249

1.賽事記錄，命中率顯示修正
2.權限修正
Merge branch 'Eric' into develop
201309061432

圖片縮圖
圖片上傳
搜尋
201309061444

搜尋可以英文＋中文
20130906

1.修正Game權限(new,edit,update)
2.修正Record權限(new,edit,update)
3.修正Player權限(new,edit,update)
Merge branch 'statusLevel' into Eric
Merge branch 'Eric' into develop
Merge branch 'Andy' into develop
Merge branch 'develop' of https://github.com/nt46/Imagic into develop

Conflicts:
	app/controllers/records_controller.rb
	app/controllers/team_users_controller.rb
	app/views/team_users/_carousel.html.erb
	db/development.sqlite3
	log/development.log
	tmp/pids/server.pid
201309100232

Facebook welldone & merge completed
Merge branch 'develop' into Rogi