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

7364 Commits

Author SHA1 Message Date
Andy Armstrong
9899a1e520 Fix discussion color contrast and remove gradients 
TNL-5163
 2016-08-29 17:28:55 -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
John Eskew
477d6dd236 Merge pull request #13309 from edx/release 
Hotfix for TNL-5365
 2016-08-25 08:54:38 -04:00
John Eskew
87b4bcc731 Fix tests to account for savepoints caused by atomic wrapper. 2016-08-24 14:39:39 -04:00
John Eskew
211cef0814 Ignore IntegrityErrors upon set_many update save(). 2016-08-24 13:48:42 -04:00
J. Cliff Dyer
bd8a8babe2 Update django-oauth-toolkit admin 2016-08-24 13:31:11 -04:00
John Eskew
2252ce6abf Ignore IntegrityErrors upon set_many update save(). 2016-08-24 13:18:03 -04:00
Chris Rodriguez
2255b5c83b AC-552 word cloud accessibility updates 2016-08-24 11:14:25 -04:00
Matjaz Gregoric
008b708617 Merge pull request #12978 from open-craft/mtyaka/update-wiki 
Upgrade django-wiki to 0.0.9.
 2016-08-24 13:43:41 +02: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
Matjaz Gregoric
c5f4ba0fa7 Upgrade django-wiki to 0.0.9. 
The new version fixes a problem where wiki fails with a 500 error when
combined org/course name/course run fields are longer than 50
characters.
 2016-08-24 08:43:38 +02:00
sanfordstudent
a2b64d7504 Merge pull request #13262 from edx/sstudent/TNL-5006 
Trigger subsection grade update on SCORE_CHANGED signal
 2016-08-23 14:16:28 -04:00
Sanford Student
b9dade5512 handler for SCORE_CHANGED signal 2016-08-23 13:12:36 -04:00
Jesse Zoldak
d642b6ad67 Comment out flaky lettuce test. TNL-5315 2016-08-22 14:05:57 -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
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
Cliff Dyer
747c9a4de8 Merge pull request #13143 from edx/efischer/grades 
Persistent Grades Data Model
 2016-08-18 12:17:08 -04:00
PaulWattenberger
9add24e409 Handle vars: None in Sailthru user record in unenroll list update 2016-08-17 21:44:07 -04:00
Brian Jacobel
df35415ec1 Remove forum-nav-header and wire breadcrumbs to replace it 
TNL-5186
 2016-08-17 16:21:13 -04:00
Brian Jacobel
1f2c843f23 Move search box to header. Add search results to breadcrumbs when you search 2016-08-17 16:21:12 -04:00
Brian Jacobel
4c4476a720 Fix lint issues on feature branch 2016-08-17 16:21:12 -04:00
Brian Jacobel
a60d456f28 Add breadcrumbs to discussion forums header 2016-08-17 16:21:12 -04:00
Andy Armstrong
6c54035197 Add a content header to the discussion board 2016-08-17 16:20:45 -04:00
Andy Armstrong
89f93df46e Refactor out a new discussions Django app 2016-08-17 16:20:45 -04:00
Eric Fischer
8fa2c23377 TNL-5005 Persistent Grades Data Model 
Introduces database models and simple CRUD interface for robust grading
usage.
 2016-08-17 17:45:27 +00:00
Andy Armstrong
4772c61dee Update to use new edx-proctoring version 2016-08-17 13:10:48 -04:00
Awais Jibran
72549cf366 Merge pull request #13185 from edx/aj/ECOM5081-hide-credit-btn 
Hide credit button from  audit track students
 2016-08-12 11:53:40 +05:00
Awais Jibran
511de4c606 Hide credit button from audit track students 
ECOM-5081
 2016-08-11 23:20:01 +05:00
Renzo Lucioni
363f9e2cd5 Merge pull request #13170 from edx/renzo/dashboard-programs 
Display programs of all categories on the student dashboard
 2016-08-11 10:06:15 -04:00
Renzo Lucioni
9c81ba47e2 Display programs from all categories on the student dashboard 
Removes most remaining hardcoded references to XSeries from the LMS. Part of ECOM-4638.
 2016-08-11 09:00:23 -04:00
Christina Roberts
d2788ff2f1 Merge pull request #13207 from edx/christina/tnl-5181 
Silence expected IntegrityErrors.
 2016-08-10 15:46:31 -04:00
Awais Jibran
878b9124ab Merge pull request #13111 from edx/aj/ECOM4890-make-studio-case-insensitive-for-create-course 
Make studio case-insensitive for course keys for creating courses.
 2016-08-10 16:20:36 +05:00
Awais Jibran
4bc5ded768 Make studio case-insensitive for course keys for creating courses. 
ECOM-4890
 2016-08-10 14:34:35 +05:00
cahrens
9d8611374f Silence expected IntegrityErrors. 
TNL-5181
 2016-08-09 21:44:39 -04:00
Brian Beggs
c5c06cf982 Merge pull request #13203 from edx/release 
release 2016-08-09 master merge.
 2016-08-09 16:06:28 -04:00
Cliff Dyer
05bfd80f05 Merge pull request #12934 from open-craft/jill/fix-bulk-email-url-scheme 
Use appropriate URL scheme for bulk emails
 2016-08-09 15:53:14 -04:00
Mushtaq Ali
95b16dba4d Merge pull request #13183 from edx/mushtaq/maintenance 
Maintenance app RequireJS
 2016-08-09 23:52:01 +05:00
Mushtaq Ali
fb2f9948e1 Fix dynamic load RequireJs issue on Maintenance Dashboard 2016-08-09 13:48:20 +00:00
Mushtaq Ali
abb6af9789 Basic architecture of Maintenance App - SUST-19, SUST-42. Implement Force Publish Course view. SUST-46 2016-08-09 18:16:13 +05:00
Eric Fischer
3ba09221c1 Add Logging for CohortMembership 2016-08-05 22:15:50 -04:00
Brian Jacobel
ae8bc20b36 Run eslint autofixer on /lms 2016-08-05 15:29:20 -04:00
Christina Roberts
db9299cc77 Merge pull request #13177 from edx/christina/reduce-retries 
Reduce the number of retries.
 2016-08-05 11:32:02 -04:00
asadiqbal
2ee58ebe92 SOL-1868: Receipt page should show the "Go To Dashboard" button in case of non-verified courses 2016-08-05 19:16:07 +05:00
sanfordstudent
095bae1a2c Merge pull request #13129 from edx/sstudent/TNL-5099 
WIP: initial re-add with no extra work beyond merge conflicts
 2016-08-05 09:47:27 -04:00
cahrens
7b92d3ccff Reduce the number of retries. 
This task will get run twice, 5 minutes apart. Because of that, it can run up to 6 times with max_retries set to 2.
 2016-08-05 09:34:33 -04:00
Jesse Zoldak
0e5fb68e3d Revert "asadiqbal08/SOL-1868 "Go To Dashboard" button should be visible on receipt page" 2016-08-05 09:13:43 -04:00
Asad Iqbal
ffe14bb1fa Merge pull request #13139 from edx/asadiqbal08/SOL-1868 
asadiqbal08/SOL-1868 "Go To Dashboard" button should be visible on receipt page
 2016-08-05 17:38:40 +05:00
Brian Jacobel
a32fd27d60 Replace JSHint ignore directives with ESLint ones 2016-08-04 16:22:59 -04:00
Sanford Student
fc943ff539 moving milestones check to access.py and upgrading milestones version 2016-08-04 14:47:15 -04:00