Saurabh 2ca83d61ea Resolve merge conflicts from enterprise_sprint branch

2018-05-14 21:15:46 +05:30

..

academic_term

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

academic_year

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

assessment_criteria

Fixed translations and tests (#12900)

2018-02-14 17:44:06 +05:30

assessment_criteria_group

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

assessment_group

Fix travis (#11882)

2017-12-08 14:57:38 +05:30

assessment_plan

Assessment module addition (#12417)

2018-01-12 16:21:09 +05:30

assessment_plan_criteria

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

assessment_result

self.assertEqual

2018-02-28 21:13:51 +05:30

assessment_result_detail

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

assessment_result_tool

Additional fields in the instructor doctype for the academics log and minor permission changes (#12204)

2017-12-28 12:34:36 +05:30

course

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

course_assessment_criteria

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

course_schedule

renamed color field

2018-05-01 18:55:17 +05:30

course_scheduling_tool

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

education_settings

Minor fixes for the Education domain (#11758)

2017-11-28 18:04:08 +05:30

fee_category

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

fee_component

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

fee_schedule

filter students on basis of category and button to show fees

2018-02-26 19:32:26 +05:30

fee_schedule_program

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

fee_schedule_student_group

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

fee_structure

Changes in the Fee structure (#11842)

2017-12-04 19:21:50 +05:30

fees

Adding Payments View for Fees (#13939)

2018-05-07 18:20:37 +05:30

grading_scale

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

grading_scale_interval

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

guardian

Merge branch 'master' into develop

2018-03-07 13:09:07 +05:30

guardian_interest

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

guardian_student

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

instructor

set query for department based on company

2018-05-14 16:07:28 +05:30

instructor_log

Additional fields in the instructor doctype for the academics log and minor permission changes (#12204)

2017-12-28 12:34:36 +05:30

program

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

program_course

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

program_enrollment

[Fix] make PE unique for the combination of academic year and academic term (#12214)

2017-12-28 12:29:11 +05:30

program_enrollment_course

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

program_enrollment_fee

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

program_enrollment_tool

Fixed merge conflict

2018-04-04 11:40:16 +05:30

program_enrollment_tool_student

Fix + Enhancement in Program Enrollment Tool (#12291)

2018-01-05 12:42:39 +05:30

program_fee

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

room

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

school_house

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

student

Student Account Ledger Button (#13591)

2018-04-24 12:12:11 +05:30

student_admission

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

student_admission_program

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

student_applicant

Fix + Enhancement in Program Enrollment Tool (#12291)

2018-01-05 12:42:39 +05:30

student_attendance

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

student_attendance_tool

Travis fix for client side tests (#12224)

2017-12-29 14:04:46 +05:30

student_batch_name

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

student_category

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

student_group

resolved merge conflicts

2018-04-24 11:16:13 +05:30

student_group_creation_tool

Additional fields in the instructor doctype for the academics log and minor permission changes (#12204)

2017-12-28 12:34:36 +05:30

student_group_creation_tool_course

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

student_group_instructor

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

student_group_student

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

student_guardian

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

student_language

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

student_leave_application

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

student_log

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

student_report_generation_tool

[minor] fix for the student report card

2018-05-08 12:39:02 +05:30

student_sibling

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

student_siblings

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30

__init__.py

Rename schools to Education (#11524)

2017-11-23 15:22:10 +05:30