28951 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
cahrens	e30ea5c08b	Switch to api directory and improve error handling.	2015-03-09 12:51:43 -04:00
cahrens	c8a20df210	Combine account and profile into same API.	2015-03-05 16:13:49 -05:00
cahrens	450d9e37db	Limit PATCH to own user information.	2015-03-05 13:30:45 -05:00
David Baumgold	a37a50cf3b	Merge branch 'release'	2015-03-05 12:10:27 -05:00
Matt Drayer	f85d2451ef	Merge pull request #7231 from edx/mattdrayer/rename-migration-file ... Renamed conflicting migration file	2015-03-05 12:09:25 -05:00
Matt Drayer	df937f1feb	Renamed conflicting migration file	2015-03-05 10:21:03 -05:00
Matt Drayer	be77f8bf8c	Revert "Renamed conflicting migration file" ... This reverts commit 04429e77f0.	2015-03-05 10:16:43 -05:00
Matt Drayer	04429e77f0	Renamed conflicting migration file	2015-03-05 10:09:36 -05:00
David Baumgold	9dbadd716d	Merge pull request #7227 from edx/flask-test-videotimestest ... Mark VideoTimesTest.test_video_end_time_wo_default_start_time as flaky	2015-03-05 09:08:26 -05:00
ahsan-ul-haq	00899dd908	Merge pull request #7118 from edx/ahsan/tnl-1554-missing-accessible-label-with-lms-nav-elements ... Missing accessible label in lms <nav> elements.	2015-03-05 16:59:52 +05:00
Ben Patterson	1d00508671	Merge pull request #7147 from edx/benp/static-code-analysis-radon ... Benp/static code analysis radon	2015-03-05 06:48:25 -05:00
Ahsan Ulhaq	d116f84c12	Removed aria label from section tag	2015-03-05 15:13:21 +05:00
David Baumgold	a849657358	Mark VideoTimesTest.test_video_end_time_wo_default_start_time as flaky	2015-03-04 16:25:31 -05:00
David Baumgold	a70cabc10f	Merge pull request #7224 from edx/i18n-mixin-strings ... i18n some strings in LmsBlockMixin	2015-03-04 16:20:11 -05:00
Ben Patterson	38a9d33b1a	Merge pull request #7222 from edx/benp/disable-sol-449 ... Disable test that's too flaky for our flaky policy.	2015-03-04 15:46:11 -05:00
David Baumgold	6b90763d6b	i18n some strings in LmsBlockMixin	2015-03-04 14:58:05 -05:00
Ben Patterson	0c0e5163c0	Disable test that's too flaky for our flaky policy.	2015-03-04 14:45:21 -05:00
Will Daly	616f2bb0df	Merge pull request #7210 from edx/will/cert-error-management-command ... ECOM-1142: Management command for error certs.	2015-03-04 14:44:21 -05:00
Ned Batchelder	7641fbf5d9	Merge pull request #6505 from mitocw/cg/add_sga ... Add Staff Graded Assignments XBlock to edx-platform	2015-03-04 13:15:02 -05:00
Sarina Canelake	2a95fe6228	Merge pull request #7101 from openfun/fun/xblock-authoring-fix-settings-import ... Fixed an import issue with django settings - in xblock authoring module.	2015-03-04 11:23:40 -05:00
ahsan-ul-haq	635194a9eb	Merge pull request #7092 from edx/ahsan/tnl-1523-studio-footer-accessible-label-issue ... footer <nav> accessibility issue	2015-03-04 21:01:41 +05:00
ahsan-ul-haq	4ee02e2317	Merge pull request #7098 from edx/ahsan/tnl-1531-inaccessible-label-for-page-action-nav-studio ... Inaccessible label for the page action Navigation	2015-03-04 21:01:15 +05:00
ahsan-ul-haq	52ab7ec545	Merge pull request #7100 from edx/ahsan/tnl-1532-course-settings-nav-accessibility-issue ... Course settings nav accessibility issue Studio	2015-03-04 21:00:52 +05:00
ahsan-ul-haq	edb3055207	Merge pull request #7185 from edx/ahsan/tnl-1567-no-main-region-landmark-student-dashboard ... No "Main" region landmark on Student Dashboard	2015-03-04 21:00:24 +05:00
Ned Batchelder	0b87cef232	Merge pull request #7220 from edx/ned/diff-cover-moved ... Diff-cover moved	2015-03-04 10:52:08 -05:00
Ned Batchelder	ed2544388a	Diff-cover moved	2015-03-04 10:51:38 -05:00
Carson Gee	da9154d10e	Add Staff Graded Assignments XBlock to edx-platform	2015-03-04 10:35:54 -05:00
Christine Lytwynec	7676693f4d	Merge pull request #7188 from edx/clytwynec/TE-769 ... fix bok-choy reporting on failure	2015-03-04 10:30:07 -05:00
Christina Roberts	0eed96c2f3	Merge pull request #7215 from edx/christina/full_name_bug ... Correctly point to MAX_LENGTH instead of MIN_LENGTH.	2015-03-04 09:27:13 -05:00
Matt Drayer	119d761cbf	Merge pull request #7082 from edx/ziafazal/skip-entrance-exam-am ... Skip entrance exam feature on instructor dashboard	2015-03-04 07:53:52 -05:00
Will Daly	13cb2c2834	ECOM-1142: Management command for error certs. ... Add a management comand to regenerate certificates with status 'error', optionally restricted to a subset of courses.	2015-03-04 07:51:38 -05:00
Zia Fazal	e21ff20375	backend changes based on feedback ... Conflicts: lms/djangoapps/courseware/courses.py lms/djangoapps/instructor_task/api.py refined entrance exam student attempts reset Quality improvements 1/16 added rescore, delete state and task history functionality added unit tests for entrance exam reset attempts added unit tests for re scoring of entrance exam and task history improved test coverage Got rid of pep violation feedback changes and added jasmine test added more jasmine tests for Javascript changes added bok-choy tests for UI changes replaced input containing <p> tags with <label> Removed ee element assertions to avoid js error Added call to super.setUp() changes based on feedback on 2/18 Writing tests in JS instead of coffee script commit related to skip entrance exam 2/13 fixed bad-continuation quality error fixed broken bok-choy test changes based on feedback on 2/18 added js tests and removed coffee script tests fixed broken bok-choy and unit tests changes left while rebasing rephrase test titles do not need these libs changes based on feedback on 2/24 changes text which was left Changes based on feedback on 3/3	2015-03-04 15:32:56 +05:00
Andy Armstrong	1baaf724f8	Merge pull request #7213 from edx/andya/rc-profile-visibility-fix ... Default profile visibility to off for now	2015-03-03 18:32:35 -05:00
Andy Armstrong	6f118a3d8f	Default profile visibility to off for now	2015-03-03 17:52:24 -05:00
cahrens	167bd05ac8	Add bok choy coverage for correctly displayed name and email address.	2015-03-03 17:16:47 -05:00
David Baumgold	67418be9e7	Merge pull request #7214 from edx/clintonb/celery-task-name ... Explicitly naming task	2015-03-03 17:06:35 -05:00
cahrens	84d91a7901	Correctly point to MAX_LENGTH instead of MIN_LENGTH. ... Bug introduced in recent commit.	2015-03-03 16:16:20 -05:00
Clinton Blackburn	ebc9c75e36	Explicitly naming task ... This should prevent errors due to relative imports. See http://docs.celeryproject.org/en/latest/userguide/tasks.html#automatic-naming-and-relative-imports for additional information.	2015-03-03 15:59:19 -05:00
Will Daly	7bad603978	Merge pull request #7076 from edx/will/deprecate-embargo ... Deprecate old embargo implementation.	2015-03-03 15:54:41 -05:00
Christine Lytwynec	26d361aca8	Merge pull request #7202 from edx/clytwynec/store_pep8_and_pylint_violation_counts_to_files ... Store count of pep8 and pylint violations to files in reports dir	2015-03-03 14:34:19 -05:00
Jim Abramson	c351eaf18e	Merge pull request #7081 from open-craft/nonunique-discussion-targets ... Fix issues with non-unique discussion targets	2015-03-03 12:07:26 -05:00
Adam	ff72eada92	Merge pull request #7206 from edx/merge-release-to-master ... Merge release to master	2015-03-03 11:46:36 -05:00
Sarina Canelake	ba36a26df4	Merge pull request #7207 from delftswa2014/doc_links ... added links to docs for listed libraries in overview.md	2015-03-03 11:36:09 -05:00
Ben Patterson	375a996dc7	Merge pull request #7200 from edx/benp/flaky-SettingsMilestoneTest-bokchoy ... Flag test as flaky. SOL-449.	2015-03-03 11:14:10 -05:00
Nimisha Asthagiri	818d59e820	Merge pull request #7197 from edx/bnotions/social-features ... Bnotions/social features	2015-03-03 11:03:44 -05:00
Adam Palay	b35e43377a	Merge remote-tracking branch 'origin/release' into merge-release-to-master ... Conflicts: requirements/edx/github.txt	2015-03-03 11:00:16 -05:00
Adam	e9fed1736e	Merge pull request #7201 from edx/hotfix/2015-03-03 ... update ora2 hash to address (TNL-1350)	2015-03-03 10:56:25 -05:00
Matjaz Gregoric	639ab0dc70	Fix issues with duplicate discussion targets. ... When two or more instances of Discussion XBlock were configured with the same discussion target (Category/Subcategory), only one of the blocks would be shown on the Course Discussion page. This was the source of several bugs when trying to edit discussion threads. This patch adds incrementing numbers to the title of each duplicate subcategory when rendering the Course Discussion to make sure that all of the threads are visible in Course Discussion.	2015-03-03 23:55:15 +08:00
Christine Lytwynec	8919d3f8f7	Store count of pep8 and pylint violations to files in reports dir	2015-03-03 10:47:22 -05:00
Mayank Jain	70db28bbcf	added links to docs pages in overview readme	2015-03-03 16:04:55 +01:00