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

13771 Commits

Author SHA1 Message Date
Brian Jacobel
44e70dc2ca Merge pull request #13406 from edx/bjacobel/toolbarmageddon 
Toolbarmageddon! (TNL-5105)
 2016-09-06 17:34:56 -04:00
Brian Jacobel
2dcb8f81c1 Fix issue where duplicate toolbars would be displayed above discussion forum comments while posting 
TNL-5105
 2016-09-06 13:54:55 -04:00
Clinton Blackburn
9f0598950c Merge pull request #13400 from edx/revert-13321-clintonb/userinfo-cookie 
Revert "Updated User Info Cookie"
 2016-09-06 11:52:45 -04:00
Mushtaq Ali
bcab8101cb Ensure correct aria-valid-attr-value for discussions 2016-09-06 15:58:39 +05:00
Awais Jibran
91c1049b24 Merge pull request #13390 from edx/aj/improve-registration-activation-logging 
Aj/improve registration activation logging
 2016-09-06 13:02:18 +05:00
Awais Jibran
0bc4f4e026 Merge pull request #13357 from edx/aj/ECOM-5405-update-bulk-enroll-mgm 
Update each enrollment in atomic transaction not all
 2016-09-05 20:22:50 +05:00
Clinton Blackburn
0dedc6ab71 Revert "Updated User Info Cookie" 2016-09-02 17:26:00 -04:00
Andy Armstrong
f1bad0721f Make discussion links into buttons for a11y 
TNL-4640
 2016-09-02 16:34:15 -04:00
Sanford Student
d54a784a43 creating django admin settings for subsection grades 2016-09-02 09:32:33 -04:00
Awais Jibran
98f01ebc56 Add logging to better monitor and determine root cause for email sending failures. 2016-09-02 16:10:45 +05:00
Awais Jibran
896b3cb170 Do not to run all enrollment updates in a single atomic transaction, but separate. 
ECOM-5405
 2016-09-02 10:31:50 +05:00
Peter Desjardins
e276ae2d36 Adds a context-sensitive link to learner documentation from the LMS. The base URL defaults to Open edX learner doc and can be overridden with the base URL for edx.org learner doc. Also relabels the tab for support from help to support. 2016-09-01 10:56:09 -04:00
Clinton Blackburn
33636db966 Updating user info cookie when user loads the dashboard 
Updating this cookie here helps ensure the marketing site has the most up-to-date enrollment details.

ECOM-4895
 2016-08-31 19:40:00 -04:00
Clinton Blackburn
09f7b6145f Updated logon user info cookie 
- Cookie now includes users' enrollment info
- Removed user email address from cookie
- Refactored functions so that we can update this cookie on other pages
- Added six to ensure new code is compatible with Python 3.x

ECOM-4896
 2016-08-31 19:40:00 -04:00
Clinton Blackburn
2159b71870 Factory Cleanup 
- Corrected import ordering
- Using a constant for the User password

ECOM-4896
 2016-08-31 19:40:00 -04:00
Chris
0c63680421 Merge pull request #13341 from edx/clrux/word-cloud-variable-cleanup 
Removing unused variable from recent word cloud updates
 2016-08-31 14:40:25 -04:00
Chris Rodriguez
be470adb03 Removing unused variable from recent word cloud updates 2016-08-31 12:44:31 -04:00
Chris
5b9df80123 Merge pull request #13322 from edx/clrux/ac-570-courseware-search-contrast 
AC-570 courseware search contrast enhancement
 2016-08-30 17:03:13 -04:00
Chris Rodriguez
37b42941f8 AC-570 courseware search contrast enhancement 2016-08-30 14:51:54 -04:00
Awais Jibran
c7df4ed072 Merge pull request #13348 from edx/aj/improve-registration-logging 
Improve logging for email sending while registering.
 2016-08-30 23:11:16 +05:00
Awais Jibran
e503ef3d03 Improve logging for email sending while registering. 2016-08-30 18:32:25 +05:00
Andy Armstrong
9899a1e520 Fix discussion color contrast and remove gradients 
TNL-5163
 2016-08-29 17:28:55 -04:00
Brian Jacobel
f8696bb306 Resolve TNL-5249 - extra call to render was triggering discussions UI inconsistency 2016-08-26 13:43:44 -04:00
Mushtaq Ali
db8e26d10a Merge pull request #13300 from edx/mushtaq/sust-57 
Fix mongo store's has_course with a split course key
 2016-08-26 17:19:29 +05:00
Chris
3ea28a9387 Merge pull request #13326 from edx/release 
Release with hotfixes 2016-08-23
 2016-08-26 06:59:27 -04:00
Mushtaq Ali
ec13ba4340 Fix when checking in mongo store, has_course with a split course key returns False. 2016-08-26 15:49:34 +05:00
Eric Fischer
2dc4f5d6bf Merge pull request #13303 from edx/efischer/tnl_5057 
TNL 5057 Silence XML parse error in capa_module
 2016-08-25 16:30:15 -04:00
Eric Fischer
bf4211088f Merge pull request #13295 from edx/efischer/opt_grade 
Grades cleanup
 2016-08-25 16:29:55 -04:00
sanfordstudent
fb20312ef1 Merge pull request #13294 from edx/sstudent/TNL-5041 
check for null doc
 2016-08-25 14:49:24 -04:00
John Eskew
43834839b1 Quality fixes and unicode strings for logs. 2016-08-25 13:43:51 -04:00
John Eskew
db25725f32 Log when OpaqueKeyField detects trailing newline to/from DB. 
Correct the key when reading from DB into a key object.
 2016-08-25 12:24:21 -04:00
Eric Fischer
0059f88d2a Silence XML parse error in capa_module 
TNL-5057 This un-actionable error is polluting the stream of devops pages, and
should be quieted. A longer term fix will be made in TNL-5245.
 2016-08-25 12:00:18 -04:00
Eric Fischer
13687e4753 Grades cleanup 
Small changes to the grades djangoapp
    -sets up mock_get_score context handler
    -fixes an issue with not invalidating lazy scores property
    -code quality fixes
    -query count optimization in PersistentSubscetionGrade.create
    -adds atomic blocks to avoid IntegrityErrors corrupting an entire request
 2016-08-25 11:43:49 -04:00
Qubad786
b25dc54d68 update library content block's children on branches 2016-08-25 16:44:52 +05:00
Sanford Student
20379c14c0 check for null doc 2016-08-24 13:18:28 -04:00
Chris Rodriguez
2255b5c83b AC-552 word cloud accessibility updates 2016-08-24 11:14:25 -04:00
Waheed Ahmed
0057815973 Fixed account settings tabpanels. 
ECOM-4186
 2016-08-24 18:11:40 +05:00
Awais Jibran
68303997c8 Fix Discussion blackout date still has Add a Response text box 
TNL-5111
 2016-08-24 12:03:29 +05:00
alisan617
6ed5b2e3fc filter doinline escape string for inline css 2016-08-23 10:07:12 -04:00
Eric Fischer
22046d4067 Use PersistentSubsectionGrade in grades application 
Hooks the pre-existing grades code into our new PersistentSubsectionGrade data
model. Includes test updates, and some minor changes to the data model that
were discovered in testing.
 2016-08-22 09:47:37 -04:00
Chris Rodriguez
b5efcc15f5 AC-530 fixing link-href ignores in the platform 2016-08-19 10:04:40 -04:00
alisan617
a250b03b60 Merge pull request #13274 from edx/alisan/TNL-5289-python-evaluated-input 
trailing text remove its parent class that doesn not exist in python …
 2016-08-18 15:17:59 -04:00
alisan617
90d7141c20 Merge pull request #12853 from eduNEXT/Bound3R/TNL-3717 
resolve byte-sized bug TNL-3717
 2016-08-18 14:31:41 -04:00
Brian Jacobel
7e12a1f7ae Merge pull request #12771 from edx/discussion-forums-ui-update 
Discussion forums UI update feature branch
 2016-08-18 12:58:54 -04:00
alisan617
289ab1476d trailing text remove its parent class that doesn not exist in python input type 2016-08-18 12:57:27 -04:00
Albert (AJ) St. Aubin
2926400798 Merge pull request #13269 from edx/TNL-5298_flaky_test 
Update to deal with flaky test
 2016-08-18 12:23:25 -04:00
Renzo Lucioni
40ca3efd6c Merge pull request #13272 from edx/release 
Merge release into master
 2016-08-18 12:04:39 -04:00
Albert St. Aubin
7a5b618ed0 Update to deal with flaky test 
TNL-5298
 2016-08-18 10:39:04 -04:00
Renzo Lucioni
de2608009f Fix Unicode error on dashboard 
Programs with Unicode in their name would prevent the dashboard from loading. ECOM-5293.
 2016-08-17 19:21:39 -04:00
Brian Jacobel
9b4f306142 Fix an issue where focus could become trapped 2016-08-17 16:57:34 -04:00