Lesson Plan - Show(revised), Edit(inc. plan approval), lesson report(inc. report review) - pending JS(some) & PDF creation
Training Note - Index
Merge pull request #185 from Nurhashimah/master

Lesson Plan - Show(revised), Edit(inc. plan approval), lesson report(inc...
#387 : Image buku yang telah dikemaskini tidak dipaparkan di Ogma App
Merge pull request #186 from Nurhashimah/master

#387 : Image buku yang telah dikemaskini tidak dipaparkan di Ogma App
Merge pull request #187 from irshad89/master

staff leave list
Staff appraisal index
staff appraisal index
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/routes.rb
Merge pull request #189 from azimadnan/master

Staff appraisal index page
Merge pull request #190 from irshad89/master

maklumat perjawatan
fixing merge errors AGAIN. rspec 1st people
update models for declerative authorization deprecation
Index Page - Student Discipline
Merge pull request #191 from Nurhashimah/master

Index Page - Student Discipline
remove unused usershelper
update current_user temp until devise is sorted
remove all traces of old user
install devise
asset loss