Commits · 175f59b4b7aa0d2ff00611ea34d435bf38e011ee · edx / edx-platform

14 Nov, 2013 1 commit

fixes Edit Course In Studio link on instr dash (LMS-1455) · 175f59b4

add DOC_STORE_CONFIG to test settings

Conflicts:
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/tests/test_courses.py
	lms/djangoapps/instructor/views/instructor_dashboard.py

committed Nov 13, 2013

175f59b4 Browse Files

12 Nov, 2013 1 commit
- remove $ sign from activation email · debbed56
  Giulio Gratta committed Nov 11, 2013
  
  debbed56 Browse Files
08 Nov, 2013 8 commits
- Merge pull request #1636 from edx/jbau/fix/git-middleware · 7544ec53
```
make edxapp work when not run from a git repo
```
  Jason Bau committed Nov 08, 2013
  7544ec53 Browse Files
- make edxapp work when not run from a git repo · c8f5b2df
  Jason Bau committed Nov 08, 2013
  
  c8f5b2df Browse Files
- Merge pull request #1633 from edx/dcadams/fix_metrics_tab · d8c38b63
```
**Stanford Hotfix do not pull into master: metrics tab 500
```
  dcadams committed Nov 08, 2013
  d8c38b63 Browse Files
- Merge pull request #1632 from edx/jrbl/edx-west/hotfix-badmergetags · 2dd360cd
```
Stanford bad merge tag fix
```
  Joe Blaylock committed Nov 08, 2013
  2dd360cd Browse Files
- Merge pull request #1631 from edx/jbau/fix-password-reset · e4510728
```
fix edx-west password_reset
```
  Jason Bau committed Nov 08, 2013
  e4510728 Browse Files
- fix edx-west password_reset · 16379a59
  Jason Bau committed Nov 08, 2013
  
  16379a59 Browse Files
- Stanford bad merge tag fix · b8163856
  Joe Blaylock committed Nov 08, 2013
  
  b8163856 Browse Files
- **Stanford Hotfix do not pull into master: metrics tab 500 · e9ef3480
  David Adams committed Nov 08, 2013
  
  e9ef3480 Browse Files
07 Nov, 2013 1 commit
- Fix unicode issue in class_dashboard. · 89a4baae
  David Adams committed Nov 06, 2013
  
  89a4baae Browse Files
01 Nov, 2013 5 commits

Fix bad merge commit · 0dea8326
Joe Blaylock committed Nov 01, 2013

0dea8326 Browse Files
add error handling for update_score for OEE when no child_history · 290e8641
Jason Bau committed Nov 01, 2013

290e8641 Browse Files

Temporary fix of 'Check' to 'Submit' · 69d6119d

When the text_customization advanced setting  gets fixed in master,
we can take this out and instead set the button title via
advanced settings.

committed Nov 01, 2013

69d6119d Browse Files

Merge remote-tracking branch 'origin/release' into edx-west/rc-10292013 · 268c1477
```
Manual update, "Certificate" -> "Statement of Accomplishment"

Conflicts:
	lms/templates/dashboard/dashboard_course_listing.html
```
Joe Blaylock committed Nov 01, 2013
268c1477 Browse Files

Merge remote-tracking branch 'origin/release' into edx-west/rc-10292013 · 84afb46b

Giulio Gratta <giulio@giuliogratta.com> merged LMS HTML template files by
hand.

Joe Blaylock <jrbl@stanford.edu> merged the rest of the conflicts, which
included:
	common/djangoapps/student/views.py
	common/djangoapps/track/views.py
	common/lib/xmodule/xmodule/capa_module.py
	lms/djangoapps/courseware/tests/test_courses.py
	lms/djangoapps/instructor/views/legacy.py
	lms/envs/common.py
	lms/envs/test.py

committed Nov 01, 2013

84afb46b Browse Files

31 Oct, 2013 1 commit
- Merge pull request #1562 from edx/hotfix-2013-10-31 · 6aa5d2cc
```
Hotfix 2013 10 31
```
  Sarina Canelake committed Oct 31, 2013
  6aa5d2cc Browse Files
30 Oct, 2013 22 commits
- Merge pull request #1541 from cpennington/hotfix-conditional-course-id-access · c89c85c7
```
Provide access to the course_id directly on XModules/Descriptors
```
  Sarina Canelake committed Oct 30, 2013
  c89c85c7 Browse Files
- Merge pull request #1538 from edx/diana/certs-upgrade-path · 16f5e919
```
Add upsell for verified certs on the dashboard.
```
  Diana Huang committed Oct 30, 2013
  16f5e919 Browse Files
- Provide access to the course_id directly on XModules/Descriptors · 32af903f
```
Fixes [BLD-456] and [LMS-1392], but making sure that we're always asking
XModules about their course_id (since the ModuleSystem has access to
that data).
```
  Calen Pennington committed Oct 30, 2013
  32af903f Browse Files
- Update upsell copy. · 42a63310
```
LMS-1127
```
  Diana Huang committed Oct 30, 2013
  42a63310 Browse Files
- Fix acceptance tests · 9c362eac
```
LMS-1127
```
  Diana Huang committed Oct 30, 2013
  9c362eac Browse Files
- Make sure the correct mode is chosen during upgrade · 5b10e016
```
LMS-1127
```
  Diana Huang committed Oct 30, 2013
  5b10e016 Browse Files
- LMS: adds verifiied track visuals to upgrade UI on dashboard · d68b2ced
  Brian Talbot committed Oct 30, 2013
  
  d68b2ced Browse Files
- LMS: revises verified track upgrade UI on dashboard · 60386395
  Brian Talbot committed Oct 30, 2013
  
  60386395 Browse Files
- LMS: adds conditional content/instructions for registration upgrade flow · 8442f6e0
  Brian Talbot committed Oct 30, 2013
  
  8442f6e0 Browse Files
- Better handling of the expiration date. · e5039700
```
LMS-1127
```
  Diana Huang committed Oct 30, 2013
  e5039700 Browse Files
- LMS: resolves styling issues for button UI in verification flows · ae6ec926
  Brian Talbot committed Oct 30, 2013
  
  ae6ec926 Browse Files
- Fix up acceptance tests for upsell. · c13d965f
```
LMS-1127
```
  Diana Huang committed Oct 30, 2013
  c13d965f Browse Files
- Move more logic into the views · aae13c58
```
Also includes some tests

Story: LMS-1127
```
  Diana Huang committed Oct 30, 2013
  aae13c58 Browse Files
- LMS: adds in UI and styling for verified track upgrade to dashboard view · baa73f0a
  Brian Talbot committed Oct 30, 2013
  
  baa73f0a Browse Files
- LMS: revises styling/placement of message for verified status on dashboard · 7a1a69b9
  Brian Talbot committed Oct 30, 2013
  
  7a1a69b9 Browse Files
- Add new acceptance test for complete upgrade flow · 607deb01
  Diana Huang committed Oct 30, 2013
  
  607deb01 Browse Files
- Fixed LMS-1062 · 19c21d20
  Julia Hansbrough committed Oct 30, 2013
  
  19c21d20 Browse Files
- LMS: preps track selection view for upgrade cases · c1ab324d
  Brian Talbot committed Oct 30, 2013
  
  c1ab324d Browse Files
- LMS: preps track selection view for upgrade cases · c42bff65
  Brian Talbot committed Oct 30, 2013
  
  c42bff65 Browse Files
- Add acceptance tests. · 349573dc
  Diana Huang committed Oct 30, 2013
  
  349573dc Browse Files
- Add in new hooks for the dashboard into the upgrade path. · 56f67112
  Diana Huang committed Oct 30, 2013
  
  56f67112 Browse Files
- Add an upgrade parameter to the verification views. · ebd63b61
  Diana Huang committed Oct 30, 2013
  
  ebd63b61 Browse Files
28 Oct, 2013 1 commit
- Merge pull request #1524 from edx/rc-peer-linking · 2428b3ca
```
Ensure that peer grading modules whose linked problem is removed change ...
```
  brianhw committed Oct 28, 2013
  2428b3ca Browse Files