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

11685 Commits

Author SHA1 Message Date
cahrens
c929cdb54d Add an additional test case related to re-fetching data. 2015-08-14 14:48:09 -04:00
Andy Armstrong
1265d540ad Merge pull request #9302 from edx/andya/team-refresh-handling 
Implement model refreshing for Teams tab
 2015-08-14 11:50:54 -04:00
cahrens
c84abfab40 Bok choy tests for dynamic updating after team changes. 2015-08-14 11:12:11 -04:00
Andy Armstrong
a24e3cb0fc Implement model refreshing for Teams tab 
TNL-2976
 2015-08-14 11:12:11 -04:00
Adam
460b3311b2 Merge pull request #9273 from edx/adam/add-lti-logging 
add more lti logging around oauth (TNL-2980)
 2015-08-14 08:53:21 -04:00
chrisndodge
460a4b5f99 Merge pull request #9069 from edx/cdodge/proctoring-lms-integration 
Integration of Proctoring into the LMS
 2015-08-14 07:18:14 -04:00
frances botsford
8da4fcbbcb Merge pull request #9309 from edx/frances/teams-style-fixes 
Teams cards list spacing
 2015-08-13 23:01:32 -04:00
Christina Roberts
4fc2ae7ca8 Merge pull request #9312 from edx/diana/remove-invite-link 
Remove invite link functionality from teams.
 2015-08-13 20:02:53 -04:00
Chris Dodge
6cf5516a84 Integration of edx_proctoring into the LMS 2015-08-13 19:08:50 -04:00
Diana Huang
afa587cc38 Remove invite link functionality from teams. 
TNL-3062
 2015-08-13 17:53:26 -04:00
Andy Armstrong
01065b6ae5 Merge pull request #9217 from edx/andya/land-teams 
Enable teams and deprecate the advanced setting
 2015-08-13 17:47:15 -04:00
Frances Botsford
70a14ffe91 remove list margin and padding on cards lists 2015-08-13 16:44:31 -04:00
Diana Huang
2ac1590df4 Merge pull request #9276 from edx/diana/update-status-message 
Make status use ConfigurationModel instead.
 2015-08-13 16:37:23 -04:00
Usman Khalid
f785ae465f Merge pull request #9228 from edx/muzaffar/tnl1906-team-profile 
Team profile page sidebar.
 2015-08-13 22:07:01 +05:00
muhammad-ammar
5fc612079b Support leaving a team 
TNL-1910
 2015-08-13 20:27:38 +05:00
Matt Drayer
f8f23240da Merge pull request #8996 from edx/ziafazal/SOL-1044 
ziafazal/SOL-1044: Custom Web Certificates
 2015-08-13 10:05:40 -04:00
Zia Fazal
2467d6971f ziafazal/SOL-1044: Database-Driven Certificate Templates 
* added certificate template model
* added certificate template asset model
* added django admin configs and migration
* initial LMS template matching logic
* improved LMS template matching
* improved LMS template matching and rendering logic
* address Django admin form/model load order incongruence
* add missing unique constraint migration.
 2015-08-13 08:01:34 -04:00
muhammad-ammar
853f97afbc support joining a team 
TNL-1909
 2015-08-13 14:41:21 +05:00
muzaffaryousaf
a56e6bf743 Team details page. 
TNL-1906
 2015-08-13 14:20:07 +05:00
Peter Fogg
26bbbb967e Fix various team accessibility issues. 
Authors:
  - Peter Fogg
  - Daniel Friedman

TNL-1953
 2015-08-13 00:34:54 -04:00
Andy Armstrong
8bbf7c57ac Improve Teams tab navigation 2015-08-12 19:20:48 -04:00
Peter Fogg
eafb07552a Merge pull request #9287 from edx/release 
Release
 2015-08-12 13:06:39 -04:00
Adam Palay
c486eadd87 add more lti logging around oauth (TNL-2980) 2015-08-12 10:10:29 -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
Diana Huang
82eb1f6b74 Make status use ConfigurationModel instead. 2015-08-11 17:51:39 -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
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
Andy Armstrong
e845dda8b0 Enable teams and deprecate the advanced setting 2015-08-07 10:35:19 -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