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

19390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Chris Dodge
a93a848e03 we are already being passed in the module descriptor so we don't need to re-fetch it (and children) 2013-11-07 17:56:13 -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
e8f067de8f Merge pull request #1613 from edx/db/remove-old-jasmine-resources 
remove unused jasmine resources
 2013-11-07 11:26:16 -08:00
Usman Khalid
391c03ea9a Merge pull request #1543 from edx/usman/lms1309-a11y-wiki-changes 
a11y imporvements to wiki/history.html
 2013-11-07 10:19:22 -08:00
David Baumgold
0b3199d8c1 remove unused jasmine resources 2013-11-07 12:04:35 -05:00
Usman Khalid
e459e4d099 a11y imporvements to wiki/history.html 
LMS-1309
 2013-11-07 21:06:40 +05:00
Waheed Ahmed
ebc9f742fb import jquery in reset password template 
LMS-1265
 2013-11-07 20:16:48 +05:00
polesye
e4ff0d2f0b Merge pull request #1608 from edx/oleg/fix-transcripts-protocol-validation 
Transcripts: Allow any part of protocol name to be lowercase or uppercase.
 2013-11-07 06:12:00 -08:00
Oleg Marshev
b19c982f8c Allow any part of protocol name to be lowercase or uppercase (BLD-496). 2013-11-07 15:25:20 +02:00
Nick Parlante
6122357191 Expand the edit_course_tabs help text 2013-11-06 16:39:44 -08: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
Julia Hansbrough
30dc3bc415 Command for retrying failed photo verifications 
Includes test coverage
 2013-11-06 18:56:59 +00: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
a6c02ccc5b Merge pull request #1574 from edx/jmclaus/feature_tests_video_player_controls_a11y 
a11y tests for video player controls [BLD-386]
 2013-11-05 14:11:41 -08: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
f02df33a54 Merge pull request #1571 from edx/db/js-main-setup 
Do JS setup immediately when possible
 2013-11-05 12:07:09 -08:00
David Baumgold
3895a3fa52 Merge pull request #1581 from antoviaque/registration-optional 
registration-optional: Allow to hide some optional registration fields #os
 2013-11-05 10:25:31 -08:00
John Jarvis
2e05c0da13 Merge pull request #1591 from edx/jarv/theme-name 
setting THEME_NAME to None when it's set to an empty string
 2013-11-05 09:38:22 -08:00
brianhw
93dddf8dc3 Merge pull request #1585 from edx/brian/retry-email-after-dbtimeout 
Add retries when encountering DatabaseError when updating InstructorTask.
 2013-11-05 08:18:58 -08:00
Brian Wilson
7bef11a7f1 Add retries when encountering DatabaseError when updating InstructorTask. 2013-11-05 11:18:08 -05:00
John Jarvis
f78508116f setting THEME_NAME to None when it's set to an empty string 2013-11-05 11:14:56 -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
Julia Hansbrough
68a429022d Merge pull request #1589 from edx/flowerhack/fix/remove-duplicate-course-helper-code 
Removed duplicate code
 2013-11-05 07:04:05 -08:00
Sarina Canelake
ea529b8841 Fix instructor api tests 2013-11-05 09:26:32 -05:00