Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
40,279 Commits 1 Branch 0 Tags
ca1f76cedb030dac503aa7a2d5ccd8dcaf187cfd
Commit Graph

40279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christina Roberts
e884c65aa6 Merge pull request #10106 from edx/christina/tnl-2667 
Fix flaky Studio Course Team bok choy tests
 2015-10-09 11:43:57 -04:00
Christina Roberts
c1ba907b40 Merge pull request #10109 from edx/christina/tnl-1590 
Remove skip from test_annotatable
 2015-10-09 11:42:04 -04:00
David Baumgold
6c68b19f70 Upgrade Paver to 1.2.4 2015-10-09 11:30:53 -04:00
David Baumgold
34ac9db328 Merge pull request #10021 from mitocw/enhancement/aq/remove_gradebook_draging 
Add scrolling with dragging and added tool tip to student record.
 2015-10-09 10:59:55 -04:00
wajeeha-khalid
90fe71dbfe MA-1248 - CourseEnrollmentAPI: added discussion URL 2015-10-09 19:04:55 +05:00
Matt Drayer
06129ada30 Merge pull request #8788 from edx/mattdrayer/eliminate-base-distinguished 
mattdrayer/eliminate-base-distinguished: Switch back to honor/verified
 2015-10-09 09:36:08 -04:00
cahrens
7a3975fe3f Remove skip-- test passed 60 times in Jenkins. 
TNL-1590
 2015-10-09 09:08:31 -04:00
Matt Drayer
31cbef709a mattdrayer/eliminate-base-distinguished: Switch back to honor/verified 
* talbs: Remove obsolete stuff
* frrrances: remove base and distinguished sass references and image assets
* mattdrayer: Cleaned up JSON syntax for test setups
 2015-10-09 00:29:42 -04:00
cahrens
4125e594b0 Fix flaky bok choy tests. 
TNL-2667
 2015-10-08 16:39:59 -04:00
Amir Qayyum Khan
8b6c3757fe Removed dragging and added tool tip to student record. 
Clarify and reformat some comments; rename a few functions to clarify those.

Convert tabs to spaces.

Fix inaccurate comment

Fixed jshint issues

Adjust how user-select is applied to the gradebook view. Add i18n for a string.

Allow selection when not dragging.
 2015-10-08 15:47:10 -04:00
Christine Lytwynec
b92d239e47 Merge pull request #10081 from edx/clytwynec/update-bokchoy-0.4.6 
Clytwynec/update bokchoy 0.4.6
 2015-10-08 15:45:22 -04:00
Bill DeRusha
1030b277ab Merge pull request #9981 from edx/bderusha/context-tracker-ip 
Upgrade IP parsing in tracker middleware
 2015-10-08 14:48:38 -04:00
Bill DeRusha
bff350102e Merge pull request #10095 from edx/bderusha/auto-rc 
Auto release branch cutting
 2015-10-08 14:00:11 -04:00
Andy Armstrong
421a9cc0ea Add details about debugging Jasmine tests 2015-10-08 13:52:39 -04:00
Bill DeRusha
40a8608b0b Upgrade IP parsing in tracker middleware 2015-10-08 13:48:53 -04:00
Christina Roberts
6b7f1bce7b Merge pull request #10094 from edx/christina/profile-flaky-tests 
Fix user profile flaky tests.
 2015-10-08 13:35:59 -04:00
cahrens
99cd1876d7 Fix flaky profile tests. 
Trying to read the value right after setting it in the bio
field is flaky-- but nobody is using the return value
anyway! There is a test that verifies that the bio field
is properly set, but it uses a different method to get the value.

TNL-2704, TNL-3492, TNL-3514, TNL-2199
 2015-10-08 12:38:28 -04:00
clrux
f6d3471106 Merge pull request #10086 from edx/clrux/ac-76-test-cleanup 
Fixing JS tests for the accordion navigation
 2015-10-08 12:17:21 -04:00
openedx-newbie
895f4a36b2 Fix enrollment terminology in about page tests 2015-10-08 18:00:12 +02:00
Bill DeRusha
565b67592e Add automatic release branch cutting to release script 2015-10-08 11:27:51 -04:00
Peter Fogg
c580d4db3c Merge pull request #10104 from edx/peter-fogg/silence-spurious-pep8 
Make pep8 ignore test_root/staticfiles directory.
 2015-10-08 11:22:15 -04:00
Peter Fogg
264f7c4776 Make pep8 ignore test_root/staticfiles directory. 
This directory is placed under .gitignore, so we shouldn't be worried
about pep8 errors in Python files placed there.
 2015-10-08 09:55:17 -04:00
Chris Rodriguez
a631a662df Fixing JS tests for the course navigation 2015-10-08 09:43:25 -04:00
Peter Pinch
ec023c22e6 Merge pull request #10034 from mitocw/fix/gdm/hide_block_from_ccx 
Fixed visibility of hidden blocks in CCX schedule
 2015-10-08 08:54:02 -04:00
Matt Drayer
994f8bd7b4 Merge pull request #10075 from edx/saleem-latif/SOL-1266 
SOL-1266: Display course numbers in certificate configuration
 2015-10-08 08:30:40 -04:00
Matt Drayer
6b93532c63 Merge pull request #10077 from edx/ziafazal/SOL-1258 
SOL-1258: Percentage appearing wrong for specific numbers
 2015-10-08 08:28:08 -04:00
Usman Khalid
f6193c872e Merge pull request #10059 from edx/usman/use-included-staticfiles-app 
Upgrade django pipeline to v.1.5.3.
 2015-10-08 16:10:36 +05:00
Zia Fazal
14c310017b minimum score percentage rounded 
round before converting a decimal into integer
 2015-10-08 12:01:40 +05:00
Saleem Latif
9799d15373 course-number and override course-number added in Certificate Editor View 2015-10-08 11:29:14 +05:00
frances botsford
416ab258ee Merge pull request #9879 from edx/frances/cleanup-on-demand-box-style 
Align On-demand cert message with pattern library styles
 2015-10-07 16:39:48 -04:00
Eric Fischer
0d2dc431c9 Merge pull request #10066 from edx/efischer/edit_studio_test 
TNL-3305 HTML Editing Bok Choy Test
 2015-10-07 15:01:13 -04:00
Calen Pennington
624bc9a734 Merge pull request #9911 from cpennington/fix-plat-858 
Delete DIRECT_ONLY_CATEGORIES from both draft and published branches by default
 2015-10-07 14:41:40 -04:00
Eric Fischer
2bbea43d06 Adding Bok Choy Test for HTML editing 
TNL-3296 would have been prevented with this test, adding it now to
prevent similar issues in the future. Squashed commit with doc changes,
review feedback, and run-20-times-to-ensure-not-flaky-then-unmark
all included.
 2015-10-07 14:09:03 -04:00
Andy Armstrong
2ca355b881 Merge pull request #9605 from edx/andya/team-discussion-flaky-tests 
Fix flaky team discussion test
 2015-10-07 12:07:25 -04:00
Peter Fogg
a38ae44740 Fix displaying wrong membership on "My Team" view. 
The heart of this fix is to change the "My Team" view to use a
collection of teams instead of memberships. The team card is
refactored to only take a team, rather than attempt to be polymorphic
over teams and team memberships. This change enabled removing a good
amount of old code. This also requires adding a `username` parameter
to the teams list endpoint which allows getting a list of all teams
for a single user, in order to allow refreshing the "My Teams" view
correctly. Currently this list is of length at most one.

TNL-3410
 2015-10-07 11:35:24 -04:00
Andy Armstrong
8914aaf8d4 Refactor discussions code to address flaky test 
TNL-3247

Removed remaining synchronous AJAX calls from discussions
Updated the profile view tests to use an attached view for testing
Removed one-time JQuery intiialization that could fail and break multiple tests
 2015-10-07 11:22:48 -04:00
mushtaqali
296f75a07c Add template escaping in forums, progress page and course container TNL-2395, TNL-2394, TNL-2393 2015-10-07 11:20:51 -04:00
Diana Huang
0248f8af6d Add new clickjacking decorator that whitelists LTI consumers. 2015-10-07 11:20:51 -04:00
Christine Lytwynec
5e1330442d add video a11y test 2015-10-07 10:56:39 -04:00
Christine Lytwynec
5e524594ba update bok-choy to version 0.4.6 2015-10-07 10:56:39 -04:00
Christine Lytwynec
ce42ba5655 move existing a11y tests to bokchoy test folder 2015-10-07 10:56:39 -04:00
Clinton Blackburn
c1686a939c Merge pull request #10072 from edx/release 
Hotfixes for 2015-10-06
 2015-10-07 10:09:03 -04:00
Giovanni Di Milia
f2a1d0e54b Coaches can't see blocks "hide from students" 
If a block is marked as "hide from students" cannot be seen in the
CCX schedule
 2015-10-07 09:07:29 -04:00
Giovanni Di Milia
aa93585e4e Added myself to AUTHORS 2015-10-07 09:07:28 -04:00
chrisndodge
c044099044 Merge pull request #10074 from edx/muhhshoaib/SOL-1267-ecommerce-tab-lost-expand-collapse-regions 
SOL-1267 eCommerce tab on Instructor Dashboard has lost the expand/collapse regions
 2015-10-07 08:56:12 -04:00
Waheed Ahmed
412d86b703 Merge pull request #10065 from edx/waheed/plat747-fix-get-courses 
Fixed split get_courses.
 2015-10-07 17:38:32 +05:00
openedx-newbie
f69a9288a0 DOC-2268 - Fix instances of "register" on the course about page 
As per DOC-2268, "register" means to create an account on edx.org, and "enroll" means to sign up for a course. Make this change on the page `lms/templates/courseware/course_about.html`.
 2015-10-07 14:14:00 +02:00
chrisndodge
734e55eaca Merge pull request #10073 from edx/cdodge/add-columns-to-enrollment-report 
Add email and manual enrollment reason into the Enrollment Report
 2015-10-07 07:57:41 -04:00
Waheed Ahmed
2dd26a8d60 Fixed split get_courses. 
PLAT-747
 2015-10-07 16:39:53 +05:00
Muhammad Shoaib
f876f3f457 SOL-1267 
-fixed the bug in the accordion of the e-commerce html file
 2015-10-07 13:58:46 +05:00