Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into... (206b1e26) · Commits · Hsin-Yu Chien / edx-platform-release · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

edx-platform-release
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Package Registry
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

code.vt.edu will be down for maintenance from 0530-0630 EDT Wednesday, March 26th

206b1e26

Commit 206b1e26 authored 12 years ago by

Chris Dodge

Downloads
- Plain Diff

Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into...

Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info

parents b7c830a8 55011470

Branches

Tags

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

cms/djangoapps/contentstore/views.py 7 additions, 4 deletions

cms/djangoapps/contentstore/views.py
cms/static/coffee/src/models/module.coffee 0 additions, 4 deletions

cms/static/coffee/src/models/module.coffee
cms/static/js/base.js 7 additions, 10 deletions

cms/static/js/base.js
cms/templates/login.html 1 addition, 1 deletion

cms/templates/login.html
common/static/js/vendor/jquery.ba-bbq.min.js 18 additions, 0 deletions

common/static/js/vendor/jquery.ba-bbq.min.js
lms/envs/common.py 1 addition, 0 deletions

lms/envs/common.py
lms/templates/university_profile/edge.html 18 additions, 13 deletions

lms/templates/university_profile/edge.html

with 52 additions and 32 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment