Commit Graph

190 Commits

Author SHA1 Message Date
Jesse Zoldak
996ce1d62c Mark TeamPageTest class as flaky TNL-3069 2015-08-14 16:07:54 -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
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
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
muhammad-ammar
5fc612079b Support leaving a team
TNL-1910
2015-08-13 20:27:38 +05: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
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
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
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
Andy Armstrong
63da1907eb Show inline discussion component on Team view
TNL-2515
2015-08-06 11:15:55 -04:00
muhammad-ammar
69450fce47 create a new team
TNL-1899
2015-08-05 17:55:26 +05: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
David Baumgold
263bcaf2fc Simplify birth_year variable 2015-07-28 16:47:03 -04:00
David Baumgold
5500603742 assertTrue should be assertEqual 2015-07-28 13:59:04 -04:00
David Baumgold
51976b0616 Minor improvements to learner profile tests 2015-07-28 13:55:49 -04:00
Braden MacDonald
5aa127a9bf Merge pull request #8995 from open-craft/masquerade-cohorts
Allow previewing cohorted content when masquerading (SOL-1064)
2015-07-26 11:18:23 -07:00
Christina Roberts
cb21756393 Merge pull request #9063 from edx/christina/tnl-231
Delete mention of direction from checkboxgroup.
2015-07-24 16:58:26 -04:00
cahrens
85b8a88152 Delete mention of direction from checkboxgroup.
It was never implemented.
TNL-231
2015-07-24 14:44:08 -04:00
Peter Fogg
c8ed59ac61 Redirect to dashboard from non-live courses.
TNL-2693
2015-07-24 13:05:47 -04:00
Awais Jibran
0cda1aaffb Fixed MathJax rendering in problem hint
TNL-2857
2015-07-24 19:07:09 +05:00
Daniel Friedman
d61d193dab Merge pull request #8859 from edx/dan-f/teams-list-view
Teams List View
2015-07-22 13:24:02 -04:00
Daniel Friedman
21b39ca467 Add teams-for-topic list view to Teams page.
TNL-1898

Also adds a generic paginated list view and Teams list view. The
common PaginatedView takes a collection and a view class for its items
and creates a header and footer with correct pagination. The topics
list view is refactored to use this generic view.

Authors:
  - Peter Fogg <pfogg@edx.org>
  - Daniel Friedman <dfriedman58@gmail.com>
2015-07-22 12:02:40 -04:00
Davorin Sego
a43cf589e0 Update edx-search, fix lms filter generator and courseware index tests 2015-07-22 16:44:01 +02:00
Braden MacDonald
0defc55b84 Allow previewing cohorted content when masquerading 2015-07-22 00:54:15 -07:00
Max Rothman
c97314413b Merge branch 'release' into release-merge-test
Conflicts:
	lms/djangoapps/commerce/urls.py
	lms/djangoapps/commerce/views.py
2015-07-17 17:42:03 -04:00
Adam
2735b2b5bb Revert "Decorated instructor dashboard with sudo_required." 2015-07-17 12:11:38 -04:00
Waheed Ahmed
bc052db1ee Added DjangoSudo functionality for instructor dashboard and course team page 2015-07-16 11:14:11 +05:00
frances botsford
2e7da1985a Merge pull request #8321 from edx/frances/lms/user-menu-cleanup
LMS User menu cleanup
2015-07-14 09:23:36 -04:00
Sarina Canelake
ba8fd1c21d Eliminate instances of unused-import Pylint violation 2015-07-13 17:33:25 -04:00
AlasdairSwan
51deec380e ECOM-1661 removed nav links for logged out states
Add context for navigation states
added find course to dashboard sidebar and included check for context that Will adds in PR
removed nav_course_search context due to design change so replaced with nav_hidden
Removed rwd_header.js and all references as no longer being used.

Wrapped Find Courses in dashboard sidebar in if statement
2015-07-13 15:33:00 -04:00
Frances Botsford
32df8db753 user menu cleanup 2015-07-10 14:13:45 -04:00
Jesse Zoldak
b17ac38a7b Mark test as flaky TNL-2704 2015-07-09 10:50:44 -04:00
Matt Drayer
b0c1e962c7 rc/2015-07-08-mattdrayer: Hide button behind feature flag 2015-07-08 16:55:38 -04:00
Matt Drayer
a8f909fe77 Merge pull request #8659 from edx/ziafazal/SOL-1006
ziafazal/SOL-1006: Disable course 'start date' for inactive web-enabled certificates
2015-07-06 16:45:24 -04:00
Daniel Friedman
3b55d88283 Implement paginated Team Topics UI
Authors:
  - Dan Friedman
  - Ben McMorran
  - Peter Fogg

TNL-1892
2015-07-06 08:45:03 -04:00
asadiqbal
57d5de5d14 asadiqbal08/SOL-766: Add Facebook sharing to certificate view
* updated the flags for social media sharing
* added facebook feed ui to share public url
* update the condition logic
* update the code as per suggestion and added pick new style for share buttons
* update the css class reference
* update the bok-choy test
* updated description and some text touch-ups
* moved the JS related to facebook into separate location
* js formatting
* Add trailing comma per chrisndodge
* Add wait to fix flaky test...maybe
2015-07-02 18:52:15 -04:00
Zia Fazal
611d16b25a ziafazal/SOL-980: Generate certificates from instructor dashboard
* added generate certificates task and bok choy tests
* added unit tests
* changes based feedback and improved acceptance test
* Change header text
* changes based on feedback on 24/6
* added task_id to api output
* fixed broken test
* Remove "Instructor" from strings, per Docs team
* Fixed flaky entrance exam test
2015-07-02 14:32:36 -04:00
Zia Fazal
bcbd1464d4 New course cannot be started till web certificate is active
fixed broken test

changes based on feedback on 6/24

fixed broken unit test after feedback changes

added more checks and updated tests

fixed broken bok choy test

Fixed pylint quality error

trying to fix pylint quality error
2015-06-29 12:53:21 +05:00
Braden MacDonald
cf308d87b9 New Hinted Login View - PR 8591 2015-06-26 13:24:01 -07:00
Braden MacDonald
b4904adc1e Use ConfigurationModels for third_party_auth, new metadata fetching - PR 8155 2015-06-26 13:23:59 -07:00
Ben Patterson
86f17d02e0 Merge pull request #8602 from edx/benp/sol-975-fix
Fix flaky test. SOL-975
2015-06-22 11:41:50 -04:00
Ben Patterson
2ee4b85ffc Fix flaky test. SOL-975
Remove flaky flag, improve linting.
2015-06-20 07:30:14 -04:00