Commit Graph

32082 Commits

Author SHA1 Message Date
Peter Fogg
eafb07552a Merge pull request #9287 from edx/release
Release
2015-08-12 13:06:39 -04:00
Will Daly
5b9b0a8339 Merge pull request #9240 from edx/will/ecom-1781-rebase
Support team UI for regenerating certificates
2015-08-12 09:09:06 -07:00
Peter Fogg
986564c45b Merge pull request #9275 from edx/hotfix/2015-08-11
Hotfix/2015 08 11
2015-08-12 11:40:42 -04:00
Will Daly
ad9d9eb04e Support team UI for regenerating certificates
* Add new role for support staff.
* Move dashboard/support functionality into a new Django app called "support".
* Add support view for searching and regenerating certificates.
* Refactor certificates views into separate files.
2015-08-12 07:09:46 -07:00
Arbab Nazar
330ef94e1e Merge pull request #9182 from edx/arbab/whitelist-text-change
updated the help text for cert_whitelist
2015-08-12 12:28:04 +05:00
Peter Fogg
625781288a Merge pull request #9279 from edx/hotfix/2015-08-11-b
Revert "Optimize OpenID Course Claims for non-global-staff users."
2015-08-11 18:17:55 -04:00
Peter Fogg
f84bc9f1b3 Merge pull request #9280 from edx/waheed/revert-tnl-2686-fix
Revert "Test library failed to export after import"
2015-08-11 18:17:41 -04:00
Dennis Jen
72e6b8aaeb Revert "Optimize OpenID Course Claims for non-global-staff users."
This reverts commit f0d1772da3.
2015-08-11 17:06:22 -04:00
Waheed Ahmed
aff849281d Revert "Test library failed to export after import"
This reverts commit 4c1c4619f0.
2015-08-12 02:06:09 +05:00
Clinton Blackburn
26d9b659fc Merge pull request #9227 from edx/clintonb/credit-course-api
Added API endpoints for CreditCourse
2015-08-11 16:51:07 -04:00
Clinton Blackburn
58865ee0a8 Added API endpoints for CreditCourse
Endpoints support create, read, and list operations.

NOTE: This commit also includes a retrofitted SimpleRouter that supports overriding the lookup regex. This retrofit is simpler to implement than updating edx-ora2 which is pinned to DRF 2.3.x.

XCOM-524
2015-08-11 15:44:37 -04:00
Sarina Canelake
eda45d37f2 Merge pull request #9192 from edx/sarina/fix-i18n
Add more context to translation strings
2015-08-11 14:11:07 -04:00
Peter Fogg
7fb9c331fd Merge pull request #9274 from mitocw/patch/2015-08-11
Patch/2015 08 11
2015-08-11 13:52:12 -04:00
clrux
98bd1d39ef Merge pull request #9152 from edx/clrux/ux-2233-video-bumper
Updating the video bumper play button
2015-08-11 13:45:52 -04:00
Sarina Canelake
71d5180ba1 Add more context to translation strings 2015-08-11 13:11:32 -04:00
Brandon DeRosier
912db9910f Fix CCX 0002 migration
(cherry picked from commit 558b93fdeaaf72d02e050808698b2015e123a01c)
2015-08-11 13:04:09 -04:00
Brandon DeRosier
34526ddf6a Revert "Revert "Merge pull request #8986 from jazkarta/remove-ccx-enrollment""
This reverts commit 42e78463a7.
2015-08-11 13:03:58 -04:00
Chris Rodriguez
f958272149 Updating video bumper play button 2015-08-11 12:51:18 -04:00
Peter Fogg
344ff8c1bc Merge pull request #9267 from edx/release
2015-08-11 release
2015-08-11 12:07:21 -04:00
Matt Drayer
2b93e246f3 Merge pull request #9266 from edx/asadiqbal08/SOL-1118
asadiqbal08/SOL-1118: Use correct course number in web certificate
2015-08-11 11:06:28 -04:00
Peter Fogg
5b4d070259 Merge pull request #9234 from edx/rc/2015-08-10
rc/2015-08-10
2015-08-11 10:37:25 -04:00
Akiva Leffert
ba03081320 Merge pull request #9260 from edx/aleffert/start-date-error
Show vaguer error message if using default start date
2015-08-11 10:28:44 -04:00
asadiqbal
8269bf5f1f SOL-1118 2015-08-11 19:25:23 +05:00
Usman Khalid
1de9fc6461 Merge pull request #9200 from edx/usman/tnl1911-my-teams
My teams tab.
2015-08-11 19:22:50 +05:00
Usman Khalid
b4ed9a28b0 My Teams tab.
TNL-1911
2015-08-11 17:27:53 +05:00
clrux
bf0dddfef6 Merge pull request #9106 from edx/clrux/ux-2534-css-cleanup
Style simplification to sync up styles
2015-08-11 07:58:54 -04:00
Chris Rodriguez
b08a8f7e7f Style simplification to sync up styles 2015-08-11 06:56:39 -04:00
Waheed Ahmed
d6dab577a8 Merge pull request #9202 from edx/waheed/plat776-fix-course-id-regex
Fixed course_id pattern regex.
2015-08-11 15:56:19 +05:00
Sven Marnach
1ba82819bc Merge pull request #9208 from open-craft/smarnach/course-masquerade-session-fix
Make new masquerading code compatible to existing session data.
2015-08-11 11:41:03 +02:00
Sven Marnach
55ace6baa8 Make new masquerading code compatible to existing session data.
The new masquerading code introduced in PR #8775 adds a new attribute to
CourseMasquerade objects stored in the user's session.  When users who have
active masquerading configuration access instances with the new code, and
AttributeError occurs when trying to access the attribute user_name.

This fix ensures that CourseMasquerade objects receive all required attributes
when they are unpickled from the session.
2015-08-11 10:47:25 +02:00
Waheed Ahmed
5e2c2b1e93 Fixed course_id pattern regex.
PLAT-776
2015-08-11 13:36:07 +05:00
Peter Fogg
9f58f656de Merge pull request #9261 from edx/peter-fogg/test-rc-fix
Test Cale's RC fix.
2015-08-10 22:08:42 -04:00
Peter Fogg
a6891609be Test Cale's RC fix. 2015-08-10 19:36:32 -04:00
Kevin Falcone
891dab621f Merge pull request #9141 from Stanford-Online/aliang8/devstack-https
Deactivate HTTPS on devstack
2015-08-10 17:29:05 -04:00
Akiva Leffert
2632fd7ecd Show vaguer error message if using default start date 2015-08-10 17:26:36 -04:00
Peter Fogg
25537da0c4 Merge pull request #9256 from cpennington/fix-user-state-client
Fix user state client
2015-08-10 16:59:38 -04:00
David Baumgold
026c7edf32 Merge pull request #9252 from edx/no-studio-short-name-in-lms
settings.STUDIO_SHORT_NAME doesn't exist in LMS
2015-08-10 15:39:53 -04:00
Calen Pennington
584453202f Use the correct attribute when accessing StudentModuleHistory creation dates 2015-08-10 14:56:03 -04:00
Calen Pennington
34892b9680 Add more information when logging data about differing history and score entries 2015-08-10 14:56:03 -04:00
Calen Pennington
93b1b69854 Don't violate the empty-dict vs None semantics of student_module during delete_many 2015-08-10 14:42:18 -04:00
Nimisha Asthagiri
7e1de6ef2d Merge pull request #9090 from edx/kyle/course-overviews-race-fix
MA-1061 Fix IntegrityError caused by race condition in CourseOverview.get_from_id
2015-08-10 14:29:41 -04:00
David Baumgold
d502987c5f Merge pull request #9253 from edx/studio-short-name-bugfix
settings.STUDIO_SHORT_NAME doesn't exist in LMS
2015-08-10 13:38:28 -04:00
Ned Batchelder
86ad26e960 Merge pull request #9254 from edx/ned/update-staticfiles
Update the version of django-staticfiles
2015-08-10 13:06:22 -04:00
Diana Huang
cea274dc52 Merge pull request #8724 from Colin-Fredericks/ColinF-partial-credit
OSPR-535 Partial Credit
2015-08-10 13:04:30 -04:00
Ned Batchelder
ba8fd8f082 Update the version of django-staticfiles
This gets us:

- Static files can have non-ASCII characters in them.
- A useful log message if a file can't be found.
2015-08-10 12:08:53 -04:00
Matt Drayer
02cf9caca6 Merge pull request #8958 from edx/mattdrayer/SOL-981
mattdrayer/SOL-981: Integrate edx-organizations application
2015-08-10 11:51:36 -04:00
Colin-Fredericks
c940814c8c OSPR-535 Partial Credit
Squashed commit of the following:

commit 0f7c2af5f7b8caed575dd253a45299293b2729d7
Author: Colin-Fredericks <colin.fredericks@gmail.com>
Date:   Tue Jun 30 12:04:43 2015 -0400

    Forgot icon

commit b48970392741130f774709c54eb6e5ab0089812c
Author: Colin-Fredericks <colin.fredericks@gmail.com>
Date:   Tue Jun 30 11:49:57 2015 -0400

    OSPR-535 Partial Credit

    Squashed commit of the following:

    commit 6dd34f58f994e32d0d54bf1d67bffd04e0f8ef08
    Author: Colin-Fredericks <cof945@dhcp-140-247-184-176.fas.harvard.edu>
    Date:   Tue Jun 30 11:44:01 2015 -0400

        Fixing accidental overwrite.

    commit 1ff8fc4b0e83b90356e8e8dce1022f49bfd162cf
    Author: Colin-Fredericks <cof945@dhcp-140-247-184-176.fas.harvard.edu>
    Date:   Tue Jun 30 11:18:36 2015 -0400

        OSPR-535 Partial Credit

        Revised after first pull discussion.

Fixing scss typos

Fixing check/x display problem

Empty set is not []

Shuffling empty answer code to grade properly.

I don't think I ever wrote this in the first place...

Adding tests for MC and Checkbox

including proper partial-credit marking and scoring

Numerical and OptionResponse tests

Also a few improvements to NumericalResponse problem type and
exception-raising.

CustomResponse tests and more numerical tests

Increasing coverage and fixing typos

Exception added for pylint false positive

Hopefully fixing coverage issue

Retabulating line continuation

Bok Choy test for partial credit

Copypasta fix

Adding tooltip for partial credit

Improving and expanding comments

Minor fixes
2015-08-10 10:58:50 -04:00
David Baumgold
5953debee1 settings.STUDIO_SHORT_NAME doesn't exist in LMS 2015-08-10 10:45:09 -04:00
David Baumgold
8daf2a7854 settings.STUDIO_SHORT_NAME doesn't exist in LMS 2015-08-10 10:40:40 -04:00
Matt Drayer
e1ee5ac6df mattdrayer/SOL-981: Integrate edx-organizations application
* asadiqbal08/SOL-1058: Add edx-organizations to certificate web view
  * Support organization logo asset management
  * Remove organization fields from Studio certificate configuration model

* SOL-981 pull request feedback fixes
2015-08-10 10:29:45 -04:00