Commit Graph

34675 Commits

Author SHA1 Message Date
Bill DeRusha
e47e65d04a Merge pull request #11267 from edx/bderusha/rel-enrollment-cmd-updates
Update change_enrollment management command to be more robust and tested
2016-01-19 15:48:17 -05:00
Bill DeRusha
ecae21e66c Update change_enrollment management command to be more robust and tested 2016-01-19 15:06:18 -05:00
Edward Zarecor
b70198f914 Merge pull request #11225 from edx/patch/2016-01-14
Removing CDN RPC
2016-01-14 12:08:28 -05:00
Edward Zarecor
546610084c Removing CDN RPC
CR comments

Whitespace

wip test refactoring

more test refactoring

Re-write download URL too.

Test fixes related to download change, and fix

wip, re-locating tests

update classname

Quality fixes
2016-01-13 21:46:57 -05:00
Douglas Hall
8d06679681 Merge pull request #11203 from edx/hotfix/2016-01-12
HOTFIX 2016-01-12
2016-01-12 14:58:57 -05:00
Jesse Zoldak
157bd19e20 Clear out the bok choy DB with reset_db, not flush 2016-01-12 11:33:02 -05:00
M. Rehan
0b685d8983 fix for course number display string as none 2016-01-12 09:49:18 -05:00
muzaffaryousaf
b4189784da Fixed POST bookmarks bug when display_name is None.
Added tests & general message to js when parsing fails.

TNL-3989
2016-01-12 09:47:51 -05:00
Douglas Hall
2c00004d4b Updated edx-proctoring requirement to fix PHX-242 2016-01-12 09:36:35 -05:00
Mark Sadecki
dd6dc0195e Merge pull request #11180 from edx/rc/2016-01-12
Release Candidate rc/2016-01-12
2016-01-12 09:10:30 -05:00
Adam
aacad7e992 Merge pull request #11191 from edx/revert-10648-edraak/calculator-fixups-rc
@Revert 10648 edraak/calculator fixups
2016-01-11 13:49:10 -05:00
Adam
e4ab6dc2c3 Revert "Calculator layout and help popup fixes" 2016-01-11 12:47:05 -05:00
David Ormsbee
95434f7b3c Merge pull request #11183 from edx/ormsbee/fix_atomic_thumbnail_error
Prevent course image thumbnail race condition from causing TransactionManagementError
2016-01-11 09:17:36 -05:00
David Ormsbee
c4b0c7b483 Move test_get_all_courses_by_mobile_available to CourseOverviewTestCase
It somehow ended up in CourseOverviewImageSetTestCase (merge artifact?).
2016-01-11 04:30:44 -05:00
David Ormsbee
0e70676ba7 Prevent course image thumbnail race condition.
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.
2016-01-11 04:30:35 -05:00
Toby Lawrence
936c431096 Merge pull request #11181 from edx/perf-224-migrations
Add the migrations necessary for asset base URL support.
2016-01-08 14:51:37 -05:00
Toby Lawrence
fb984206cf Add the migrations necessary for asset base URL support. 2016-01-08 13:16:50 -05:00
Peter Fogg
bf2f8ca8d5 Merge pull request #11176 from edx/peter-fogg/revert-enrollment-api-changes
Revert "Add options trailing slashes to the Enrollment API."
2016-01-08 10:30:46 -05:00
David Baumgold
80836087f7 Merge pull request #11165 from edx/remove-header_extra.html
Remove unused header_extra.html file
2016-01-08 10:00:37 -05:00
Peter Fogg
17a69a30e4 Revert "Add options trailing slashes to the Enrollment API."
This reverts commit 3149aaa319.
2016-01-08 09:47:39 -05:00
Matt Drayer
59c913985f Merge pull request #11173 from edx/asadiqbal08/WL-269
WL-269 used gettext(...) in .underscores files.
2016-01-08 09:41:17 -05:00
Peter Pinch
e5943feecc Merge pull request #11124 from mitocw/fix/aq/progress_of_student_ccx
Allowed CCX coaches to see individual students progress from grade book
2016-01-08 09:32:05 -05:00
Amir Qayyum Khan
c0a131e5d6 Allowed ccx coaches to see individual students progress from grade book 2016-01-08 16:05:33 +05:00
asadiqbal
323b9193d6 WL-269 used gettext in .underscores 2016-01-08 12:35:24 +05:00
Jim Abramson
8d3fe51809 Merge pull request #11170 from edx/jsa/programs-app-username
add username to program app config attrs in DOM.
2016-01-07 17:59:42 -05:00
jsa
5ae8f5be23 add username to program app config attrs in DOM. 2016-01-07 16:21:19 -05:00
Peter Pinch
91be959bb7 Merge pull request #10878 from mitocw/refactor/aq/move_code_from_view
CCX app refactoring. Moved some code to utils.py from views.py
2016-01-07 15:26:33 -05:00
David Baumgold
562079460b Merge pull request #11154 from ovnicraft/patch-2
Remove duplicate import
2016-01-07 11:57:23 -05:00
David Baumgold
032305df3d Remove unused header_extra.html file 2016-01-07 11:45:16 -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
Cristian Salamea
3725472034 Remove duplicate import 2016-01-06 18:49:57 -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
Amir Qayyum Khan
6c01c85be9 Moved code to utility from views ccx 2016-01-07 02:52:45 +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