34039 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ben Patterson	abcf33aba4	Merge pull request #10757 from edx/benp/mp-support-discussion-tab ... Support multiprocess bok-choy testing for discussion	2015-12-01 08:23:02 -05:00
Matt Drayer	f5d9f2829e	Merge pull request #10759 from edx/ziafazal/SOL-1439 ... SOL-1439: removed certificates delivered dependency on certificate eligibility	2015-12-01 08:19:38 -05:00
Matt Drayer	6fca86a736	Merge pull request #10777 from edx/saleem-latif/SOL-1466 ... SOL-1466: Make sure web view renders certs only if downloadable.	2015-12-01 08:17:52 -05:00
wajeeha-khalid	11f34c1e8c	Merge pull request #10736 from edx/jia/MA-1211 ... MA-1211; Discussion API - make boolean params case insensitive	2015-12-01 18:11:18 +05:00
Douglas Hall	7bb6653d93	Merge pull request #10775 from edx/task/douglashall/fix_xblock_utils_requirement ... Do not install xblock-utils in editable mode	2015-12-01 06:56:20 -05:00
Zia Fazal	34d630eacf	removed certificates delivered dependency on certificate eligibility ... split variables on multiple lines changes after feedback from Afzal	2015-12-01 16:24:06 +05:00
Saleem Latif	37f10a3846	Make sure web view renders certs only if downloadable.	2015-12-01 16:10:05 +05:00
Aamir	a0db0d8297	Merge pull request #10520 from edx/aamir-khan/ECOM-1447-login-error-message ... Aamir khan/ecom 1447 login error message	2015-12-01 11:44:31 +05:00
wajeeha-khalid	092cc4b278	MA-1211; Discussion API - make boolean params case insensitive	2015-12-01 11:25:27 +05:00
Douglas Hall	b43c2b23e9	Do not install xblock-utils in editable mode	2015-11-30 19:15:18 -05:00
Bill DeRusha	8c69f22689	Merge pull request #10722 from edx/bd/sp-init ... Initial migrations for verified deadlines for self paced	2015-11-30 16:28:25 -05:00
Douglas Hall	63bee2a8ad	Merge pull request #10600 from edx/task/douglashall/PHX-201/xblock_lti_consumer ... Sprint Solutions:Zug PHX-200 PHX-201 Adding LTI consumer XBlock to requirements	2015-11-30 16:18:14 -05:00
Nimisha Asthagiri	8c4eefd53f	Merge pull request #10724 from edx/mobile/support-web-certs-MA-1667 ... MA-1667: Update Mobile API to support Web Certificates	2015-11-30 14:41:47 -05:00
Kevin Falcone	bd0fc0a55c	Merge pull request #10743 from edx/jibsheet/requirements-devops ... Suggest the devops group alias, rather than individual names	2015-11-30 12:54:29 -05:00
Douglas Hall	74c19c2854	Adding LTI consumer XBlock to requirements; Updating xblock-utils requirement	2015-11-30 11:58:51 -05:00
Bill DeRusha	78896c60b5	Initial migrations for verified deadlines for self paced	2015-11-30 10:30:23 -05:00
Ben Patterson	a066856824	Merge pull request #10702 from edx/benp/ownlearner-mp-support ... OwnLearnerProfile multiprocessing support	2015-11-28 14:27:05 -05:00
Ben Patterson	4349f931aa	Merge pull request #10700 from edx/benp/cohort-mp-fixes ... Make cohort management tests multiprocess capable.	2015-11-28 14:26:08 -05:00
Ben Patterson	64234c3ae0	Support multiprocess testing. ... This fixes a flaky condition that is only exposed when tests are run in multiprocessing mode.	2015-11-28 10:40:13 -05:00
Ben Patterson	0071c9d322	OwnLearnerProfile tests multiprocessing support. ... Fix a flaky test condition that only occurs in multiprocessing mode. Make the page definition more specific; the previous implementation would not fully render all objects in time. Avoid race condition related to events order (in faster, multiprocess testing, the order is not exactly the same since some events arrive at once).	2015-11-28 10:08:49 -05:00
Ben Patterson	2b61cfb1a2	Use unicodecsv. ... Add scenario for testing unicode cohort. Verifying the events is a TODO because the verification method will need to be refactored to handle an additional cohort that's not included in setUp. (Or refactor the setup, or refactor the unicode test, etc.)	2015-11-28 10:07:12 -05:00
Ben Patterson	e512a50649	Use helper method for generating unique user identities.	2015-11-28 10:07:12 -05:00
Ben Patterson	bed5d3e8df	Remove unnecessary files, use generic file for unrelated test.	2015-11-28 10:06:10 -05:00
Ben Patterson	484a4f2b66	Make cohort management tests multiprocess-friendly.	2015-11-28 10:05:48 -05:00
Ahsan Ulhaq	a4b04faf19	Merge pull request #10735 from edx/ahsan/ECOM-2993-Help-text-update-for-full-name ... Help text update for full name	2015-11-27 15:14:08 +05:00
Syed Hasan raza	b8477cc77a	Merge pull request #9700 from edx/shr/bug/AN-4509-Unicode-Decode-Error ... LoggerBackend encoding for json dumps	2015-11-27 14:54:41 +05:00
raeeschachar	3198c040e5	Merge pull request #10754 from edx/raees/chrome-bok-choy-test-create-library ... Fixed test create library failing on chrome	2015-11-27 13:15:03 +05:00
Syed Hassan Raza	0f67d19a2c	Add logging for UnicodeDecodeError excpetion LoggerBackend	2015-11-27 12:07:03 +05:00
raeeschachar	291a5c35ca	Fixed test create library failing on chrome	2015-11-26 22:33:29 +05:00
Brian Beggs	89a7e42576	Merge pull request #10742 from edx/bbeggs/acceptance-test-migration-fix ... Migrations will now run during Acceptance tests	2015-11-26 09:34:51 -05:00
Zia Fazal	46150800c0	Merge pull request #10737 from edx/ziafazal/SOL-1433 ... SOL-1433:remove audit course mode	2015-11-26 13:46:33 +05:00
wajeeha-khalid	6e5e185b4e	Merge pull request #10738 from edx/jia/MA-1593 ... MA-1593; include post in comment count	2015-11-26 11:18:30 +05:00
Clinton Blackburn	35639e772b	Merge pull request #10744 from edx/clintonb/credit-migration ... Updated credit migration for CreditProvider.provider_id	2015-11-25 16:55:48 -05:00
Jim Abramson	8f4c2264a1	Merge pull request #10701 from edx/renzo/studio-programs-tab ... Add Programs tab to Studio	2015-11-25 16:37:34 -05:00
Nimisha Asthagiri	115ab3c11b	Merge pull request #10720 from edx/mobile/course-about-url-MA-1712 ... MA-1712: Update Mobile API to include course_about	2015-11-25 15:38:45 -05:00
Brian Beggs	1354a0c338	Updated edx-organizations version to fix migration related issues	2015-11-25 14:59:47 -05:00
Renzo Lucioni	70d57327eb	Add Programs tab to Studio ... Extends the Programs ConfigurationModel, cleans up Programs-related utilities and corresponding tests, and corrects caching. Uses the Programs API to list programs within Studio. ECOM-2769.	2015-11-25 14:56:50 -05:00
Clinton Blackburn	c6bfac720f	Updated credit migration for CreditProvider.provider_id ... There is no need for a separate migration for the validation. Updated the regex in the initial migration to appease Django. ECOM-2609	2015-11-25 14:52:34 -05:00
Brian Beggs	40af1987aa	recreating the lettuce cache database	2015-11-25 14:11:54 -05:00
Nimisha Asthagiri	0b90326470	MA-1667: Update Mobile API to support Web Certificates	2015-11-25 13:49:27 -05:00
Nimisha Asthagiri	330120bb7a	MA-1712: Update Mobile API to include course_about	2015-11-25 13:48:45 -05:00
Kevin Falcone	bd515185f8	Instead of listing devops, use our group	2015-11-25 13:47:56 -05:00
Brian Beggs	3d204a87f2	updated paver command to fake migrations when the DB exists	2015-11-25 13:24:08 -05:00
Brian Beggs	0954bd0928	Migrations will now run during Acceptance tests	2015-11-25 12:57:02 -05:00
Ned Batchelder	ae50d4d6fb	Merge pull request #10730 from edx/ned/github-txt-instructions ... Add instructions to github.txt	2015-11-25 12:47:25 -05:00
Jesse Zoldak	83979f35f7	Merge pull request #10740 from edx/zoldak/quiet-pip-uninstalls ... Disable the pip version check message for uninstalls	2015-11-25 11:43:43 -05:00
Jesse Zoldak	c5be59d8c7	Disable the pip version check message for uninstalls	2015-11-25 10:45:20 -05:00
Zia Fazal	984af512b3	Merge pull request #10656 from edx/saleem-latif/SOL-1390 ... SOL-1390: Cert Exceptions: View and Edit Exception list	2015-11-25 18:03:33 +05:00
Zia Fazal	aa529fe0b6	remove audit course mode ... removed print statement	2015-11-25 17:58:30 +05:00
Clinton Blackburn	c474ce645d	Merge pull request #10634 from edx/clintonb/credit-api-drf ... Rewrote Credit API	2015-11-25 07:58:30 -05:00