Commit Graph

1831 Commits

Author SHA1 Message Date
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
Jesse Zoldak
2b51029db3 Merge pull request #8834 from edx/zoldak/SOL-449
Mark a too-flaky Milestones acceptance test for skipping
2015-07-09 15:12:32 -04:00
Christine Lytwynec
14fdc836c5 Fix for TE-745 2015-07-09 15:09:16 -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
Jesse Zoldak
be5ae551b2 Mark a too-flaky Milestones acceptance test for skipping 2015-07-08 14:41:58 -04:00
Christine Lytwynec
7af1a44d73 Merge pull request #8792 from edx/clytwynec/flaky-test
flag test as flaky
2015-07-07 10:08:25 -04:00
Christine Lytwynec
db516a9b4c flag test as flaky 2015-07-06 16:51:03 -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
Ben Patterson
c39ebf1bc8 Wait for element to not be present. (Compatible with minor bok-choy upgrade.)
With an upcoming bok-choy upgrade, 'not-present' and
'invisible' are two distinct concepts. In the upgrade, an
invisible element must be present on the page. This commit
draws that distinction across two helper methods, one for
'invisible' and the other for 'not-present' (or, not on the page at all).
2015-07-03 06:51:25 -07: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
Sarina Canelake
d5b26c7f8c Mark test as flaky; TNL-2647 2015-07-02 11:18:09 -04:00
muhammad-ammar
b0eda4cac9 Display warning message on course outline in Studio when course contains deprecated features/components
TNL-2303
2015-06-30 13:26:18 +05: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
Matt Drayer
f7262a211e mattdrayer/SOL-449: Add flaky decorator to bok choy test 2015-06-25 11:50:57 -04:00
cahrens
923edee15f Fix flaky test_import_timestamp test.
TNL-2386
2015-06-25 09:58:28 -04: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
Renzo Lucioni
e960adc0ff Merge pull request #8262 from open-craft/tpa-pipeline-consolidation
Cleanup of third-party login and auto-enrollment
2015-06-19 09:12:11 -04:00
Braden MacDonald
345fcabd05 Fix CRI-9 so third_party_auth pipeline always completes, and consolidate auto-enrollment code 2015-06-18 20:57:19 -07:00
Sarina Canelake
6d121dc5ad Merge pull request #6786 from Stanford-Online/nick/extended-hint
Extended hint features
2015-06-18 18:34:24 -04:00
Christine Lytwynec
d32355fbbd Make a11y test inherit from a base class 2015-06-18 14:35:11 -04:00
Nick Parlante
77f3069655 Extended Feedback and Hints for Problems
Extends the common capa response types (string, numeric, multiple
choice, checkbox, dropdown) with feedback and hint
capabilities. "Feedback" refers to feedback shown to the student when
they check the problem, looking at their specific answer. "Hints"
refers to a Hint button in LMS which the student can click at any time
to see hints for that problem. The implementation extends the markdown
syntax to include feedback and hints. There are new Feedback-and-Hint
specific templates in Studio when the author clicks to add a new
problem.
2015-06-17 16:25:04 -07:00
muzaffaryousaf
4fecf03874 Display error message on ORA 1 components in units in Studio.
TNL-2304
2015-06-17 17:05:09 +05:00
Zia Fazal
6afaa3cce3 certificates event tracking
some optimisations

refactored code and added created event

added test to make sure generate event is emitted

changes based on feedback on 6/11

added certificate web page and tests

fixed quality violations
2015-06-15 19:53:47 +05:00
Marko Jevtić
410b9282af Merge pull request #8330 from edx/mjevtic/SOL-835
(SOL-835) Addressing flakiness of the reindexing bokchoy acceptance test
2015-06-15 15:34:25 +02:00
Ben Patterson
04e764d13d Make addCleanup idempotent.
Sometimes this file does not exist depending on when a test failed. Remove it gracefully.
2015-06-12 10:28:06 -04:00