Jay Zoldak
ecea49ba2d
Refactor wait_for methods in ui_helpers for acceptance tests.
2013-10-21 17:14:01 -04:00
David Baumgold
3688f221e3
password reset pages use Django templates, not Mako
2013-10-21 14:52:41 -04:00
Carlos Andrés Rocha
0be9daf9d5
Merge pull request #1419 from rocha/fix-config-root-env
...
Fix error when reading tokens on aws configuration
2013-10-21 08:24:15 -07:00
Will Daly
bd812a62b7
Merge pull request #1422 from edx/will/fix-nav-tests
...
Fixed navigation acceptance test
2013-10-21 08:21:06 -07:00
Calen Pennington
405d42cde3
Merge pull request #1423 from cpennington/fix-lms-cms-dev
...
Fix `rake lms[cms.dev]`
2013-10-21 07:58:09 -07: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
e0d
fb62f0c52a
Merge pull request #1417 from edx/e0d/config-fix
...
E0d/config fix
2013-10-21 07:29:52 -07:00
Calen Pennington
3e59f3af40
Fix rake lms[cms.dev]
2013-10-21 09:26:57 -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
Carlos Andrés Rocha
b764b9b4cf
Fix error when reading tokens on aws configuration
...
The error was caused by the CONFIG_ROOT environmental variable,
which was incorrectly assumed to be a path.py valid path.
2013-10-21 03:19:22 -04:00
jmclaus
1810022d73
Caption functionality announced when tabbing to list
2013-10-20 21:56:12 +02: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
e0d
5995a76254
sanity restored.
2013-10-18 16:26:23 -04:00
e0d
a008cc6b74
path fix.
2013-10-18 16:12:51 -04:00
e0d
6700a3ec14
Fixes for the AWS environment config.
2013-10-18 15:56:15 -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
Ned Batchelder
009b3e9c50
Merge pull request #1403 from edx/ned/small-dictfielddata-cleanups
...
Simple cleanups of DictFieldData
2013-10-18 11:02:38 -07:00
Giulio Gratta
19d3e31d97
Merge pull request #1332 from edx/giulio/register-page
...
Change various text items to be more clear for users, as well as some grammar
2013-10-18 11:02:00 -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
Don Mitchell
8fe99a6be2
Revert "Revert "Merge pull request #1240 from edx/dhm/config_separation""
...
This reverts commit a517dc2085
2013-10-18 09:22:30 -04:00
Will Daly
7aff8a7791
Merge pull request #1362 from edx/will/acceptance-test-logs
...
Write Django logs to file during acceptance tests
2013-10-18 05:07:53 -07: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
Giulio Gratta
6accfcd567
change various text items to be more clear for users, as well as some grammar
2013-10-17 13:18:58 -07:00
Brian Talbot
58548af9c7
LMS - revises pipeline vendor file references
2013-10-17 15:55:37 -04: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
bec6be1b9b
Merge pull request #1389 from edx/sarina/error-catch
...
Catch email exceptions on the legacy dash
2013-10-17 11:03:57 -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 Talbot
25b24bef2b
LMS: revises IE banner logic to show for IE9 as well
2013-10-17 13:38:02 -04:00
Brian Talbot
73f2cdf670
LMS: syncs up IE warning banner UI with new IE detection technique
2013-10-17 13:38:02 -04:00
Brian Talbot
1c7882a6bb
LMS: syncs up edge-based view with new pipeline CSS assets
2013-10-17 13:38:02 -04:00
Brian Talbot
309d7d99ad
LMS: removes overkill/turbo :invalid pseudo class style for form inputs
2013-10-17 13:38:02 -04:00
Brian Talbot
1db0c1dc74
LMS: resolves incorrectly named vendor CSS files
2013-10-17 13:37:15 -04:00
Brian Wilson
a699674015
Check that a subtask has not already completed before running.
2013-10-17 13:32:44 -04:00
Brian Talbot
5e46796e90
LMS: updates wiki templates to reference new pipeline assets
2013-10-17 11:46:22 -04:00
Julia Hansbrough
87d0ab91d5
Removed unused template
2013-10-17 15:02:05 +00: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
