Commit Graph

28558 Commits

Author SHA1 Message Date
Clinton Blackburn
2945b923d3 Updated _get_courses_with_access_type
- Return all courses for global staff without iteration
- Filter all courses on block type
2015-02-06 20:19:42 -05:00
Waheed Ahmed
55edd327ac Merge pull request #6910 from edx/waheed/tnl1336-fix-close-button-for-help-feedback-menu
Fixed close button for help feedback menu.
2015-02-07 02:39:35 +05:00
David Baumgold
6fa6d62ada Merge pull request #6919 from edx/delete-brewfile
Remove Brewfile
2015-02-06 16:13:31 -05:00
Jesse Zoldak
3f1604ac28 Merge pull request #6736 from edx/zoldak/content-library
Fix flaky content library test
2015-02-06 15:54:54 -05:00
David Baumgold
cdd29358dd Remove Brewfile
Homebrew no longer supports it, anyway
2015-02-06 15:53:32 -05:00
Waheed Ahmed
1e824a2d46 Fixed close button for help feedback menu.
TNL-1336
2015-02-07 01:38:09 +05:00
Will Daly
095b96b041 Fix unicode error when sending confirmation email in shopping cart
Wrap send email operation in try/except to avoid rolling back the transaction once a user has paid.
2015-02-06 15:20:59 -05:00
Calen Pennington
4851062987 Don't instantiate bogus modulestores just to get template rendering in old ORA 2015-02-06 15:20:59 -05:00
John Eskew
46f64305f7 Merge pull request #6767 from edx/jeskew/split_course_export_slowdown_take_II
Fix performance problem with Split course import/export.
2015-02-06 15:18:26 -05:00
Jesse Zoldak
07e0eee2bd Fix flaky content library test 2015-02-06 14:59:31 -05:00
Christine Lytwynec
f8d9359d61 split diff-coverage into separate paver task 2015-02-06 13:41:15 -05:00
Christine Lytwynec
f3327762f7 include jeknins report job as script 2015-02-06 13:41:15 -05:00
Christine Lytwynec
e98c5580a0 split unittests into shards for in jenkins 2015-02-06 13:41:15 -05:00
Calen Pennington
b93b541733 Add our custom pylint plugin
So far, it checks:

* Whether setUp is called in TestCase setUp methods.
* If _("translate me") functions are called with only string literals.
2015-02-06 11:58:37 -05:00
zubair-arbi
b01f7adce1 Merge pull request #6907 from edx/zub/bugfix/tnl-1335-html5-contextual-menu
fix contextual menu (make it clickable) for HTML5 videos
2015-02-06 21:38:09 +05:00
John Eskew
9388ba5968 Change new BlockData object from a dict to an object with specific
attributes that are serialized/de-serialized to/from MongoDB.

Change access of attributes from dict keys.

Add EditInfo object to encapsulate editing info for block data.
2015-02-06 11:28:54 -05:00
Muhammad Ammar
b83ed09f22 Merge pull request #6870 from edx/ammar/tnl-1244
Change column name in grade report
2015-02-06 21:21:32 +05:00
Martyn James
e760d2d2d2 Update styles 2015-02-06 11:11:37 -05:00
Calen Pennington
79fe947a92 Add test of PLAT-417 2015-02-06 09:59:49 -05:00
Anton Stupak
81d51f9671 Merge pull request #6897 from edx/anton/edxnotes-fix-deps
TNL-1353: Fix annotator dependency.
2015-02-06 13:31:40 +02:00
zubair-arbi
a750476c73 fix contextual menu (make it clickable) for HTML5 videos
TNL-1335
2015-02-06 16:18:09 +05:00
ahsan-ul-haq
c814323644 Merge pull request #6810 from edx/ahsan/tnl-1074-adaptive-hint-inaccessible
Problem with Adaptive Hint is inaccessible
2015-02-06 15:15:11 +05:00
Shrhawk
282b81d141 Merge pull request #6747 from edx/shr/bug/TNL-1240-Check-show-answer-not-working
Quote the starts with expression id^
2015-02-06 15:01:41 +05:00
Syed Hassan Raza
806a3d9af2 Quote the starts with expression id^
TNL-1240
2015-02-06 11:53:04 +05:00
muhammad-ammar
b93dcea315 Change column name in grade report
TNL-1244
2015-02-06 09:16:32 +05:00
Christine Lytwynec
4c809fb6ae Merge pull request #6893 from edx/clytwynec/reshard_cms_lettuce_tests
re-shard cms lettuce tests back to 1 shards
2015-02-05 17:29:54 -05:00
Christine Lytwynec
4f218941a3 reshard cms lettuce tests back to 1 shard 2015-02-05 15:21:16 -05:00
Martyn James
63e9bd55ba Added confirmation that 'Search Results' appears 2015-02-05 13:24:03 -05:00
Jesse Zoldak
7c56a525b2 Merge pull request #6901 from edx/zoldak/remove-edx-lint
Revert "Add pylint plugin to check whether setUp is called in ...
2015-02-05 13:13:27 -05:00
Jesse Zoldak
1042e47e3c Revert "Add pylint plugin to check whether setUp is called in TestCase setUp methods."
This reverts commit a92ca9d79a.
2015-02-05 12:45:47 -05:00
Brian Talbot
5785df241d Merge pull request #6875 from edx/talbs/update-font-awesome-4.3
Upgrade: Font Awesome 4.3.0
2015-02-05 12:38:49 -05:00
Jesse Zoldak
5fb683dacf Merge pull request #6900 from edx/zoldak/fix-modulestore-testcase
Fix pep8 violation
2015-02-05 12:33:51 -05:00
Jesse Zoldak
1920a60c97 Fix pep8 violation 2015-02-05 12:16:28 -05:00
Jesse Zoldak
e4b47e1e4e Merge pull request #6898 from edx/zoldak/fix-modulestore-testcase
Use new modulestore override paradigm in the new testcase
2015-02-05 11:52:02 -05:00
Jesse Zoldak
7eb5f627d6 Use new modulestore override paradigm in the new testcase 2015-02-05 10:09:05 -05:00
polesye
c88aad557a TNL-1353: Fix annotator dependency. 2015-02-05 15:51:30 +02:00
Anton Stupak
f8130cc68e Merge pull request #6853 from edx/anton/change-default-video
Update default video that appears when adding a new Video component
2015-02-05 12:35:18 +02:00
polesye
d02d3b7926 TNL-1299: Update default video. 2015-02-05 10:55:36 +02:00
Will Daly
aba0fcd84d Merge pull request #6894 from edx/will/better-logging-for-cert-cmds
Info-level logging for certificate management commands
2015-02-04 21:47:01 -05:00
Will Daly
a8df217a32 Add info-level logging for the management commands used to generate certificates. 2015-02-04 19:41:27 -05:00
Calen Pennington
2bb1aafaaf Merge pull request #6752 from cpennington/modulestore-test-case-cleanup
Clean up ModuleStoreTestCase
2015-02-04 15:57:01 -05:00
Sarina Canelake
562842d235 Merge pull request #6895 from edx/sarina/privacy-date
Update privacy policy date to the most recent
2015-02-04 15:11:54 -05:00
Sarina Canelake
d68ddb6db6 Update privacy policy date to the most recent 2015-02-04 13:51:32 -05:00
Christine Lytwynec
5ae4681bd8 re-shard cms lettuce tests back to 2 shards 2015-02-04 13:47:01 -05:00
Akiva Leffert
50730da1b6 Merge branch 'release' 2015-02-04 13:14:29 -05:00
David Baumgold
d644da9ecd Merge pull request #6890 from edx/i18n-aria-labels
Internationalize aria-label attributes
2015-02-04 12:11:37 -05:00
Ahsan Ulhaq
8f71cb6015 Adaptive hint inaccessible
Remove the <p> and label from textline

tnl-1074
2015-02-04 21:42:20 +05:00
Ahsan Ulhaq
d2893e1fdc Add ahsan to AUTHORS 2015-02-04 21:42:20 +05:00
Ahsan Ulhaq
9b9301a5d4 Problem with Adaptive Hint is inaccessible
There were no label added for problem with adaptive hint so for the question
added the label and insteat of using for attribute used the label as the
parent of input field

TNL-1074
2015-02-04 21:41:25 +05:00
ahsan-ul-haq
3b6e76ce82 Merge pull request #6808 from edx/ahsan/tnl-1076-change-name-modal-accessibilty
Change name and email modal couple of accessibilty issues
2015-02-04 21:37:07 +05:00