- 11 Jan, 2016 2 commits
-
-
It somehow ended up in CourseOverviewImageSetTestCase (merge artifact?).
David Ormsbee committed -
Without this change, we'd throw a TransactionManagementError in the case where we have a race condition and generate multiple CourseOverviewImageSets for the same CourseOverview concurrently.
David Ormsbee committed
-
- 08 Jan, 2016 9 commits
-
-
Add the migrations necessary for asset base URL support.
Toby Lawrence committed -
Toby Lawrence committed
-
Revert "Add options trailing slashes to the Enrollment API."
Peter Fogg committed -
Remove unused header_extra.html file
David Baumgold committed -
This reverts commit 3149aaa3.
Peter Fogg committed -
WL-269 used gettext(...) in .underscores files.
Matt Drayer committed -
Allowed CCX coaches to see individual students progress from grade book
Peter Pinch committed -
Amir Qayyum Khan committed
-
asadiqbal committed
-
- 07 Jan, 2016 11 commits
-
-
add username to program app config attrs in DOM.
Jim Abramson committed -
jsa committed
-
CCX app refactoring. Moved some code to utils.py from views.py
Peter Pinch committed -
Remove duplicate import
David Baumgold committed -
David Baumgold committed
-
WL-270 used gettext in javascript files
Matt Drayer committed -
WL-268 String Internationalization
Matt Drayer committed -
SOL-1431: Remove no-op translations from devstack.py
Matt Drayer committed -
asadiqbal08/WL-242 - Marked strings on shopping cart pages for translations
Matt Drayer committed -
asadiqbal committed
-
asadiqbal committed
-
- 06 Jan, 2016 16 commits
-
-
Cristian Salamea committed
-
Add setting for pyfs xblock service to devstack.py
Piotr Mitros committed -
Amir Qayyum Khan committed
-
Calculator layout and help popup fixes
Adam committed -
Delete lettuce tests already converted to bok choy.
Christina Roberts committed -
TNL-3915
cahrens committed -
ECOM-3319 loading edx-icons fonts in studio programming author tool
AlasdairSwan committed -
2016-01-06 Release
Matt Drayer committed -
Fix failing condition for firefox 42.
Ben Patterson committed -
Release Candidate rc/2016-01-05
Matt Drayer committed -
AlasdairSwan committed
-
Disable Courseware JS from loading on Student Dashboard.
David Ormsbee committed -
- 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
Omar Al-Ithawi committed -
SOL-1182 / Bokchoy-test
Douglas Hall committed -
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 << ---------------------" ```
Ben Patterson committed -
Hasnain committed
-
- 05 Jan, 2016 2 commits
-
-
swdanielli committed
-
Using edx-search from PyPI
Clinton Blackburn committed
-