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

12086 Commits

Author SHA1 Message Date
Adam
ab78069a33 Merge pull request #10246 from edx/merge-release-into-master 
Merge release into master
 2015-10-19 11:13:49 -05:00
Matt Drayer
1eab25f292 mattdrayer/increment-edx-lint: Bump to v0.2.9 and address pylint/pep8 violations 
* Fix paver violations to stablize edx-lint update
* Parens, Line2Long
* Fix missing docstrings
* Fix PEP8 issues
* Address PR feedback (thanks @nedbat!)
 2015-10-19 10:11:59 -04:00
Matt Drayer
c30960cc85 Merge pull request #10215 from edx/ziafazal/SOL-1317 
SOL-1317: check MILESTONES_APP also when checking prerequisite courses enabled
 2015-10-19 09:47:20 -04:00
Matt Drayer
b4ff9f882b Merge pull request #10146 from edx/saleem-latif/SOL-1257 
saleem-latif/SOL-1257: Resetting student history for Entrance Exam on instructor dashboard
 2015-10-19 09:45:20 -04:00
Adam Palay
9b3841f62c Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	lms/djangoapps/teams/views.py
	lms/templates/courseware/progress.html
 2015-10-19 08:35:33 -05:00
Christina Roberts
aed32a09fc Merge pull request #10237 from stvstnfrd/noop-tests 
Remove unused specs
 2015-10-19 09:33:42 -04:00
Saleem Latif
12b245a386 Remove milestones when instructor clears a student's entry exam data 2015-10-19 12:39:22 +05:00
stv
ca99606f9f Remove unused specs 
These have been commented-out for more than 2 and a half years;
I can't think of a legitimate reason for keeping them around at this
point.

These were originally commented out here in
4740965413
 2015-10-18 04:39:25 -04:00
Christina Roberts
300bd43172 Merge pull request #9845 from edx/christina/bio-hyperlink 
Make HTML for non-editable views on leaner profile page more logical
 2015-10-16 19:03:47 -04:00
cahrens
c6ba747419 Make HTML for non-editable views more logical. 
TNL-3297
 2015-10-16 13:40:24 -04:00
Adam Palay
9a79bf2ec9 skip LTIConfig test when third_party_auth is not installed 2015-10-16 12:22:54 -04:00
Zia Fazal
0f637fdc95 check MILESTONES_APP when checking prerequisite courses enabled 2015-10-16 12:53:55 +05:00
Ben Patterson
c54de688e7 Merge pull request #10129 from edx/benp/more-unique-cohort-bokchoy 
Make these tests more unique for multiprocessing.
 2015-10-15 17:56:14 -04:00
Matt Drayer
f1951df24e Merge pull request #10154 from edx/saleem-latif/SOL-1297 
saleem-latif/SOL-1297: updated message for 500 error on certificate preview
 2015-10-15 13:58:05 -04:00
Christina Roberts
50fd135c61 Merge pull request #10193 from edx/christina/move-require-test 
Clean up of common JS specs using RequireJS.
 2015-10-15 12:53:09 -04:00
cahrens
b67f07afc1 Move main_requirejs to live with the requirejs files. 2015-10-15 11:19:27 -04:00
cahrens
a099ff86e5 Move edx.utils.validate. 
The test was not running where it lived before.
 2015-10-15 11:02:12 -04:00
Matt Drayer
3e5ad2989c Merge pull request #10115 from edx/ziafazal/SOL-1254 
ziafazal/SOL-1254: Student should see rest of courseware as soon as Entrance Exam is passed
 2015-10-15 10:18:21 -04:00
Saleem Latif
466abcdce4 updated message for 500 error on certificate preview 2015-10-15 10:46:11 +05:00
raeeschachar
e72feeadc1 Merge pull request #10137 from edx/chrome-bok-choy-all-tests-in-own-learner-profile-page-test 
Fixed all tests in OwnLearnerProfilePageTest that were failing on Chrome
 2015-10-14 17:47:19 +05:00
Fred Smith
6f08eb0f15 Merge pull request #10131 from open-craft/fix-microsite-import 
Fix staticfiles import in microsite.py.
 2015-10-14 08:42:06 -04:00
Zia Fazal
2d1ff75ba0 added user’s pass status to problem_check response if problem is in 
Entrance Exam.

unit test to check presence of entrance_exam_passed

changed based on Matt's feedback

changes after Asad's feedback
 2015-10-14 15:38:18 +05:00
Ben Patterson
7adb02ee79 Make these tests more unique for multiprocessing. 2015-10-13 11:41:49 -04:00
raeeschachar
b0fd47131e Fixed all tests in OwnLearnerProfilePageTest that were failing on Chrome 2015-10-13 19:36:44 +05:00
Matt Drayer
82a1989a4b Merge pull request #10112 from edx/saleem-latif/SOL-1281 
SOL-1281: Setup/conduct automated testing for SOL-1196
 2015-10-13 10:24:54 -04:00
raeeschachar
0369a2454e Merge pull request #10132 from edx/chrome-bok-choy-test-as-student-in-alpha-plus-beta 
Fixed test, test as student in alpha and beta failing on chrome
 2015-10-13 19:16:33 +05:00
raeeschachar
b69cbfa100 Fixed test as student in alpha and beta failing on chrome 2015-10-13 15:50:46 +05:00
Saleem Latif
b55dee8f2e Bok-Choy test added for SOL-1196 to verify no black box around view certificate note in Progress Tab 2015-10-13 15:13:28 +05:00
Matjaz Gregoric
a9d8678ed0 Fix staticfiles import in microsite.py. 
django-staticfiles was replaced with django.contrib.staticfiles
in dbcd1bf430.

The common/djangoapps/microsite_configuration/templatetags/microsite.py
file was still trying to import the old staticfiles package,
breaking the app on fresh installations.
 2015-10-13 11:20:49 +02:00
Awais Jibran
884569a54c Merge pull request #9862 from edx/aj/plat833-orphan-problem-with-preview-button 
Orphans in split breaks preview button in Studio
 2015-10-13 11:57:27 +05:00
wajeeha-khalid
39b9191456 Merge pull request #9784 from edx/jia/MA-1248 
MA-1248 - Mobile API: return discussion URL in course enrollment API
 2015-10-13 11:55:48 +05:00
raeeschachar
652d3466c1 Fixed test about me field test failing on chrome 2015-10-12 18:28:29 +05:00
Awais Jibran
2813b1269e Published orphans in split breaks preview button in Studio 2015-10-12 15:00:49 +05:00
cahrens
5c12890da5 Delete old, unused version of MathJax. 
This version was from 2012.
 2015-10-09 15:24:15 -04:00
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
wajeeha-khalid
90fe71dbfe MA-1248 - CourseEnrollmentAPI: added discussion URL 2015-10-09 19:04:55 +05:00
cahrens
7a3975fe3f Remove skip-- test passed 60 times in Jenkins. 
TNL-1590
 2015-10-09 09:08:31 -04:00
cahrens
4125e594b0 Fix flaky bok choy tests. 
TNL-2667
 2015-10-08 16:39:59 -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
40a8608b0b Upgrade IP parsing in tracker middleware 2015-10-08 13:48:53 -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
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
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
Saleem Latif
9799d15373 course-number and override course-number added in Certificate Editor View 2015-10-08 11:29:14 +05: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
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