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
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
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
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
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
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
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