Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,063 Commits 1 Branch 0 Tags
344ff8c1bcfdbbfdb7d1dd7e5d6ecce31b2cbbe6
Commit Graph

32063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Christina Roberts
4e9b7ea9ec Merge pull request #9235 from edx/christina/tnl-1776 
Handle case of video in a content library with no transcripts.
 2015-08-10 10:08:52 -04:00
Davorin Šego
7da0864997 Merge pull request #9110 from edx/dsego/SOL-611 
Remove signal_handler conditionals in BulkOperationMixin
 2015-08-10 15:50:07 +02:00
Mushtaq Ali
f4aa92f0aa Merge pull request #9229 from edx/mushtaq/tnl-2882-fix-ie10-group-config-bug 
Fix IE10 issue with delete button.
 2015-08-10 17:48:59 +05:00
tasawernawaz
96779dfe52 Merge pull request #9214 from edx/tasawer/bugfix/ecom-1987-fixing-validation-error-in-minimum-grade 
Fixing course settings page for change in minimum grade
 2015-08-10 12:41:18 +05:00
Carson Gee
cb678b9c35 Merge pull request #8979 from mitocw/feature/cg/lti_provider_config 
Additional configuration options for LTI provider feature.
 2015-08-09 09:10:14 -04:00
Andy Armstrong
0d730f373f Merge pull request #9239 from edx/andya/lms-performance-fixes 
Separate out the Backbone image field
 2015-08-08 12:44:56 -04:00
Andy Armstrong
420696ba80 Separate out the Backbone image field 2015-08-08 09:43:20 -04:00
Peter Fogg
42e78463a7 Revert "Merge pull request #8986 from jazkarta/remove-ccx-enrollment" 
This reverts commit 53db053c18, reversing
changes made to 386a8a27dd.
 2015-08-07 16:59:56 -04:00
Peter Fogg
440c1575e0 Revert "Merge pull request #9241 from mitocw/bdero/readd-ccx-membership-model" 
This reverts commit d80e83649a, reversing
changes made to fb5506a6f7.
 2015-08-07 16:59:50 -04:00
Sarina Canelake
99dea49d15 Merge pull request #9243 from stvstnfrd/upstream-branding 
Remove Stanford branding from external_auth view
 2015-08-07 16:51:11 -04:00
Sarina Canelake
c1d9f731a1 Merge pull request #9242 from edx/sarina/update-i18n-tools 
Update i18n-tools [LOC-88]
 2015-08-07 16:49:01 -04:00
stv
d7c87221da Remove Stanford branding from external_auth view 
We're already running a version of this, with the default Stanford
address removed, so the community shouldn't be running it either.
 2015-08-07 12:50:25 -07:00
Sarina Canelake
7d0cde60f4 Update i18n-tools [LOC-88] 2015-08-07 15:45:21 -04:00
Peter Fogg
d80e83649a Merge pull request #9241 from mitocw/bdero/readd-ccx-membership-model 
Readd CcxMembership model for migration
 2015-08-07 15:44:12 -04:00
Brandon DeRosier
235c45f1fb Add the CcxMembership model back 2015-08-07 15:38:25 -04:00
Clinton Blackburn
fb5506a6f7 Merge pull request #9238 from edx/renzo/info-logging 
Emit INFO-level messages when a mode does not have a SKU
 2015-08-07 15:29:31 -04:00
Ahsan Ulhaq
3efbc369dd Merge pull request #9236 from edx/ahsan/Update-reverification-block 
Update edx reverification block on plateform
 2015-08-07 23:26:34 +05:00
Renzo Lucioni
3a735591d1 Emit INFO-level messages when a mode does not have a SKU 2015-08-07 14:11:42 -04:00