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

6956 Commits

Author SHA1 Message Date
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
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
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
Gabe Mulley
bd5abc89ce Merge pull request #1600 from mulby/gabe/reapply-enrollment-event 
re-apply backed out enrollment event changes
 2013-11-07 12:38:04 -08:00
David Baumgold
0b3199d8c1 remove unused jasmine resources 2013-11-07 12:04:35 -05:00
Gabe Mulley
3377cb66c9 emit enrollment event 2013-11-06 15:09:33 -05:00
Gabe Mulley
5aa19c08b5 Revert "emit enrollment event" 
This reverts commit 5734cae1c3.
 2013-11-06 14:35:28 -05:00
Christina Roberts
cd868efc22 Merge pull request #1580 from edx/christina/item 
Change delete_item to RESTful URL.
 2013-11-06 10:50:56 -08:00
cahrens
16766a5ee9 Change delete_item to RESTful URL. 
Part of STUD-847.
 2013-11-06 13:49:24 -05:00
Gabe Mulley
f17ab1ec73 Merge pull request #1533 from mulby/gabe/enrollment-event 
emit enrollment events
 2013-11-06 10:29:44 -08:00
Gabe Mulley
5734cae1c3 emit enrollment event 2013-11-06 08:46:40 -05:00
jmclaus
e892c979b0 Added tests to video player controls to check new WAI-ARIA functionality. Added global custom Jasmine matcher to helper.coffee 
[BLD-386]
 2013-11-05 16:38:33 -05:00
David Baumgold
9e781e0b6d Merge pull request #1590 from edx/db/youtube-fallback 
If the YouTube API JS fails to load, the rest of the JS should still run
 2013-11-05 07:46:34 -08:00
Sarina Canelake
939dbb6c9d Merge pull request #1579 from edx/sarina/enhance-user-factories 
Sarina/enhance user factories
 2013-11-05 07:31:00 -08:00
David Baumgold
e1c94888e4 If the YouTube API JS fails to load, the rest of the JS should still run 
Fixes BLD-472
 2013-11-05 10:22:01 -05:00
Sarina Canelake
ea529b8841 Fix instructor api tests 2013-11-05 09:26:32 -05:00
Julia Hansbrough
8b6568f448 Removed duplicate code 2013-11-05 14:17:34 +00:00
Julia Hansbrough
1e2c0f50f7 Merge pull request #1529 from edx/flowerhack/feature/refunds-for-certificates 
Flowerhack/feature/refunds for certificates
 2013-11-04 13:33:10 -08:00
Julia Hansbrough
448f5cc41f Response to CR 2013-11-04 20:32:47 +00:00
John Jarvis
24524ef305 addressing comments 2013-11-04 15:14:20 -05:00
John Jarvis
4a910f8724 adding create_user script 2013-11-04 14:58:34 -05:00
Julia Hansbrough
1a3f4cb8f8 Moved can_refund logic to CourseEnrollment 2013-11-04 18:48:43 +00:00
Julia Hansbrough
c375666d88 Added new copy, small CR fixes 
* Changed text for "Are you sure you want to refund"...
* Addressed a CR comment adding clarity to student view code
* Converted UTC to pytz.utc
 2013-11-04 18:38:46 +00:00
Julia Hansbrough
81661385fb More response to Dave's PR 2013-11-04 18:38:45 +00:00
Julia Hansbrough
7ab8142e82 Response to Dave & Diana's CR 2013-11-04 18:38:44 +00:00
Julia Hansbrough
fcab46b138 Refactored to use signals; full test coverage 2013-11-04 18:38:42 +00:00
Julia Hansbrough
63940141c8 End-to-end refunding with tests 2013-11-04 18:37:55 +00:00
Julia Hansbrough
045e69f3c5 Can check verified-ness and expiration date 2013-11-04 18:37:54 +00:00
Diana Huang
b489514096 Merge pull request #1577 from edx/diana/clean-up-choose 
Determine which mode was selected more intelligently.
 2013-11-04 10:14:59 -08:00
Sarina Canelake
198452cd1c Adds Staff and Instructor factories 2013-11-04 11:38:43 -05:00
Diana Huang
0018568799 Merge pull request #1555 from edx/diana/certs-reverification-path 
Verified Certificate Reverification Path
 2013-11-04 08:31:56 -08:00
Diana Huang
dc0e3d04ab Determine which mode was selected more intelligently. 
LMS-1384
 2013-11-04 10:25:28 -05:00
Alexander Kryklia
df5b1e97d8 Merge pull request #1514 from edx/alex/add_latex_compiler_key 
Alex/add latex compiler key
 2013-11-04 02:14:53 -08:00
Alexander Kryklia
b5bf4b7500 Enable latex problems via key in course.settings. 
BLD-426
 2013-11-04 12:13:23 +02:00
polesye
af71c780fe Fix bugs in Video player. BLD-468. 2013-11-04 11:30:24 +02:00
Jason Bau
64758673b5 Merge pull request #1563 from edx/jbau/OEE/feedback-handle-nonexistent-child 
add error handling for update_score for OEE when no child_history
 2013-11-01 16:24:18 -07:00
Jason Bau
c648db7f3d add comment explaining child_history condition 2013-11-01 15:51:20 -07:00
Christina Roberts
5de54dc5ca Merge pull request #1546 from edx/christina/export 
Make export URL restful.
 2013-11-01 13:24:40 -07:00
Greg Price
2123d5e7ae Merge pull request #1570 from edx/gprice/forum-staff-label 
Remove label from forum posts by global staff
 2013-11-01 13:10:54 -07:00
Calen Pennington
25ec217939 Merge pull request #1561 from cpennington/hotfix-assertion-error 
Fix AssertionErrors that were raised when creation of an XModule failed
 2013-11-01 13:06:35 -07:00
Greg Price
7013c997f7 Merge pull request #1553 from edx/gprice/forum-follow-a11y 
Improve accessibility of forum follow buttons
 2013-11-01 13:02:01 -07:00
Brian Talbot
e41214b1ed Studio: revises the styling for the export view to sync with the import view's UI 2013-11-01 16:01:11 -04:00
Diana Huang
002972f24c Remove dates from status messages 
* clean up one last typo

LMS-1387
 2013-11-01 15:47:04 -04:00
Will Daly
78fd1fc1bb Merge pull request #1568 from edx/will/acceptance-test-fixes 
Will/acceptance test fixes
 2013-11-01 12:16:06 -07:00
Will Daly
9ab35759be Added wait for problem to re-render when checking or resetting it 
Added wait for JS on upload page
Fixed an issue where css_click wasn't waiting for JS to load
 2013-11-01 14:31:37 -04:00
Don Mitchell
5fa44123bf Allow 'course' as course's id keyword 2013-11-01 14:20:41 -04:00
Greg Price
c4cdb457de Remove label from forum posts by global staff 
The motivation for this change is performance. The forums UI code gets
the list of users for each role and renders the staff label based on
those lists. The list for the staff role is expensive to compute because
there is no index on the is_staff attribute, and we cannot create one
because the User model is built into django.

Users with is_staff=True are still assigned the Moderator role upon
enrolling in a course, so this change will have no practical effect
except that a user who is granted staff privileges after enrolling in a
course will have to be made a Moderator in order for their posts to be
labeled.

Additionally, the UI did not use the list of users with the Student
role, so that list has been removed as well.
 2013-11-01 14:16:55 -04:00
Calen Pennington
d7766a7b28 Fix AssertionErrors that were raised when creation of an XModule failed 
The ErrorDescriptor wasn't getting the appropriate xmodule_runtime set,
and thus immediately raising an AssertionError when we tried to retrieve
and _xmodule from it.

[LMS-1388[
 2013-11-01 10:15:26 -04:00
polesye
f6b69eab4e Merge pull request #1513 from edx/anton/word-cloud-total-count-in-studio-bug 
Anton/word cloud total count in studio bug
 2013-11-01 06:19:45 -07:00