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

611 Commits

Author SHA1 Message Date
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
Ben Patterson
92c9c1d529 New bok-choy shard (#7). 2015-08-05 13:52:39 -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
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
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
Ned Batchelder
ee0f4b2594 Remove 'pylint: disable=no-value-for-parameter' that we no longer need. 2015-08-03 15:44:29 -04:00
Mushtaq Ali
6964690097 Merge pull request #9096 from edx/mushtaq/tnl-2609-fix-url-link-issue-markdown-editor 
Fix markdown editor reference link having colon issue
 2015-07-29 22:05:46 +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
mushtaqali
bfd49b2cd0 Fix markdown editor reference link having colon issue 2015-07-28 22:32:57 +05:00
Awais Jibran
ece64cf2fd Merge pull request #9097 from edx/aj/plat-760-fix-flaky-test_import_timestamp 
Fixed Flaky test
 2015-07-28 22:30:42 +05:00
Awais Jibran
bceb2ae378 Fixed Flaky test (TestLibraryImport.test_import_timestamp) 
PLAT-760
 2015-07-28 21:04:16 +05:00
Christina Roberts
f384400bdf Merge pull request #9026 from edx/christina/tnl1653-incorrect-textbook-link 
Fix View Live link on Textbooks page in Studio.
 2015-07-28 10:04:03 -04:00
cahrens
44b1971a7c Fix View Live link on Textbooks page in Studio. 
TNL-1653
 2015-07-27 16:58:18 -04:00
Jesse Zoldak
66aac6a246 Mark CourseTeamPageTest testcase class as flaky 2015-07-27 13:57:23 -04:00
Christine Lytwynec
b5e6607bc4 Merge pull request #9005 from edx/clytwynec/mark-test_import_timestamp-as-flaky 
mark test_import_timestamp as flaky
 2015-07-27 12:03:23 -04:00
Christine Lytwynec
802725a5f9 mark test_import_timestamp as flaky 2015-07-27 09:46:05 -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
8fc5444095 Merge pull request #9020 from edx/peter-fogg/404-not-live 
Redirect to dashboard from non-live courses.
 2015-07-24 13:49:45 -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
muzaffaryousaf
45bb1abd59 Skipping the failing tests; which are also failing in master 
Can see if we remove skipIf from video base class.

TNL-2413
 2015-07-24 18:20:01 +05:00
muzaffaryousaf
38ef22b8a2 Using youtube api (v3) instead of v2 to get the video duration . 
TNL-2413
 2015-07-24 17:03:46 +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
Jesse Zoldak
41350002ba Merge pull request #8940 from edx/zoldak/SOL-1053-skip 
Mark too-flaky test for skipping
 2015-07-17 12:12:34 -04:00
Jesse Zoldak
ec6258a7ec Mark too-flaky test for skipping 2015-07-17 11:01:45 -04:00
Waheed Ahmed
bc052db1ee Added DjangoSudo functionality for instructor dashboard and course team page 2015-07-16 11:14:11 +05:00
Zia Fazal
0793cc8b5c only ddx PM can activate/deactivate or delete certificate configuration 
fix for flaky test

fix for broken test

fixed quality violation
 2015-07-15 17:09:01 +05:00
Jesse Zoldak
98a8f0e282 Merge pull request #8917 from edx/zoldak/SOL-1053 
Mark delete certificates test as flaky SOL-1053
 2015-07-14 11:47:30 -04: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
Jesse Zoldak
96b2baba63 Mark delete certificates test as flaky SOL-1053 2015-07-14 09:10:34 -04:00
Zia Fazal
57f1dc92b3 ziafazal/SOL-1021: Capture additional certificate configuration events 
* Changed certificate_id to configuration_id
* Fix for acceptance test faiiure
* Add waits to bok choy tests

fix for flaky test
 2015-07-14 11:12:09 +05:00
Sarina Canelake
47b99720fa Clean up old style class definitions 2015-07-13 17:33:27 -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
muhammad-ammar
5a8b158900 Visual change to new Hints and Feedback problem types 
TNL-2619
 2015-07-13 12:18:25 +05:00
Frances Botsford
32df8db753 user menu cleanup 2015-07-10 14:13:45 -04:00
Christine Lytwynec
bc78baa091 Merge pull request #8841 from edx/clytwynec/TE-745 
Fix for TE-745
 2015-07-10 09:08:52 -04:00