Diana Huang
90ad574314
Fix up acceptance tests for upsell.
...
LMS-1127
2013-10-25 15:29:44 -04:00
David Baumgold
dc589f723c
Merge remote-tracking branch 'origin/release'
2013-10-25 15:29:03 -04:00
Diana Huang
9c65d97f0a
Add new acceptance test for complete upgrade flow
2013-10-25 15:25:30 -04:00
Diana Huang
4efe4ecd11
Add acceptance tests.
2013-10-25 15:21:42 -04:00
Diana Huang
e13dd094af
Add an upgrade parameter to the verification views.
2013-10-25 15:21:42 -04:00
Calen Pennington
c3d25e1e61
Prevent unbounded nesting of lms field_datas
...
Previously, whenever a XModule was created from a XDescriptor, we
created another level of nesting of FieldData objects. This change
prevents that nesting.
[TKTS-393]
2013-10-25 12:21:05 -04:00
Carlos Andrés Rocha
7d76f36018
Make course xml export work for all modulestores
...
Also let xml import work on modulestores that don't use write signaling
2013-10-25 11:58:17 -04:00
Julia Hansbrough
4261569215
Fixing accessibility bug where users could not tab through on wiki
...
LMS-1307
2013-10-25 13:10:14 +00:00
Joe Blaylock
9e76c6120b
Merge pull request #1286 from edx/jrbl/certs-single-user
...
Certificates: Add regeneration command
2013-10-24 11:59:32 -07:00
Alexander Kryklia
ee02a2dd97
Merge pull request #1421 from edx/anton/metadata-time-field
...
Anton/metadata time field
2013-10-24 05:50:13 -07:00
Sarina Canelake
185cf42e8f
Merge pull request #1462 from edx/sarina/adjust-email-template
...
Change footer color in bulk email template
2013-10-23 14:59:12 -07:00
Jay Zoldak
45f87b30c0
Improve problems acceptance tests. Disable brittle video test.
2013-10-23 13:53:11 -04:00
Sarina Canelake
90baa0c9af
Change footer color in bulk email template
2013-10-23 11:37:51 -04:00
brianhw
e1b39774de
Merge pull request #1458 from edx/brian/email-dupe-retry
...
Check for requeued subtasks when in RETRY state.
2013-10-23 07:04:37 -07:00
Alexander Kryklia
0da81e2a56
Update IsoTIme to be timedelta and update tests.
2013-10-23 13:03:55 +03:00
polesye
6c08708131
Merge pull request #1111 from edx/anton/video_subtitles
...
Add Timed Transcripts Editor.
2013-10-23 02:38:39 -07:00
Greg Price
bfd2957194
Merge pull request #1457 from edx/gprice/add-newrelic-instrumentation
...
Add newrelic instrumentation to forum views
2013-10-22 15:23:15 -07:00
Brian Wilson
16b85c0c2a
Check for requeued subtasks when in RETRY state.
2013-10-22 18:17:00 -04:00
Greg Price
85f5c9328f
Add newrelic instrumentation to forum views
2013-10-22 14:51:38 -04:00
Greg Price
60306f2471
Remove unnecessary login_required decorator
2013-10-22 14:51:38 -04:00
Anton Stupak
aecc20af6b
Add Timed Transcripts Editor.
2013-10-22 21:45:03 +03:00
Brian Wilson
a7b5663c4d
Add cache-based locking to subtasks to ensure that the same task is not running in two workers at the same time.
2013-10-22 14:35:06 -04:00
Brian Wilson
ecb58e863f
Add cache-based locking to subtasks to ensure that the same task is not running in two workers at the same time.
2013-10-22 14:32:52 -04:00
Jay Zoldak
ecea49ba2d
Refactor wait_for methods in ui_helpers for acceptance tests.
2013-10-21 17:14:01 -04:00
Will Daly
854a564a73
Fixed navigation acceptance test
...
Disable jquery animations to fix LMS navigation acceptance test.
2013-10-21 10:31:27 -04:00
Will Daly
a632377620
Merge pull request #1420 from edx/will/quarantine-lms-nav-tests
...
Temporarily disable navigation feature due to flakiness.
2013-10-21 06:12:50 -07:00
Calen Pennington
12cc4a19c0
Merge pull request #1224 from cpennington/lms-xblock-js-execution
...
Add an XBlock javascript runtime, and use it to run XModules
2013-10-21 05:53:36 -07:00
Will Daly
7e6a52a528
Temporarily disable navigation feature due to flakiness.
2013-10-21 08:51:01 -04:00
Calen Pennington
ce6fbae693
Add an XBlock javascript runtime, and use it to run XModules
...
[LMS-57]
2013-10-18 16:31:32 -04:00
Brian Wilson
ba6477abef
Handle all exceptions returned by django-ses.
2013-10-18 15:12:07 -04:00
Jay Zoldak
159f020d9d
Merge pull request #1399 from edx/zoldak/fix-lms-navigation-tests
...
Change logic for section selection in navigation tests.
2013-10-18 11:47:21 -07:00
brianhw
f831a0adcb
Merge pull request #1406 from edx/post-release-2013-10-17-master
...
Post release 2013 10 17 master
2013-10-18 11:16:24 -07:00
Brian Wilson
aa172272f3
Update master with hotfixes from release-2013-10-17.
2013-10-18 11:50:42 -04:00
Jay Zoldak
494a618c1a
Change logic for section selection in navigation tests.
2013-10-18 09:38:20 -04:00
Ned Batchelder
d3c7c0834d
Simple cleanups of DictFieldData
...
I tried to make DictFieldData strict about only being used with one
block. That effort failed ultimately, but these are reasonable changes
I made along the way.
2013-10-18 04:51:42 -04:00
Gabe Mulley
c1450c8375
Merge pull request #1349 from mulby/gabe/course-id-context
...
add course_id to all emitted events
2013-10-17 15:45:37 -07:00
Jason Bau
e5cda013a2
Merge pull request #1357 from edx/jbau/shoppingcart-user-middleware
...
Jbau/shoppingcart user middleware
2013-10-17 15:41:11 -07:00
Gabe Mulley
d2b03e28fb
add course_id to event context
2013-10-17 17:44:01 -04:00
Greg Price
0138322c2b
Merge pull request #1371 from edx/gprice/cs-request-logging
...
Log all comments service requests
2013-10-17 14:32:04 -07:00
Jason Bau
7223bb125e
make condition inline
2013-10-17 14:21:44 -07:00
Sarina Canelake
b3faf5c476
Merge pull request #1390 from edx/sarina/disable-student-email-settings-with-auth
...
Student Dash: Disable "Email Settings" when course isn't authorized
2013-10-17 12:17:58 -07:00
Sarina Canelake
9fb1d9ecf2
Remove 'Email Settings' link on student dashboard for unauth courses
2013-10-17 15:10:47 -04:00
brianhw
ff7d906d07
Merge pull request #1388 from edx/brian/fix-email-subtask-dupes
...
Check that a subtask has not already completed before running.
2013-10-17 11:22:21 -07:00
Sarina Canelake
582e21b92d
Course Auth tests for legacy dash
2013-10-17 13:49:42 -04:00
Sarina Canelake
951837f7c9
Catch email exceptions on the legacy dash
2013-10-17 13:39:13 -04:00
Brian Wilson
a699674015
Check that a subtask has not already completed before running.
2013-10-17 13:32:44 -04:00
Don Mitchell
978c19dd2c
Merge pull request #1325 from edx/dhm/paginate_assets
...
Add asset pagination
2013-10-17 07:16:09 -07:00
Don Mitchell
214a3bd251
pylint/pep8 cleanups
2013-10-17 09:52:13 -04:00
Will Daly
17d8bd219a
Merge pull request #1319 from edx/will/enable-bulk-email-tests
...
Enable and update bulk email acceptance test
2013-10-17 05:44:48 -07:00
David Ormsbee
fc320ffef0
Merge pull request #1334 from edx/fix/ichuang/instructor-dashboard-grades-for-assignment
...
Fix/ichuang/instructor dashboard grades for assignment
2013-10-17 03:43:17 -07:00
