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
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
brianhw
12d98daecf
Merge pull request #1376 from edx/adam/disable-accounts-2
...
Adam/disable accounts 2
2013-10-16 15:01:46 -07:00
Adam Palay
1fc993ce18
add functionality to disable users
...
add middleware to detect students with disabled accounts
add tests
2013-10-16 16:57:11 -04:00
Brian Talbot
5de21ae541
adds/relocates shared vendor css (and assets) to static directories
2013-10-16 16:45:32 -04:00
Greg Price
bd477581b6
Log all comments service requests
...
Logging the duration of each request will allow us to determine
whether there is a significant difference in the latency reported by
the comments service and that observed by the LMS. Each request will
be assigned a unique identifier to allow correlation of the reported
latency on each end.
2013-10-16 16:31:59 -04:00
Brian Talbot
96cd85d824
LMS: converts close modal controls to use HTML <button> element
2013-10-16 16:14:29 -04:00
Will Daly
f2c417b638
Write Django logs to file during acceptance tests
2013-10-16 15:44:35 -04:00
brianhw
5918ee557f
Merge pull request #1351 from edx/brian/fix-dupe-emails
...
Check that email subtasks are known to the InstructorTask before executing.
2013-10-16 12:18:04 -07:00
Jason Bau
ec8871206a
use context processor instead of middleware
2013-10-16 12:16:10 -07:00
Greg Price
17e2221604
Merge pull request #1326 from edx/gprice/cs-header-auth
...
Use HTTP header for comments service auth
2013-10-16 12:07:20 -07:00
Diana Huang
02acd570e3
Merge pull request #1367 from edx/diana/modal-role-labelling
...
Add roles and labels to the dialogs on the dashboard.
2013-10-16 11:02:45 -07:00
Joe Blaylock
80cf19390f
Merge pull request #833 from edx/jrbl/pass_grades_to_certificates
...
Pass student grade label to certification process
2013-10-16 10:57:47 -07:00
frances botsford
ce83924fc0
Merge pull request #1361 from edx/frances/fix/lms-verification-layout-tweaks
...
some layout tweaks to the verification choose your track page
2013-10-16 10:52:40 -07:00
Frances Botsford
8c224a2aad
fixes on review and some corrections to verification sass
2013-10-16 13:51:38 -04:00
Diana Huang
1871bca4ca
Add roles and labels to the dialogs on the dashboard.
...
LMS-1310
2013-10-16 13:26:32 -04:00
brianhw
97e01be147
Merge pull request #1359 from edx/brian/bulk-email-rc
...
Bulk Email improvements for release
2013-10-16 10:26:28 -07:00
Sarina Canelake
86c4a03eba
admin-console support for enabling email per course
2013-10-16 13:02:41 -04:00
Brian Wilson
b8239068cb
Check that email subtasks are known to the InstructorTask before executing.
2013-10-16 13:02:41 -04:00
Brian Wilson
9861c935dd
Change calls in beta instructor dash.
2013-10-16 13:02:41 -04:00
Brian Wilson
87a72b7e99
Rename some constants, and refactor bulk email task flow.
2013-10-16 13:02:40 -04:00
Brian Wilson
bc599a0662
Update tests with more complete coverage.
2013-10-16 13:02:40 -04:00
Brian Wilson
e75dd4654b
Move subtask update logic that was only needed for tests into the tests that needed it.
2013-10-16 13:02:40 -04:00
Brian Wilson
4505fb4e2c
Update InstructorTask before performing a retry.
2013-10-16 13:02:40 -04:00
