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

38601 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Syed Hassan Raza
c41db159f4 Fix empty context KeyError for conditional module 2016-10-11 19:15:06 +05:00
Calen Pennington
d145457bb4 Merge pull request #13152 from edx/add-openedx-yaml 
Add an OEP-2 compliant openedx.yaml file
 2016-09-21 16:51:27 -04:00
sanfordstudent
5b7f48c5ed Merge pull request #13495 from edx/beryl/test-explicit-graded 
tests for changing grade policy
and moving progress page tests into separate file
 2016-09-21 12:28:33 -04:00
Chris
4f28b81fee Merge pull request #13334 from edx/clrux/ac-571-video-transcript-download 
AC-571 updating video download/transcript area
 2016-09-21 10:32:20 -04:00
Sanford Student
a98e33afd8 TNL-5466 tests for changing grade policy 
and moving progress page tests into separate file
 2016-09-21 09:48:46 -04:00
Albert (AJ) St. Aubin
13d7ea46d5 Merge pull request #13524 from Stanford-Online/giulio/revert-ajax-fa-spinner 
Revert "Add fa loading spinner to CAPA problems"
 2016-09-21 07:54:13 -04:00
Ned Batchelder
2e91174411 Merge pull request #13523 from stvstnfrd/up/clean/delete-course 
Remove outdated comment
 2016-09-20 16:56:35 -04:00
Giulio Gratta
0eca0eadaf Revert "Add fa loading spinner to CAPA problems" 
This reverts commit a3eb726f5f.
 2016-09-20 12:56:20 -07:00
stv
8a27ba05e3 Remove outdated comment 
The `commit` argument had already been removed from code [1][2][3],
prompted by the django18 upgrade.

[1] https://github.com/edx/edx-platform/pull/10927
[2] 07f015bb57
[3] a4006c8604
 2016-09-20 12:21:52 -07:00
Douglas Hall
2a0bdeb386 Merge pull request #13508 from edx/douglashal/HULL-103/provide_course_root_to_email_template 
HULL-103 Add the course root to the bulk email template context so that templa…
 2016-09-20 06:31:00 -04:00
Chris Rodriguez
0ebc90472c AC-571 updating video download/transcript area 2016-09-20 06:22:24 -04:00
wajeeha-khalid
eb11c6299d Merge pull request #13431 from edx/jia/MA-2663 
MA-2663: Donot mark thread unread on any action but creation
 2016-09-20 14:57:39 +05:00
Saleem Latif
d2f2c2932d Merge pull request #13491 from edx/saleem-latif/SOL-2076 
SOL-2076: check settings.DEFAULT_SITE_THEME to be not None before applying default theme
 2016-09-20 10:41:07 +05:00
Ned Batchelder
a7354c2d26 Merge pull request #13489 from juananpe/fixsysadmincourses 
Avoid to use an unsupported '/' operand between two unicode strings
 2016-09-19 17:28:23 -04:00
Juanan Pereira
d92e37337a Change fix following pullrequestreview-619682 2016-09-19 22:40:48 +02:00
Douglas Hall
4ac746a20b Add the course root to the bulk email template context so that templates can customize the full course URL with a custom hostname. 2016-09-19 15:34:55 -04:00
Muzaffar yousaf
087acb8ae0 Merge pull request #13434 from edx/mushtaq/a11y-discussions-icon-aria-hidden 
Remove icon-aria-hidden rule for a11y discussions
 2016-09-19 19:34:27 +05:00
Marco Morales
49c79777aa Merge pull request #13424 from edx/marco/dashboard/card-cleanup 
Adjustments to course dashboard visual styles
 2016-09-19 10:21:47 -04:00
wajeeha-khalid
03f888b795 MA-2663: Donot mark thread unread on any action but creation 2016-09-19 19:16:23 +05:00
Brian Jacobel
a2bf4696e4 Merge pull request #13428 from edx/bjacobel/topic-list-dropdown 
Replace discussion topic selector with a native dropdown
 2016-09-19 09:53:17 -04:00
Saleem Latif
b3def09383 check settings.DEFAULT_SITE_THEME to be not None before applying default theme 2016-09-19 12:57:50 +05:00
Mushtaq Ali
a1945c18d1 Remove icon-aria-hidden rule for a11y discussions 
TNL-4637 TNL-4641 TNL-4645
 2016-09-19 12:30:20 +05:00
Muddasser
dd876d8be1 Merge pull request #13312 from edx/muddasser/TNL-5315 
lms/navigation.feature to bokchoy
 2016-09-19 11:17:39 +05:00
Brian Jacobel
a1cc094313 Merge pull request #13457 from edx/bjacobel/discussion-color-contrast 
Fix color-contrast a11y failures in Discussions
 2016-09-16 15:49:55 -04:00
Christina Roberts
4288793a23 Merge pull request #13497 from edx/release 
Merge release into master
 2016-09-16 13:19:01 -04:00
Brian Jacobel
c28fc04b78 Commenting out color-contrast tests for DiscussionOpenClosedThreadTest because of Jenkins issues 2016-09-16 13:11:21 -04:00
Brian Jacobel
a229e1f028 Fix DiscussionHomePageTest color-contrast issues - TNL-4635 2016-09-16 13:11:21 -04:00
Brian Jacobel
a19274c84f Fix DiscussionOpenClosedThreadTest color-contrast issues - TNL-4644 2016-09-16 13:11:20 -04:00
Brian Jacobel
ad1aa2b35f Fix DiscussionTabMultipleThreadTest color-contrast issues - TNL-4639 2016-09-16 13:11:20 -04:00
Eric Fischer
c90186f802 Merge pull request #13494 from edx/efischer/skip_tests 
Readd imports to fix broken tests
 2016-09-16 12:14:15 -04:00
Sylvia Pearce
fba74adf76 Merge pull request #13490 from edx/sylvia/lms_help_fixes 
LMS context sensitive help minor fixes
 2016-09-16 09:59:09 -06:00
Christina Roberts
c248417d20 Merge pull request #13493 from edx/hotfix/2016-09-16 
Revert modal dialog changes
 2016-09-16 11:46:54 -04:00
Sylvia Pearce
a448d74f6c Add more specific help links for four LMS pages 2016-09-16 09:07:22 -06:00
Nimisha Asthagiri
88297788b9 Merge pull request #13478 from edx/tnl/explicit-grade-values 
Explicit grade values so saved grades are immune to subsection graded
 2016-09-16 10:50:52 -04:00
Eric Fischer
d0ad808d39 Readd imports to fix broken tests 2016-09-16 10:21:04 -04:00
cahrens
a249e8e18c Revert "Fixed keyboard focus remains within modal simulated dialogs." 
This reverts commit 3c84b7a12c.
 2016-09-16 09:27:34 -04:00
cahrens
9804f73e36 Revert "Fixed focus should remain within the simulated dialogs." 
This reverts commit ae849406bf.
 2016-09-16 09:27:19 -04:00
Nimisha Asthagiri
47e556c7f5 Use explicit 'graded' value so grades are immune to subsection's value 
TNL-5560
 2016-09-16 08:31:30 -04:00
wajeeha-khalid
7377634ea8 Merge pull request #13027 from edx/jia/MA-2139 
MA-2139: Mark thread as read for learner on thread/comment creation
 2016-09-16 13:57:09 +05:00
Andy Armstrong
8b8339b129 Merge pull request #11999 from raccoongang/kssl/show_location_id_xblock 
Show location in the settings xblock.
 2016-09-15 22:38:33 -04:00
Eric Fischer
6d2468d0dc Merge pull request #13487 from edx/release 
Hotfix 2016-09-15 release to master
 2016-09-15 18:49:53 -04:00
jareerahsan
172a3be946 Merge pull request #13435 from edx/jareer/ECOM-4945-NoRequireJS 
ECOM 4945 Revert to No RequireJS
 2016-09-16 03:48:43 +05:00
Juanan Pereira
8ad9bf4ff5 Avoid to use an unsupported '/' operand between two unicode strings 2016-09-15 23:15:41 +02:00
Jareer Ahsan
118afcd37f ECOM-4945 Fixed Shift-Tab on menu 
TNL-5437 Reverted to no RequireJS
 2016-09-16 01:19:12 +05:00
Eric Fischer
1b6afb0b25 Merge pull request #13482 from edx/hotfix/2016-09-15 
Fix grade push back for non-components through LTI
 2016-09-15 15:51:24 -04:00
Douglas Hall
e6b5cc9e41 Merge pull request #13485 from eduNEXT/edunext/fmo/unifying_helper_keys 
Unifying calls to helper values
 2016-09-15 15:11:22 -04:00
sanfordstudent
134e764c7b Merge pull request #13447 from edx/sstudent/TNL-5466 
bok choy tests for persistent grades
 2016-09-15 14:22:38 -04:00
Robert Raposa
bf47486bb0 Merge pull request #13464 from edx/robrap/TNL-5115 
TNL-5115: Remove sort order from Discussions in edx-platform
 2016-09-15 14:03:41 -04:00
Sanford Student
bf1fcc68cd bok choy tests for persistent grades 2016-09-15 13:23:20 -04:00
Felipe Montoya
0dda85d7f7 Fixing the call to the same value used in all other calls in the codebase 2016-09-15 11:58:24 -05:00