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

34651 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
ae283f6ac6 Shrink images using trimage 
.../vendor/ova/catch/img/expandableIcon_Arrow.png   | Bin 3002 -> 2085 bytes
 common/static/js/vendor/ova/catch/img/fish.jpg      | Bin 11572 -> 11482 bytes
 .../js/vendor/ova/catch/img/geolocation_icon.png    | Bin 740 -> 624 bytes
 .../static/js/vendor/ova/catch/img/groups_icon.png  | Bin 747 -> 624 bytes
 .../static/js/vendor/ova/catch/img/privacy_icon.png | Bin 635 -> 538 bytes
 .../js/vendor/ova/catch/img/shareControls.png       | Bin 9691 -> 7624 bytes
 .../static/js/vendor/ova/catch/img/share_icon.png   | Bin 655 -> 520 bytes
 .../js/vendor/ova/images/fullpage_grouphover.png    | Bin 698 -> 584 bytes
 .../static/js/vendor/ova/images/fullpage_hover.png  | Bin 831 -> 723 bytes
 .../js/vendor/ova/images/fullpage_pressed.png       | Bin 817 -> 709 bytes
 .../static/js/vendor/ova/images/fullpage_rest.png   | Bin 698 -> 584 bytes
 .../static/js/vendor/ova/images/home_grouphover.png | Bin 672 -> 565 bytes
 common/static/js/vendor/ova/images/home_hover.png   | Bin 737 -> 631 bytes
 common/static/js/vendor/ova/images/home_pressed.png | Bin 741 -> 645 bytes
 common/static/js/vendor/ova/images/home_rest.png    | Bin 672 -> 565 bytes
 .../js/vendor/ova/images/newan_grouphover.png       | Bin 746 -> 641 bytes
 common/static/js/vendor/ova/images/newan_hover.png  | Bin 815 -> 710 bytes
 .../static/js/vendor/ova/images/newan_pressed.png   | Bin 828 -> 721 bytes
 common/static/js/vendor/ova/images/newan_rest.png   | Bin 746 -> 641 bytes
 .../static/js/vendor/ova/images/next_grouphover.png | Bin 656 -> 574 bytes
 common/static/js/vendor/ova/images/next_hover.png   | Bin 753 -> 667 bytes
 common/static/js/vendor/ova/images/next_pressed.png | Bin 752 -> 666 bytes
 common/static/js/vendor/ova/images/next_rest.png    | Bin 656 -> 574 bytes
 .../js/vendor/ova/images/previous_grouphover.png    | Bin 661 -> 572 bytes
 .../static/js/vendor/ova/images/previous_hover.png  | Bin 755 -> 667 bytes
 25 files changed, 0 insertions(+), 0 deletions(-)
 2016-01-07 10:48:39 -05:00
Calen Pennington
dade7f49b0 Shrink images using trimage 
.../gwt/chrome/images/ie6/vborder_blue_shadow.png     | Bin 144 -> 130 bytes
 .../gwt/chrome/images/ie6/vborder_gray_shadow.png     | Bin 148 -> 131 bytes
 .../capa/jsme/gwt/chrome/images/splitPanelThumb.png   | Bin 308 -> 220 bytes
 .../gwt/chrome/images/valuespinner/bg_textbox.png     | Bin 193 -> 87 bytes
 .../static/js/capa/jsme/gwt/chrome/images/vborder.png | Bin 188 -> 125 bytes
 .../js/capa/jsme/gwt/chrome/images/vborder_ie6.png    | Bin 201 -> 110 bytes
 .../js/capa/jsmolcalc/gwt/clean/images/circles.png    | Bin 1492 -> 974 bytes
 .../capa/jsmolcalc/gwt/clean/images/circles_ie6.png   | Bin 432 -> 358 bytes
 .../js/capa/jsmolcalc/gwt/clean/images/corner.png     | Bin 1140 -> 709 bytes
 .../js/capa/jsmolcalc/gwt/clean/images/corner_ie6.png | Bin 412 -> 328 bytes
 .../js/capa/jsmolcalc/gwt/clean/images/hborder.png    | Bin 1995 -> 1205 bytes
 .../capa/jsmolcalc/gwt/clean/images/hborder_ie6.png   | Bin 706 -> 607 bytes
 .../js/capa/jsmolcalc/gwt/clean/images/thumb_horz.png | Bin 222 -> 113 bytes
 .../jsmolcalc/gwt/clean/images/thumb_vertical.png     | Bin 231 -> 119 bytes
 .../js/capa/jsmolcalc/gwt/clean/images/vborder.png    | Bin 298 -> 182 bytes
 .../capa/jsmolcalc/gwt/clean/images/vborder_ie6.png   | Bin 189 -> 136 bytes
 .../js/vendor/markitup/sets/wiki/images/clean.png     | Bin 667 -> 544 bytes
 .../vendor/markitup/sets/wiki/images/list-bullet.png  | Bin 344 -> 312 bytes
 .../vendor/markitup/sets/wiki/images/list-numeric.png | Bin 357 -> 319 bytes
 .../js/vendor/markitup/sets/wiki/images/preview.png   | Bin 537 -> 536 bytes
 .../js/vendor/markitup/skins/simple/images/handle.png | Bin 258 -> 130 bytes
 .../js/vendor/markitup/skins/simple/images/menu.png   | Bin 27151 -> 169 bytes
 .../vendor/markitup/skins/simple/images/submenu.png   | Bin 240 -> 170 bytes
 common/static/js/vendor/ova/catch/img/closeIcon.png   | Bin 1114 -> 550 bytes
 .../static/js/vendor/ova/catch/img/expandableIcon.png | Bin 1279 -> 621 bytes
 25 files changed, 0 insertions(+), 0 deletions(-)
 2016-01-07 10:48:38 -05:00
Calen Pennington
9a7443bfdb Shrink images using trimage 
common/static/js/capa/genex/images/thumb_horz.png     | Bin 222 -> 113 bytes
 common/static/js/capa/genex/images/thumb_vertical.png | Bin 231 -> 119 bytes
 common/static/js/capa/genex/images/vborder.png        | Bin 298 -> 182 bytes
 common/static/js/capa/genex/images/vborder_ie6.png    | Bin 189 -> 136 bytes
 .../jsme/40BAF81124143A595056A9CCA0E9DBBA.cache.png   | Bin 2890 -> 2795 bytes
 .../images/button/menu-button-arrow-disabled.png      | Bin 173 -> 109 bytes
 .../gwt/chrome/images/button/menu-button-arrow.png    | Bin 173 -> 109 bytes
 .../images/button/split-button-arrow-active.png       | Bin 280 -> 222 bytes
 .../images/button/split-button-arrow-disabled.png     | Bin 185 -> 125 bytes
 .../chrome/images/button/split-button-arrow-focus.png | Bin 185 -> 125 bytes
 .../chrome/images/button/split-button-arrow-hover.png | Bin 185 -> 125 bytes
 .../gwt/chrome/images/button/split-button-arrow.png   | Bin 185 -> 125 bytes
 .../chrome/images/combobox/arrow-down-disabled.png    | Bin 170 -> 104 bytes
 .../jsme/gwt/chrome/images/combobox/arrow-down.png    | Bin 170 -> 104 bytes
 .../gwt/chrome/images/combobox/ellipsis-disabled.png  | Bin 165 -> 108 bytes
 .../capa/jsme/gwt/chrome/images/combobox/ellipsis.png | Bin 166 -> 100 bytes
 .../static/js/capa/jsme/gwt/chrome/images/corner.png  | Bin 1181 -> 750 bytes
 .../js/capa/jsme/gwt/chrome/images/corner_ie6.png     | Bin 397 -> 314 bytes
 .../jsme/gwt/chrome/images/glasspanel/blue_ridge.png  | Bin 263 -> 96 bytes
 .../static/js/capa/jsme/gwt/chrome/images/hborder.png | Bin 1591 -> 808 bytes
 .../js/capa/jsme/gwt/chrome/images/hborder_ie6.png    | Bin 970 -> 815 bytes
 .../gwt/chrome/images/ie6/corner_dialog_topleft.png   | Bin 213 -> 162 bytes
 .../gwt/chrome/images/ie6/corner_dialog_topright.png  | Bin 258 -> 226 bytes
 .../gwt/chrome/images/ie6/hborder_blue_shadow.png     | Bin 150 -> 133 bytes
 .../gwt/chrome/images/ie6/hborder_gray_shadow.png     | Bin 153 -> 136 bytes
 25 files changed, 0 insertions(+), 0 deletions(-)
 2016-01-07 10:48:36 -05:00
Calen Pennington
ed12c61dd0 Shrink images using trimage 
.../static/images/capa/vsepr/T-shaped-3D-balls.png | Bin 57074 -> 53926 bytes
 .../images/capa/vsepr/Tetrahedral-3D-balls.png     | Bin 53631 -> 48796 bytes
 .../static/images/capa/vsepr/Trigonal-3D-balls.png | Bin 56071 -> 51879 bytes
 .../capa/vsepr/Trigonal-bipyramidal-3D-balls.png   | Bin 47683 -> 43395 bytes
 .../images/capa/vsepr/Trigonal-planar-stick.png    | Bin 89521 -> 69265 bytes
 common/static/images/hd.png                        | Bin 364 -> 355 bytes
 common/static/images/high_pass_filter.png          | Bin 48150 -> 26132 bytes
 common/static/images/ico-tinymce-code.png          | Bin 337 -> 228 bytes
 common/static/images/ml_grading_icon.png           | Bin 405 -> 379 bytes
 common/static/images/partially-correct-icon.png    | Bin 1141 -> 1047 bytes
 common/static/images/peer_grading_icon.png         | Bin 610 -> 472 bytes
 common/static/images/placeholder-faculty.png       | Bin 9137 -> 9130 bytes
 common/static/images/placeholder-image.png         | Bin 2312412 -> 1930682 bytes
 .../static/images/sequence-nav/list-finished.png   | Bin 1063 -> 139 bytes
 .../static/images/sequence-nav/list-unfinished.png | Bin 1070 -> 142 bytes
 .../static/images/sequence-nav/list-unstarted.png  | Bin 1067 -> 142 bytes
 common/static/images/sequence-nav/next-icon.png    | Bin 1079 -> 264 bytes
 .../static/images/sequence-nav/previous-icon.png   | Bin 1062 -> 256 bytes
 common/static/images/voltage_divider.png           | Bin 27331 -> 13855 bytes
 common/static/js/capa/genex/images/circles.png     | Bin 1492 -> 974 bytes
 common/static/js/capa/genex/images/circles_ie6.png | Bin 432 -> 358 bytes
 common/static/js/capa/genex/images/corner.png      | Bin 1140 -> 709 bytes
 common/static/js/capa/genex/images/corner_ie6.png  | Bin 412 -> 328 bytes
 common/static/js/capa/genex/images/hborder.png     | Bin 1995 -> 1205 bytes
 common/static/js/capa/genex/images/hborder_ie6.png | Bin 706 -> 607 bytes
 25 files changed, 0 insertions(+), 0 deletions(-)
 2016-01-07 10:48:35 -05:00
Calen Pennington
1a97c72f75 Shrink images using trimage 
common/static/images/capa/vsepr/AX2E2-3D-balls.png  | Bin 80754 -> 74749 bytes
 common/static/images/capa/vsepr/AX2E3-3D-balls.png  | Bin 79137 -> 73373 bytes
 common/static/images/capa/vsepr/AX3E0-3D-balls.png  | Bin 65304 -> 58931 bytes
 common/static/images/capa/vsepr/AX3E1-3D-balls.png  | Bin 63627 -> 57952 bytes
 common/static/images/capa/vsepr/AX3E2-3D-balls.png  | Bin 67530 -> 63447 bytes
 common/static/images/capa/vsepr/AX4E0-3D-balls.png  | Bin 52642 -> 47395 bytes
 common/static/images/capa/vsepr/AX4E1-3D-balls.png  | Bin 76179 -> 70045 bytes
 common/static/images/capa/vsepr/AX4E2-3D-balls.png  | Bin 87475 -> 80027 bytes
 common/static/images/capa/vsepr/AX5E1-3D-balls.png  | Bin 72517 -> 65354 bytes
 common/static/images/capa/vsepr/AX5E2-3D-balls.png  | Bin 81700 -> 74925 bytes
 common/static/images/capa/vsepr/AX6E0-3D-balls.png  | Bin 58834 -> 52799 bytes
 common/static/images/capa/vsepr/AX6E1-3D-balls.png  | Bin 65374 -> 60540 bytes
 common/static/images/capa/vsepr/AX7E0-3D-balls.png  | Bin 57532 -> 52260 bytes
 common/static/images/capa/vsepr/AX8E0-3D-balls.png  | Bin 72760 -> 66708 bytes
 common/static/images/capa/vsepr/AX9E0-3D-balls.png  | Bin 70859 -> 64089 bytes
 common/static/images/capa/vsepr/Bent-3D-balls.png   | Bin 62092 -> 56501 bytes
 common/static/images/capa/vsepr/Linear-3D-balls.png | Bin 44902 -> 42863 bytes
 .../images/capa/vsepr/Octahedral-3D-balls.png       | Bin 62223 -> 56735 bytes
 .../capa/vsepr/Pentagonal-bipyramidal-3D-balls.png  | Bin 61456 -> 55610 bytes
 .../capa/vsepr/Pentagonal-planar-3D-balls.png       | Bin 72626 -> 65949 bytes
 .../capa/vsepr/Pentagonal-pyramidal-3D-balls.png    | Bin 71485 -> 64805 bytes
 .../static/images/capa/vsepr/Pyramidal-3D-balls.png | Bin 63322 -> 58066 bytes
 common/static/images/capa/vsepr/Seesaw-3D-balls.png | Bin 66832 -> 61761 bytes
 .../capa/vsepr/Square-antiprismatic-3D-balls.png    | Bin 88977 -> 80249 bytes
 .../images/capa/vsepr/Square-planar-3D-balls.png    | Bin 71351 -> 65996 bytes
 25 files changed, 0 insertions(+), 0 deletions(-)
 2016-01-07 10:48:35 -05:00
Calen Pennington
dbffd5d686 Shrink images using trimage 
common/static/css/vendor/slickgrid/images/help.png  | Bin 345 -> 334 bytes
 .../static/css/vendor/slickgrid/images/stripes.png  | Bin 1125 -> 88 bytes
 .../images/ui-bg_flat_0_aaaaaa_40x100.png           | Bin 180 -> 86 bytes
 .../images/ui-bg_flat_75_ffffff_40x100.png          | Bin 178 -> 86 bytes
 .../images/ui-bg_glass_65_ffffff_1x400.png          | Bin 105 -> 97 bytes
 .../images/ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 101 -> 86 bytes
 .../smoothness/images/ui-icons_222222_256x240.png   | Bin 4369 -> 3714 bytes
 .../smoothness/images/ui-icons_2e83ff_256x240.png   | Bin 4369 -> 3714 bytes
 .../smoothness/images/ui-icons_454545_256x240.png   | Bin 4369 -> 3714 bytes
 .../smoothness/images/ui-icons_888888_256x240.png   | Bin 4369 -> 3714 bytes
 .../smoothness/images/ui-icons_cd0a0a_256x240.png   | Bin 4369 -> 3714 bytes
 .../ui-bg_diagonals-thick_18_b81900_40x40.png       | Bin 260 -> 136 bytes
 .../ui-bg_diagonals-thick_20_666666_40x40.png       | Bin 251 -> 136 bytes
 .../images/ui-bg_flat_10_000000_40x100.png          | Bin 178 -> 86 bytes
 .../images/ui-bg_glass_65_ffffff_1x400.png          | Bin 105 -> 97 bytes
 .../images/ui-bg_gloss-wave_35_f6a828_500x100.png   | Bin 3762 -> 1756 bytes
 .../ui-lightness/images/ui-icons_222222_256x240.png | Bin 4369 -> 3714 bytes
 .../ui-lightness/images/ui-icons_228ef1_256x240.png | Bin 4369 -> 3714 bytes
 .../ui-lightness/images/ui-icons_ef8c08_256x240.png | Bin 4369 -> 3714 bytes
 .../ui-lightness/images/ui-icons_ffd27a_256x240.png | Bin 4369 -> 3714 bytes
 .../ui-lightness/images/ui-icons_ffffff_256x240.png | Bin 4369 -> 3714 bytes
 common/static/images/arrow-left.png                 | Bin 1062 -> 256 bytes
 common/static/images/arrow-right.png                | Bin 1079 -> 264 bytes
 common/static/images/capa/vsepr/AX2E0-3D-balls.png  | Bin 32790 -> 30318 bytes
 common/static/images/capa/vsepr/AX2E1-3D-balls.png  | Bin 61843 -> 57213 bytes
 25 files changed, 0 insertions(+), 0 deletions(-)
 2016-01-07 10:48:33 -05:00
Calen Pennington
9265dc007c Shrink images using trimage 
cms/static/images/bg-micro-stripes.png              | Bin 117 -> 102 bytes
 cms/static/images/choice-example.png                | Bin 2751 -> 1544 bytes
 cms/static/images/drag-handles.png                  | Bin 954 -> 103 bytes
 cms/static/images/explanation-example.png           | Bin 4772 -> 4671 bytes
 cms/static/images/header-example.png                | Bin 6639 -> 385 bytes
 cms/static/images/hiw-feature1.png                  | Bin 67031 -> 66798 bytes
 cms/static/images/hiw-feature2.png                  | Bin 17027 -> 16408 bytes
 cms/static/images/hiw-feature3.png                  | Bin 15092 -> 14775 bytes
 cms/static/images/large-video-icon.png              | Bin 234 -> 128 bytes
 cms/static/images/multi-example.png                 | Bin 2875 -> 1519 bytes
 cms/static/images/number-example.png                | Bin 1430 -> 515 bytes
 cms/static/images/preview-lms-staticpages.png       | Bin 61450 -> 53417 bytes
 cms/static/images/problem-editor-icons.png          | Bin 2307 -> 2304 bytes
 cms/static/images/search-icon.png                   | Bin 1196 -> 423 bytes
 cms/static/images/select-example.png                | Bin 1961 -> 1006 bytes
 cms/static/images/string-example.png                | Bin 1458 -> 574 bytes
 cms/static/images/studio-logo.png                   | Bin 4243 -> 885 bytes
 cms/static/images/thumb-hiw-feature1.png            | Bin 16516 -> 16311 bytes
 cms/static/images/thumb-hiw-feature2.png            | Bin 12956 -> 12821 bytes
 cms/static/images/thumb-hiw-feature3.png            | Bin 16616 -> 16395 bytes
 common/static/css/vendor/ova/video-js.fw.png        | Bin 78899 -> 74914 bytes
 .../css/vendor/pdfjs/images/loading-small.png       | Bin 7402 -> 613 bytes
 .../css/vendor/pdfjs/images/loading-small@2x.png    | Bin 16131 -> 1324 bytes
 .../secondaryToolbarButton-documentProperties.png   | Bin 403 -> 402 bytes
 .../css/vendor/slickgrid/images/drag-handle.png     | Bin 1130 -> 94 bytes
 25 files changed, 0 insertions(+), 0 deletions(-)
 2016-01-07 10:48:32 -05:00
Matt Drayer
3d30bb11ab Merge pull request #11161 from edx/asadiqbal08/WL-270 
WL-270 used gettext in javascript files
 2016-01-07 10:45:12 -05:00
Matt Drayer
388a5dc710 Merge pull request #11156 from edx/asadiqbal08/WL-268 
WL-268 String Internationalization
 2016-01-07 10:41:56 -05:00
Matt Drayer
4d7be021e5 Merge pull request #11140 from edx/saleem-latif/SOL-1431 
SOL-1431: Remove no-op translations from devstack.py
 2016-01-07 10:40:20 -05:00
Matt Drayer
b7b8c745d6 Merge pull request #11139 from edx/asadiqbal08/WL-242 
asadiqbal08/WL-242 - Marked strings on shopping cart pages for translations
 2016-01-07 10:32:40 -05:00
asadiqbal
7f38c1a3c9 WL-270 used gettext in javascript files 2016-01-07 18:08:15 +05:00
asadiqbal
eca0cd1139 WL-268 String Internationalization 2016-01-07 17:50:47 +05:00
Piotr Mitros
e87fabe45e Merge pull request #8289 from edx/danielli/pyfs_xblocks 
Add setting for pyfs xblock service to devstack.py
 2016-01-06 17:21:30 -05:00
Adam
4c5c8c18a3 Merge pull request #10648 from OmarIthawi/edraak/calculator-fixups 
Calculator layout and help popup fixes
 2016-01-06 15:32:58 -05:00
Christina Roberts
4d2a8dbbf4 Merge pull request #11152 from edx/christina/course-outline 
Delete lettuce tests already converted to bok choy.
 2016-01-06 15:21:06 -05:00
cahrens
85ff219e1d Delete lettuce tests already converted to bok choy. 
TNL-3915
 2016-01-06 14:22:10 -05:00
AlasdairSwan
f489662e16 Merge pull request #11134 from edx/alasdair/ECOM-3319-add-edx-icons-font-to-programs-page 
ECOM-3319 loading edx-icons fonts in studio programming author tool
 2016-01-06 14:09:35 -05:00
Matt Drayer
083ff7f0ef Merge pull request #11150 from edx/release 
2016-01-06 Release
 2016-01-06 13:51:49 -05:00
Ben Patterson
29befd3381 Merge pull request #11148 from edx/benp/teams-page-flaky-ff42 
Fix failing condition for firefox 42.
 2016-01-06 12:24:50 -05:00
Matt Drayer
69cb40d5ea Merge pull request #11133 from edx/rc/2016-01-05 
Release Candidate rc/2016-01-05
 2016-01-06 12:16:20 -05:00
AlasdairSwan
f25d8a16ee ECOM-3319 loading edx-icons fonts in studio programming author tool 2016-01-06 12:08:47 -05:00
David Ormsbee
d23991024a Merge pull request #11144 from edx/ormsbee/student_dashboard_module_js 
Disable Courseware JS from loading on Student Dashboard.
 2016-01-06 11:33:03 -05:00
Omar Al-Ithawi
e21505b76a Fixed issues in the calculator help 
- Corrected the direction of the English equations
  - TNL-3798: Removed the greek letters
  - The equal (=) button is now the default submit button in the calculator, instead of the help button
  - TNL-3798: Removed the subscript note
  - Added some comments for the translators in the calculator
  - Using `fixed` position for the calculator for best mobile/desktop look
 2016-01-06 17:52:44 +02:00
Douglas Hall
8b32148147 Merge pull request #11137 from edx/hasnain-naveed/SOL-1182-final 
SOL-1182 / Bokchoy-test
 2016-01-06 10:20:25 -05:00
Ben Patterson
bc77ab2d6e Fix failing condition for firefox 42. 
Firefox 42 is faster than the version we're currently using for platform tests. This failure
occurs in the brief amount of time where the teams page is reloading. Waiting for the actual
team list to appear before moving on with tests solves the issue. Approx 4 testcases are fixed.

Below is an example of error that was appearing in firefox 42 tests:

```
Error Message

Not on the correct page to use '<common.test.acceptance.pages.studio.users.CourseTeamPage object at 0x7feb9fdb0490>' at URL 'http://localhost:8031/course_team/course-v1:test_org+321550032104190792981383915127220335686+test_run'
-------------------- >> begin captured logging << --------------------
bok_choy.browser: INFO: Using local browser: firefox [Default is firefox]
--------------------- >> end captured logging << ---------------------
Stacktrace

  File "/usr/lib/python2.7/unittest/case.py", line 331, in run
    testMethod()
  File "/home/jenkins/workspace/edx-platform-test-subset/common/test/acceptance/tests/studio/test_studio_course_team.py", line 147, in test_added_users_cannot_add_or_delete_other_users
    self._assert_user_present(self.other_user, present=True)
  File "/home/jenkins/workspace/edx-platform-test-subset/common/test/acceptance/tests/studio/test_studio_course_team.py", line 78, in _assert_user_present
    description="Wait for user to be present"
  File "/home/jenkins/edx-venv/local/lib/python2.7/site-packages/bok_choy/page_object.py", line 490, in wait_for
    return EmptyPromise(promise_check_func, description, timeout=timeout).fulfill()
  File "/home/jenkins/edx-venv/local/lib/python2.7/site-packages/bok_choy/promise.py", line 92, in fulfill
    is_fulfilled, result = self._check_fulfilled()
  File "/home/jenkins/edx-venv/local/lib/python2.7/site-packages/bok_choy/promise.py", line 118, in _check_fulfilled
    is_fulfilled, result = self._check_func()
  File "/home/jenkins/edx-venv/local/lib/python2.7/site-packages/bok_choy/promise.py", line 173, in <lambda>
    full_check_func = lambda: (check_func(), None)
  File "/home/jenkins/workspace/edx-platform-test-subset/common/test/acceptance/tests/studio/test_studio_course_team.py", line 77, in <lambda>
    lambda: user.get('username') in self.page.usernames,
  File "/home/jenkins/edx-venv/local/lib/python2.7/site-packages/bok_choy/page_object.py", line 66, in wrapper
    self._verify_page()  # pylint: disable=protected-access
  File "/home/jenkins/edx-venv/local/lib/python2.7/site-packages/bok_choy/page_object.py", line 331, in _verify_page
    raise WrongPageError(msg)
"Not on the correct page to use '<common.test.acceptance.pages.studio.users.CourseTeamPage object at 0x7feb9fdb0490>' at URL 'http://localhost:8031/course_team/course-v1:test_org+321550032104190792981383915127220335686+test_run'\n-------------------- >> begin captured logging << --------------------\nbok_choy.browser: INFO: Using local browser: firefox [Default is firefox]\n--------------------- >> end captured logging << ---------------------"
```
 2016-01-06 08:40:54 -05:00
Hasnain
b7d7e4d588 remove the flaky decorator. 2016-01-06 09:49:36 +00:00
swdanielli
ac66b4a8cd Add setting for pyfs xblock service 2016-01-05 23:09:09 +00:00
Clinton Blackburn
45d4d17283 Merge pull request #11145 from edx/clintonb/edx-search-pypi 
Using edx-search from PyPI
 2016-01-05 17:04:00 -05:00
Nimisha Asthagiri
9b70981a0f Merge pull request #11066 from edx/course-api/all-blocks-support 
Course Blocks API support for all blocks when no username
 2016-01-05 16:10:16 -05:00
Clinton Blackburn
3fe42db0b8 Using edx-search from PyPI 2016-01-05 15:46:57 -05:00
Nimisha Asthagiri
59605159b4 Course Blocks API: support for all blocks when no username 2016-01-05 15:06:55 -05:00
Kelketek
7af7553175 Merge pull request #10413 from edx/register-dropdown 
Add custom fields to registration menu.
 2016-01-05 13:44:11 -06:00
David Ormsbee
660d64d7b8 Disable Courseware JS from loading on Student Dashboard. 2016-01-05 13:54:04 -05:00
Toby Lawrence
56fe511a81 Merge pull request #11025 from edx/PERF-224 
[PERF-224] Serve course assets from a CDN
 2016-01-05 13:40:54 -05:00
Ben Patterson
54d4ea8a80 Merge pull request #11120 from edx/benp/fix-edxnotes-seleniumupgrade 
Resolving errors for selenium upgrade.
 2016-01-05 11:33:57 -05:00
Jonathan Piacenti
acc0161c0f Add custom registration form extension feature. 2016-01-05 10:14:28 -06:00
Douglas Hall
a2e3092709 Merge pull request #11023 from edx/douglashall/PHX-207/update_lti_xblock_version 
PHX-207 Upgrade xblock-lti-consumer to include accessibility improvements
 2016-01-05 10:41:14 -05:00
Douglas Hall
c0c597522f Merge pull request #11143 from edx/douglashall/MAYN-180/fix_broken_templates 
MAYN-180 Fix broken shopping cart template
 2016-01-05 10:32:21 -05:00
Toby Lawrence
77343df0d9 [PERF-224] Support to serve static assets from a CDN. 
A base URL can now be configured which is, potentially, prepended to an
asset URL.  This allows a CDN, or caching server, to front static asset
requests, taking load off of the contentstore and speeding up page load
times.

Asset URL generation respects locked vs unlocked assets, and will not
generate links to locked assets that would traverse a CDN (even though
the authorization component of the contentserver middleware wouldn't
allow those links to work anyways).
 2016-01-05 10:24:44 -05:00
Christine Lytwynec
b1e31c133f Merge pull request #11098 from edx/clytwynec/ac-303 
remove aria-hidden from staff lms controls
 2016-01-05 10:09:21 -05:00
Usman Khalid
6fcf83e60b Merge pull request #11082 from Ayub-Khan/ayubkhan/TNL-3556 
Fix Instructor tool "View as Specific Student" doesn't work on the course updates page.
 2016-01-05 20:02:33 +05:00
Douglas Hall
e7dc6fcfe5 Rolling back template inheritance change that was causing child templates to break 2016-01-05 09:40:34 -05:00
Ayub-Khan
96e64464b5 -fix TNL-3556 Instructor tool "View as Specific Student" doesn't work on the course updates page. 
-Added test for TNL-3556.
 2016-01-05 17:50:23 +05:00
asadiqbal
47827ecb6f WL-242 2016-01-05 14:25:22 +05:00
Saleem Latif
e3edb4e9f5 remove no-op translations from devstack.py 2016-01-05 13:33:51 +05:00
raeeschachar
c66d3cba20 Merge pull request #11086 from edx/raees/chrome-bokchoy-test-can-create-note-with-tags 
Fixed test can create note with tags failing on Chrome
 2016-01-05 11:32:11 +05:00
raeeschachar
1bd1230afa Merge pull request #11112 from edx/raees/chrome-bokchoy-test-quality-button-visibility 
Fixed test quality button visibility failing on Chrome
 2016-01-05 11:31:24 +05:00
Carol Tong
e7dab0dfbb Merge pull request #11126 from edx/carol/doc/cohort_help_target 
Fix cohort doc help targets in Instructor Dashboard
 2016-01-04 17:02:31 -05:00
Carol Tong
0f3da297f6 Fix help targets in Instructor Dashboard 2016-01-04 15:20:40 -05:00