Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,422 Commits 1 Branch 0 Tags
45e80f7eee9600dbdc7a605fbca0a7a1df25db6a
Commit Graph

19422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Hansbrough
45e80f7eee Removed unused code 2013-11-13 20:57:19 +00:00
Julia Hansbrough
5a572bc0dd Fixed bug where Flash photo taker would fail 
LMS-1487
 2013-11-13 20:42:19 +00:00
Will Daly
ce6ac6538c Merge pull request #1657 from edx/will/devstack-logger-silence 
Silence noisy loggers in the devstack
 2013-11-13 08:44:54 -08:00
Will Daly
e6f0203aab Silence noisy loggers in the devstack 2013-11-13 10:52:03 -05:00
Diana Huang
32bc26c678 Merge pull request #1618 from edx/diana/certs-dashboard-update 
Certificates Dashboard Updates
 2013-11-13 07:16:15 -08:00
Will Daly
01b07abdfc Merge pull request #1650 from edx/will/wait-for-settings-menu 
Added wait for JS before clicking nav menus
 2013-11-13 07:06:23 -08:00
Will Daly
b84a3fdf28 Merge pull request #1654 from edx/will/disable-latex-test 
Disabled LaTeX acceptance test
 2013-11-13 06:30:10 -08:00
Will Daly
2a6754b8a6 Disabled LaTeX acceptance test 2013-11-13 08:05:21 -05:00
Usman Khalid
e370fb9585 Merge pull request #1502 from edx/usman/lms1355-wiki-permissions 
Stricter permissions for the wiki
 2013-11-13 02:44:14 -08:00
polesye
f9782ff370 Merge pull request #1617 from edx/anton/fix-speed-menu 
Video: Fix speed menu when YouTube is unavailable.
 2013-11-12 23:20:49 -08:00
Will Daly
35ec9d3105 Added wait for JS before clicking nav menus 2013-11-12 17:33:56 -05:00
Will Daly
218fc7b0bd Merge pull request #1649 from edx/will/fix-course-dates-test 
Fixed intermittent issue with course date acceptance test
 2013-11-12 14:16:01 -08:00
Will Daly
12bae4b7a3 Fixed intermittent issue with course date acceptance test 2013-11-12 16:45:08 -05:00
Jason Bau
59225b973d Merge pull request #1640 from edx/jbau/fix/remove-revision-from-middleware 
Jbau/fix/remove revision from middleware
 2013-11-12 13:16:51 -08:00
Usman Khalid
9542230afd Added granular permissions for managing wiki articles 
LMS-1355
 2013-11-13 01:40:23 +05:00
polesye
50674a966b BLD-457: Fix speed menu when YouTube is unavailable. 2013-11-12 21:44:06 +02:00
Calen Pennington
b6ad9c7f86 Merge pull request #1646 from cpennington/fix-pylint-count 
Run pylint against modules again, rather than against files
 2013-11-12 11:29:10 -08:00
Will Daly
71effb5369 Merge pull request #1602 from edx/will/local-dev-settings 
Added devstack settings
 2013-11-12 11:08:39 -08:00
Will Daly
b7dab70628 Added devstack settings 
Fixed pep8/pylint violations

Added email feature flags; use full names for pylint disables
 2013-11-12 13:48:29 -05:00
Calen Pennington
62656430db Run pylint against modules again, rather than against files 2013-11-12 13:16:27 -05:00
Valera Rozuvan
68c6a7c7e1 Merge pull request #1623 from edx/valera/fix_js_error_transcripts_editor_spec 
Fix JavaScript typo in transcripts editor spec.
 2013-11-12 08:37:55 -08:00
Ned Batchelder
2261d4c421 Merge pull request #1521 from edx/ned/quiet-mock-youtube-test-server 
Mock servers shouldn't pollute test output.
 2013-11-12 07:41:33 -08:00
Valera Rozuvan
bf9e525ef4 BLD-489: Fix JavaScript tests. 2013-11-12 17:39:29 +02:00
Diana Huang
aa8348a7ed Add in a new hook for people who are embargoed in the verified cert track. 
LMS-1477
 2013-11-12 10:25:04 -05:00
Ned Batchelder
c8e0fb2508 Mock servers shouldn't pollute test output. 
BY writing to stderr, BaseHTTPRequestHandler writes log messages to the
console during testing.  This makes the output harder to interpret.
Write the log messages to stdout instead, so that test runners will
suppress them during passing tests, and show them during failing tests.

It would be nice to have a place to write this method just once for the
Youtube and LTI mock servers, but we don't seem to have a place for code
as common as that.
 2013-11-12 10:19:19 -05:00
Will Daly
336d648eef Merge pull request #1644 from edx/will/remove-load-test 
Removed custom response load test
 2013-11-12 07:08:46 -08:00
Adam
3dfdab1a23 Merge pull request #1629 from edx/adam/fix/enrollment-count-intr-dash 
makes beta dash count active users in enrollment count [AN-115]
 2013-11-12 05:58:23 -08:00
Adam
dab25603f6 Merge pull request #1635 from edx/adam/edit-course-in-studio 
fixes Edit Course In Studio link on instr dash (LMS-1455)
 2013-11-12 05:57:55 -08:00
Gabe Mulley
c9b0568acc Merge branch 'release' 
Conflicts:
	cms/djangoapps/contentstore/views/item.py
 2013-11-12 08:41:42 -05:00
Will Daly
b55ffde4c3 Removed custom response load test 2013-11-09 20:26:28 -05:00
Jason Bau
bc32899c1b actually, just remove the revision 2013-11-08 15:16:26 -08:00
Jason Bau
2627db13a0 make edxapp work when not run from a git repo 2013-11-08 12:49:52 -08:00
Adam Palay
4d1eebc557 fixes Edit Course In Studio link on instr dash (LMS-1455) 
add DOC_STORE_CONFIG to test settings
 2013-11-08 15:42:51 -05:00
Julia Hansbrough
39105f7662 Merge pull request #1598 from edx/flowerhack/feature/command-retry-cert-submissions 
Command for retrying failed photo verifications
 2013-11-08 12:38:12 -08:00
Adam Palay
71b70bce61 makes beta dash count active users in enrollment count [AN-115] 2013-11-08 14:11:59 -05:00
Valera Rozuvan
0ad53f608a Revert "BLD-408: Don't allow users to enter video url's in http." 
This reverts commit 6cb5c3900f.
 2013-11-08 20:32:22 +02:00
Carlos Andrés Rocha
b72604d2bf Merge pull request #1615 from rocha/fix-external_auth-djangostore 
Fix error on external_auth djangostore
 2013-11-08 10:26:51 -08:00
Nick Parlante
58dccec570 Merge pull request #1603 from edx/nick/tab-edit 
Expand the edit_course_tabs help text
 2013-11-08 10:23:04 -08:00
Julia Hansbrough
f294920473 Merge pull request #1601 from edx/flowerhack/feature/course-modes-expire-datetime 
Added expiration_datetime field to CourseModes
 2013-11-08 09:54:16 -08:00
Will Daly
4e9de855d1 Merge pull request #1567 from edx/will/acceptance-test-asset-pipeline 
Acceptance tests use asset pipeline
 2013-11-08 09:39:19 -08:00
Calen Pennington
037da3212d Merge pull request #1531 from cpennington/lms-xblock-handlers 
Use XBlock handlers in the LMS ...
 2013-11-08 08:37:15 -08:00
Julia Hansbrough
3c7afb69d2 Response to CR 2013-11-08 16:27:42 +00:00
Calen Pennington
864d831ce3 Use XBlock handlers for handle_ajax in XModules 
Adds xblock handler_url support to the LMS, and makes handle_ajax use
that code.

[LMS-230] [LMS-229]
 2013-11-08 11:08:48 -05:00
Calen Pennington
8ddd8c14a4 Fix pylint/pep8 errors 2013-11-08 11:08:48 -05:00
Calen Pennington
da26ae2529 Remove lms/lib from sys.path in favore of using it as the module lms.lib 2013-11-08 11:08:48 -05:00
Brian Talbot
b2c12cfe04 LMS: revises certificate download copy 2013-11-08 10:54:46 -05:00
Waheed Ahmed
de8b378dd9 Merge pull request #1610 from waheedahmed/wah/bugfix/lms1265-import-jquery 
import jquery in reset password template
 2013-11-08 07:54:41 -08:00
Julia Hansbrough
05996a71df Added expiration_datetime field to CourseModes 
Added an expiration_datetime field to CourseModes, intended to eventually replace expiration_date.

Included relevant schema and data migration file.

LMS-1454
 2013-11-08 15:30:37 +00:00
David Ormsbee
a31ef26b78 Merge pull request #1249 from edx/fix/cdodge/progress-perf 
we are already being passed in the module descriptor so we don't need to...
 2013-11-08 07:28:56 -08:00
Carlos Andrés Rocha
28bc2e232f Fix error on external_auth djangostore 
Don't raise an exception when an association is not found.
 2013-11-07 18:37:09 -05:00