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

33305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Giovanni Di Milia
ecdb0b271f Fixed pylint violation for files in lms/djangoapps/branding 2015-10-14 14:32:56 -04:00
Sarina Canelake
2b5810db9b Merge pull request #10144 from justinabrahms/fail-fast-flag-description-fix 
Fix help description for test's --fail_fast flag
 2015-10-14 10:53:55 -04:00
Justin Abrahms
ac35571ab2 Add myself to the AUTHORs file. 2015-10-14 07:05:44 -07: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
wajeeha-khalid
f49461c2ed Merge pull request #10124 from edx/jia/MA-1240 
MA-1240 - DiscussionAPI: fixed thread-list order-by RecentActivity
 2015-10-14 14:30:31 +05:00
wajeeha-khalid
b5c74652aa MA-1240 - DiscussionAPI: fixed thread-list order-by RecentActivity 2015-10-14 11:06:21 +05:00
Justin Abrahms
86864116e1 Fix help description for test's --fail_fast flag 2015-10-13 15:17:27 -07:00
frances botsford
a2bb8ed96c Merge pull request #10120 from edx/frances/fix/repo-cert-template-bugs 
Platform Web Cert template fixes
 2015-10-13 16:51:56 -04:00
David Baumgold
a0f5a006b8 Merge pull request #10117 from edx/db/upgrade-paver 
Upgrade Paver to 1.2.4
 2015-10-13 11:11:41 -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
Sarina Canelake
65aacc1adf Merge pull request #10078 from openedx-newbie/doc-2268 
DOC-2268 - Fix instances of "register" on the course about page
 2015-10-13 10:21:21 -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
Frances Botsford
c8c9eb3611 remove linebreaks import from web certs 2015-10-13 09:39:37 -04: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
wajeeha-khalid
2c3d64a535 Update users.rst 2015-10-13 11:54:46 +05:00
raeeschachar
8de4d87555 Merge pull request #10128 from edx/chrome-bok-choy-test-about-me-field 
Fixed test about me field test failing on chrome
 2015-10-12 22:21:47 +05:00
Zubair Afzal
5b07be58cd Merge pull request #10111 from edx/zub/story/ecom-2450-adjust-credit-eligibility-email-content 
minor changes in credit eligibility notification
 2015-10-12 19:49:09 +05:00
zubair-arbi
2d1247be49 minor changes in credit eligibility notification 
ECOM-2450
 2015-10-12 18:54:54 +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
Christina Roberts
69c47e0951 Merge pull request #10121 from edx/christina/delete-old-mathjax 
Delete old, unused version of MathJax.
 2015-10-09 16:20:18 -04:00
Sarina Canelake
98a82a89a0 Merge pull request #10089 from edx/oppia-block 
Add Oppia XBlock OSPR-778 DOC-2324
 2015-10-09 15:24:58 -04:00
cahrens
5c12890da5 Delete old, unused version of MathJax. 
This version was from 2012.
 2015-10-09 15:24:15 -04:00
Frances Botsford
06df341f56 web cert template rendering - adjust signature image sizing 2015-10-09 15:12:50 -04:00
Frances Botsford
40170dbf7c adjust platform web cert print style to look like web rendering; fix signatory layouts 2015-10-09 15:12:50 -04:00
Sarina Canelake
a693feb836 Add Oppia XBlock 2015-10-09 14:41:27 -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
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