Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
28,975 Commits 1 Branch 0 Tags
a79bf683b0cc1a05646abfc973b89084aa38f6c7
Commit Graph

28975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Friedman
a79bf683b0 Fix failing forums unit test. 2015-03-06 11:09:12 -05:00
Ned Batchelder
0e171be261 Merge pull request #7246 from cguardia/patch-1 
Add empty introspection rule for BlockTypeKeyField.
 2015-03-06 10:21:10 -05:00
Ned Batchelder
f8c9fdf6c8 Merge pull request #7196 from edx/ned/tweaked-pylintrc 
Use 'edx_lint write' to create our pylintrc from pylintrc_tweaks
 2015-03-06 09:50:59 -05:00
David Baumgold
dca05a6095 Merge branch 'release' 2015-03-06 08:54:22 -05:00
David Baumgold
849388398c Merge pull request #7244 from edx/jsa/hotfix-forums 
Revert "Merge pull request #6771 from edx/dan-f/forums-filter-discussion...
 2015-03-06 08:51:03 -05:00
Awais Qureshi
d1af8f354d Merge pull request #7247 from edx/awais786/ECOM-1158-upgrade-page 
Awais786/ecom 1158 upgrade page
 2015-03-06 18:50:28 +05:00
Awais
c8ae32e628 ECOM-1158 fixing astrophysique in html. 2015-03-06 15:12:41 +05:00
Xavier Antoviaque
7338cc1286 Merge pull request #7148 from open-craft/library-selector 
Show a select box when editing a library content block (SOL-123)
 2015-03-06 09:16:02 +01:00
zubair-arbi
41f08055a4 Merge pull request #7018 from edx/zub/bugfix/tnl-1331-unique_users_in_cohort_group 
use 'commit_on_success' transaction decorator to avoid registering users...
 2015-03-06 12:23:25 +05:00
Carlos de la Guardia
c04e76e62a Update AUTHORS 2015-03-06 00:45:00 -06:00
Carlos de la Guardia
baa1b05eb7 Add empty introspection rule fro BlockTypeKeyField. 
From 0.7 on, South requires explicit introspection rules. Previously, it used the parser module to introspect.
 2015-03-05 22:34:29 -06:00
jsa
13ba2c4a57 Revert "Merge pull request #6771 from edx/dan-f/forums-filter-discussion-modules" 
This reverts commit 086a2ba783, reversing
changes made to a44132ec18.  Some minor
code quality issues were addressed as part of this change.

Conflicts:
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/django_comment_client/utils.py
 2015-03-05 16:57:46 -05:00
cahrens
5802e17cf3 Disable new user APIs in production. 2015-03-05 16:09:28 -05:00
John Eskew
4cb4557176 Merge pull request #7151 from open-craft/ekolpakov/settings-service 
SettingsService for accessing django settings from XBlock
 2015-03-05 15:56:11 -05:00
ahsan-ul-haq
c430eaed55 Merge pull request #7086 from edx/ahsan/tnl-1520-studio-nav-label-accessibility-issue 
Studio header nav label accessibility issue
 2015-03-06 00:27:06 +05:00
Will Daly
1a6b474dd3 Merge pull request #7239 from edx/hotfix/ecom-1169 
Fix callback URL for certificate generation tasks
 2015-03-05 14:03:39 -05:00
Will Daly
d1b9bbf211 Fix callback URL for certificate generation tasks 2015-03-05 13:52:23 -05:00
David Baumgold
6fd4d2fdc3 Merge pull request #7229 from edx/hotfix/2015-03-05 
Fix 500 errors on video upload page
 2015-03-05 13:08:15 -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
E. Kolpakov
c225d86e83 SettingsService for accessing server-wide settings from XBlock 2015-03-05 18:24:47 +03: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
4b92a16689 add generic sr for <h2> 2015-03-05 15:38:20 +05:00
zubair-arbi
969bfa5916 use 'commit_on_success' transaction decorator to avoid registering users in multiple cohort groups of a particular course 
TNL-1331
 2015-03-05 15:19:57 +05:00
Ahsan Ulhaq
d116f84c12 Removed aria label from section tag 2015-03-05 15:13:21 +05:00
Greg Price
83c474622e Fix 500 errors on video upload page 
Some status strings were accidentally tuples thanks to stray commas, and
ugettext raised an exception as a result.

JIRA: MA-323
 2015-03-04 18:15:48 -05:00
Braden MacDonald
2e0beac378 Update some strings to reflect the new behaviour 2015-03-04 13:38:55 -08:00
Braden MacDonald
93e5a56d79 Show a select box when editing a library content block 2015-03-04 13:32:15 -08: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