Merge remote-tracking branch 'origin/release/1.0'
Conflicts: common/djangoapps/student/views.py
Showing
- .gitignore 2 additions, 0 deletions.gitignore
- README 1 addition, 1 deletionREADME
- cms/templates/base.html 0 additions, 9 deletionscms/templates/base.html
- cms/templates/signup.html 7 additions, 7 deletionscms/templates/signup.html
- common/djangoapps/pipeline_mako/templates/static_content.html 20 additions, 2 deletions...on/djangoapps/pipeline_mako/templates/static_content.html
- common/djangoapps/student/management/commands/6002exportusers.py 61 additions, 0 deletions...djangoapps/student/management/commands/6002exportusers.py
- common/djangoapps/student/management/commands/6002importusers.py 66 additions, 0 deletions...djangoapps/student/management/commands/6002importusers.py
- common/djangoapps/student/migrations/0011_auto__chg_field_courseenrollment_user__del_unique_courseenrollment_use.py 14 additions, 11 deletions...courseenrollment_user__del_unique_courseenrollment_use.py
- common/djangoapps/student/migrations/0013_auto__chg_field_userprofile_meta.py 133 additions, 0 deletions...udent/migrations/0013_auto__chg_field_userprofile_meta.py
- common/djangoapps/student/migrations/0014_auto__del_courseenrollment.py 132 additions, 0 deletions...pps/student/migrations/0014_auto__del_courseenrollment.py
- common/djangoapps/student/migrations/0015_auto__add_courseenrollment__add_unique_courseenrollment_user_course_id.py 144 additions, 0 deletions...enrollment__add_unique_courseenrollment_user_course_id.py
- common/djangoapps/student/migrations/0016_auto__add_field_courseenrollment_date__chg_field_userprofile_country.py 142 additions, 0 deletions...d_courseenrollment_date__chg_field_userprofile_country.py
- common/djangoapps/student/migrations/0017_rename_date_to_created.py 133 additions, 0 deletions...ngoapps/student/migrations/0017_rename_date_to_created.py
- common/djangoapps/student/migrations/0018_auto.py 134 additions, 0 deletionscommon/djangoapps/student/migrations/0018_auto.py
- common/djangoapps/student/migrations/0019_create_approved_demographic_fields_fall_2012.py 189 additions, 0 deletions...ions/0019_create_approved_demographic_fields_fall_2012.py
- common/djangoapps/student/models.py 41 additions, 14 deletionscommon/djangoapps/student/models.py
- common/djangoapps/student/views.py 149 additions, 58 deletionscommon/djangoapps/student/views.py
- common/djangoapps/track/middleware.py 26 additions, 2 deletionscommon/djangoapps/track/middleware.py
- common/lib/xmodule/xmodule/course_module.py 8 additions, 71 deletionscommon/lib/xmodule/xmodule/course_module.py
- lms/djangoapps/courseware/courses.py 85 additions, 1 deletionlms/djangoapps/courseware/courses.py
Loading
Please register or sign in to comment