Commit Graph

34645 Commits

Author SHA1 Message Date
jsa
5ae8f5be23 add username to program app config attrs in DOM. 2016-01-07 16:21:19 -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
David Baumgold
c6ed893df9 Merge pull request #11109 from ovnicraft/patch-1
Remove duplicate import
2016-01-04 14:36:58 -05:00
raeeschachar
0e88264df6 Merge pull request #11111 from edx/raees/chrome-bokchoy-test-url-routing
Fixed test url routing failing on Chrome
2016-01-05 00:10:38 +05:00
Bill DeRusha
77d85614b3 Merge pull request #11058 from edx/bderusha/mailchimp-activate
Mailchimp activation
2016-01-04 13:53:13 -05:00
Bill DeRusha
39b5eccf67 Update isActive column in mailchimp upon activation 2016-01-04 13:00:31 -05:00
Peter Fogg
c0fa05e2ae Merge pull request #11107 from edx/peter-fogg/enrollment-support-email
Allow searching enrollments by email as well as username.
2016-01-04 12:57:36 -05:00
Ned Batchelder
74ab0df0b7 Merge pull request #11127 from edx/ned/updated-translations
Update translations (autogenerated message)
2016-01-04 11:46:41 -05:00