Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,708 Commits 1 Branch 0 Tags
47e21ca5b09b60da22ea080da31ada1ece734f28
Commit Graph

15498 Commits

Author SHA1 Message Date
Calen Pennington
47e21ca5b0 Revert "Merge pull request #14078 from edx/yro_remove-datetimetext-functions" 
This reverts commit 8c0098812d, reversing
changes made to 5b6e2dd5ee.
 2016-12-22 09:29:33 -05:00
Calen Pennington
bd87061f1c Merge pull request #14196 from edx/release 
Merge Release back into master
 2016-12-21 16:17:40 -05:00
Gregory Martin
59daa1c022 Merge pull request #14189 from edx/yro_student-acct-timezone-fix 
change variable name
 2016-12-21 15:03:09 -05:00
Calen Pennington
a24ac5155b Merge remote-tracking branch 'edx/master' into release 2016-12-21 15:01:46 -05:00
Calen Pennington
04115bfe43 Revert "Merge pull request #13235 from edx/jia/MA-2684" 
This reverts commit bde0f7b2a7, reversing
changes made to 71693c3a12.
 2016-12-21 13:21:47 -05:00
Calen Pennington
7f942bfc49 Revert "Merge pull request #14177 from edx/naa/fix-marketing-pr" 
This reverts commit dec4034bc5, reversing
changes made to ef55cc4f5f.
 2016-12-21 13:19:59 -05:00
Calen Pennington
07865ce087 Revert "Merge pull request #14187 from edx/jia/MA-3052" 
This reverts commit f7a0c1d901, reversing
changes made to dec4034bc5.
 2016-12-21 13:19:54 -05:00
sanfordstudent
e860205e67 Merge pull request #14191 from edx/beryl/content_library_access 
Test retrieving subsection grade after losing access to block in subsection
 2016-12-21 13:19:05 -05:00
Nimisha Asthagiri
d1d8d31bba Test retrieving subsection grade after losing access to block in subsection 2016-12-21 11:49:33 -05:00
wajeeha-khalid
b5edd01812 MA-3052: avoid catalog integration for individual course when cached 2016-12-21 10:41:29 -05:00
Gregory Martin
ce76e2c3f8 change variable name 2016-12-21 10:24:55 -05:00
sanfordstudent
74a666643c Merge pull request #14151 from edx/sstudent/TNL-6178 
context manager for course id in context
 2016-12-21 09:26:28 -05:00
AsadAzam
fc79fae565 Merge pull request #14089 from asadazam93/asadazam/tnl-5487-invalid-usage-key 
TNL-5487 – Fix InvalidKeyError on render xblock
 2016-12-21 17:56:09 +05:00
Gregory Martin
909f35bbb6 add blankTitle option 2016-12-20 18:43:57 -05:00
Gregory Martin
8c0098812d Merge pull request #14078 from edx/yro_remove-datetimetext-functions 
remove datetext utils
 2016-12-20 16:17:47 -05:00
alisan617
5b6e2dd5ee Merge pull request #14173 from edx/alisan/discussion-styles-fix-TNL-6187 
new inline discussion style fixes
 2016-12-20 15:57:47 -05:00
Sanford Student
ac9b8fba5e context manager for course id in context 2016-12-20 15:26:05 -05:00
alisan617
e28f42b11f discussion img upload dialog RTL and other clean-up 2016-12-20 14:54:24 -05:00
Nimisha Asthagiri
f24830918c Fix Enrollment database access in Marketing Course URL PR 2016-12-20 12:03:03 -05:00
Gregory Martin
b0bf19a741 delete datetext functions, implement dateutils 2016-12-20 11:10:06 -05:00
asadazam93
01f3233a50 Fix InvalidKeyError on render xblock 2016-12-20 13:03:50 +05:00
Asad Iqbal
122aa55008 Merge pull request #14064 from edx/asadiqbal08/ENT-32-EC-branding 
ENT-32 Show enterprise customer branding on Logistration.
 2016-12-20 11:45:51 +05:00
asadiqbal
99f73dfbb3 ENT-32 Show enterprise customer branding on Logistration. 
nit: css
 2016-12-20 00:10:21 +05:00
Cliff Dyer
aa3d6e8791 Merge pull request #14092 from edx/cdyer/validate-capa-xml 
Use new XMLString field type for CAPA data field.
 2016-12-19 12:03:19 -05:00
Andy Armstrong
d3d3819fd0 Merge pull request #14161 from edx/andya/fix-discussion-ux-bugs 
Clean up discussion styling issues
 2016-12-16 11:18:26 -05:00
Andy Armstrong
accbda34e2 Clean up discussion styling issues 
TNL-6184
 2016-12-16 10:04:57 -05:00
Marko Jevtic
363a0c8d90 [SOL-2082] Add a value to SiteConfiguration to enable ecommerce Receipt Page usage 2016-12-16 12:42:17 +00:00
Afzal Wali Naushahi
024e2e4b33 Merge pull request #14045 from edx/afzaledx/WL-829_add_programs_to_courses_view_context 
Add programs list to the context for index.html and courses.html template.
 2016-12-16 16:43:47 +05:00
J. Cliff Dyer
22ce30039b Use new XMLString type for CAPA data field. 
TNL-5245
 2016-12-15 15:35:44 -05:00
alisan617
15794b93cd Merge pull request #14138 from edx/alisan/new-post-discussion-TNL-6006 
Discussion new post form layout TNL-6006
 2016-12-15 11:02:00 -05:00
Ned Batchelder
486dae94a2 Merge pull request #14154 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-12-15 10:16:18 -05:00
alisan617
41620e05f2 new discussion post form layout 2016-12-15 09:20:51 -05:00
Afzal Wali
e44e18592f Programs list conditionally added to the context of index and courses page. 2016-12-15 18:16:48 +05:00
Ned Batchelder
b56faaff34 Update translations (autogenerated message) 2016-12-15 12:40:38 +00:00
wajeeha-khalid
11356965b5 MA-2684: return correct marketing url for course about 2016-12-15 16:19:44 +05:00
Brian Jacobel
71693c3a12 Merge pull request #14026 from edx/bjacobel/inline-discussion-redesign 
Inline Discussion "two-level" redesign
 2016-12-14 16:33:00 -05:00
Andy Armstrong
fd0cf4041e Clean up font weights 2016-12-14 13:52:55 -05:00
Andy Armstrong
570001d7ad Style fixes for previews and text areas 2016-12-14 13:43:52 -05:00
Brian Jacobel
4b6cf7ba47 Fixed issue with hover post actions causing title reflow 2016-12-14 13:35:31 -05:00
Brian Jacobel
483da0dab5 fixup! Fix TNL-6099 2016-12-14 13:18:52 -05:00
Brian Jacobel
601ff52fe6 fixup! Fix TNL-6133 2016-12-14 12:55:17 -05:00
Andy Armstrong
97121202cf Revert changes that broke discussion profile design 2016-12-14 10:26:31 -05:00
Andy Armstrong
f58d920b13 Hide the navigation bar when sorting won't work 2016-12-13 17:23:19 -05:00
Brian Jacobel
9bbf96391c fixup! Fix TNL-6140 2016-12-13 13:01:12 -05:00
Brian Jacobel
15e5be973e Fix TNL-6140 2016-12-13 12:57:53 -05:00
Andy Armstrong
8ac482ef74 Update buttons to have darker hover colors 2016-12-13 12:41:34 -05:00
Andy Armstrong
52d5de5b5d More discussion styles 2016-12-13 12:17:23 -05:00
Brian Jacobel
dc5f2e2fa1 Fix TNL-6133 2016-12-13 11:31:32 -05:00
Andy Armstrong
4922d7753e Clean up discussion styles to be consistent across views 2016-12-13 08:39:51 -05:00
Andy Armstrong
7287e8ef85 Fix a number of styling bugs 2016-12-12 17:07:06 -05:00