Commit Graph

11661 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
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
Waheed Ahmed
aff849281d Revert "Test library failed to export after import"
This reverts commit 4c1c4619f0.
2015-08-12 02:06:09 +05: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
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
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
Waheed Ahmed
5e2c2b1e93 Fixed course_id pattern regex.
PLAT-776
2015-08-11 13:36:07 +05: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
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
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
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
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
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
cahrens
2b57603436 Handle case of video in a content library with no transcripts.
This partially addresses TNL-1776
2015-08-07 13:19:12 -04:00
Awais Jibran
7bf81195ad Strip aways slashes from the asset 'displayname' as they cause export to fail.
TNL-2669
2015-08-07 18:10:26 +05:00
Davorin Sego
0d4f602e33 pep8 2015-08-06 22:35:44 +02:00
Davorin Sego
d06e16d953 Initialize signal handler, so we can remove getattr 2015-08-06 22:06:56 +02:00
Peter Fogg
e0e895a531 Add Bok Choy tests for teams page URL routing. 2015-08-06 13:32:48 -04:00
Peter Fogg
2f7fa6fd8b Enforce discussions permissions in teams UI.
Adds a read-only mode to the discussion module which disables any
controls for updating the discussion (votes, follows, replies,
etc). This mode is enabled for users who are not a member of the team,
and are also not moderators, admins, or community TAs.
2015-08-06 11:15:56 -04:00
Marco Morales
dd67f8aa72 updated inline discussion styling to account for lack of expand / show message (which was being relied on for layout) and also removed issues of generic pagination styling impacting the older inline discussion pagination pattern with a class renaming 2015-08-06 11:15:55 -04:00
Andy Armstrong
63da1907eb Show inline discussion component on Team view
TNL-2515
2015-08-06 11:15:55 -04:00
Ben Patterson
c4eed7bbc2 Merge pull request #9196 from edx/benp/bok-choy-shard-7
Benp/bok choy shard 7
2015-08-06 07:27:56 -04:00
Syed Hassan Raza
4c1c4619f0 Test library failed to export after import 2015-08-05 12:47:27 -07:00
Ben Patterson
92c9c1d529 New bok-choy shard (#7). 2015-08-05 13:52:39 -04:00
Nimisha Asthagiri
73810f6a23 Merge pull request #8888 from edx/mobile/MA-977-supports
MA-977 Use "supports" decorator on XBlocks for multi-device support
2015-08-05 12:29:25 -04:00
Nimisha Asthagiri
5a44f391b0 MA-977 Use "supports" decorator on XBlocks for multi-device support 2015-08-05 11:37:33 -04:00
muhammad-ammar
69450fce47 create a new team
TNL-1899
2015-08-05 17:55:26 +05:00
Ned Batchelder
ff243eaa70 Merge pull request #9187 from edx/release
Release merge to master
2015-08-04 14:18:50 -04:00
Awais Jibran
6d16da7339 Merge pull request #9015 from edx/aj/tnl2857-mathjax-probelm-in-problem-hints
Fixed MathJax rendering in problem hint
2015-08-04 23:12:03 +05:00
Awais Jibran
99cd48c858 Merge pull request #9179 from edx/aj/tnl2855-depricated-blocks-in-edge
Fixed ORA1 deprecated warning message
2015-08-04 23:09:00 +05:00
Ned Batchelder
ceb5655b2d Merge pull request #9171 from edx/ned/update-pylint
Update pylint and astroid, reduces pylint count by 400
2015-08-04 09:28:35 -04:00
Awais Jibran
1ac90573ae Fixed ORA1 deprecated warning message when a component does not have a display_name
TNL-2855
2015-08-04 18:18:18 +05:00
Ned Batchelder
f54fe787c6 Remove needless 'disable=no-member' pragmas 2015-08-03 17:47:44 -04:00
Jim Abramson
0e3be9de80 Merge pull request #9123 from edx/jsa/xcom-442
Add historical course enrollment table.
2015-08-03 17:06:24 -04:00
Ned Batchelder
ee0f4b2594 Remove 'pylint: disable=no-value-for-parameter' that we no longer need. 2015-08-03 15:44:29 -04:00
Peter Pinch
53db053c18 Merge pull request #8986 from jazkarta/remove-ccx-enrollment
Use the standard enrollment table instead of a custom CCX table for CCX enrollments
2015-08-03 13:18:41 -04:00
Marco Morales
25ff53539d Merge pull request #9168 from edx/marco/TNL-2946/capa/styling-fixes
Capa Styling Fixes for Annotation Problems
2015-08-03 11:50:05 -04:00
Will Daly
eaeb3256ab Merge pull request #9158 from edx/release
Merging hotfix 2015-07-30 release back to master
2015-08-03 08:42:28 -07:00
Marco Morales
90fcf4646a adds back in correct and incorrect styling for annotations problems 2015-08-03 10:57:31 -04:00
Andy Armstrong
d98354d05d Merge pull request #9133 from edx/andya/remove-mustache-from-discussions
Remove Mustache usage from discussions
2015-08-01 20:48:50 -04:00
Andy Armstrong
540e8464d9 Remove Mustache usage from discussions 2015-08-01 17:13:14 -04:00
Carlos de la Guardia
458ed0a64e Use the standard enrollment table instead of a custom CCX table for CCX
enrollments.

The goal for this PR is to have a single mechanism for registering users and
reducing the number of places where special-casing for ccx courses is needed. The
migration at this point is purposefully limited to convert ccx memberships into
student enrollments when moving forward. No backward migration is in place at the
moment. The ccx membership tables are not removed at this time. It is possible to go
backwards and forwards multiple times with no errors or data loss.
2015-08-01 02:59:10 -05:00
Andy Armstrong
96e14e3f8b Fix forums escaping bug
TNL-2919
2015-07-31 19:40:04 -04:00
aamir-khan
f286152f5a ECOM-1947: updated the middleware to exclude the password strings from event logging 2015-07-31 15:51:42 -04:00
Christina Roberts
b06e46c1db Merge pull request #9113 from edx/christina/team-discussion-permissions
Christina/team discussion permissions
2015-07-31 12:32:30 -04:00