7 Commits

Author	SHA1	Message	Date
Nabin Hait	fa06ee80e9	Fixed merge conflict	2018-07-27 12:54:00 +05:30
Nabin Hait	d0a2b1619b	Optimization for marking student attendance	2018-07-27 10:51:55 +05:30
Shreya	fd47b92138	renamed color field	2018-05-01 18:55:17 +05:30
Shreya	4c8a08effb	color field for calendar in course schedule	2018-05-01 18:54:20 +05:30
Nabin Hait	e6d65bc2a1	Fixed translations and tests (#12900) ... * Fixed translations and tests * minor fixes * minor test fixes	2018-02-14 17:44:06 +05:30
Manas Solanki	8985077652	Assessment Module Report (#12605) ... * updated course wise assessment report * added new report Final assessment grades	2018-01-26 11:20:33 +05:30
Manas Solanki	966f141f62	Rename schools to Education (#11524) ... * renaming for the docs, demo data and patch * changes in the doctypes and reports * rename the config file * Few name changes in messages and license * rename the school settings to education settings * changes in the documentation * added the setup file for the fixtures * corrected the ui tests file path * fix the codacy * add the patch for renaming few doctypes and fields * changes in the patch	2017-11-23 15:22:10 +05:30