Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

22621 Commits

Author SHA1 Message Date
Brian Mesick
348605a020 Merge pull request #16310 from edx/bmedx/django111_survey_models 
Clean up survey warnings
 2017-10-27 15:07:14 -04:00
Matt Tuchfarber
e88d916c29 Merge pull request #16360 from edx/tuchfarber/marketing_hero 
Add hero to main.html and use it in program page
 2017-10-27 13:45:27 -04:00
Jeremy Bowman
ba06372cac PLAT-1780 Remove dependency on django-extensions 2017-10-27 13:19:12 -04:00
Matt Tuchfarber
a93832aabe Add hero to main.html and use for program page 
Adding hero to main.html allows for full width marketing images to be
used. This commit includes the addition of the hero block into
main.html along with the program marketing page's use of that new
hero block.
 2017-10-27 12:26:21 -04:00
Troy Sankey
7bbecfdc3c Merge pull request #16301 from edx/pwnage101/verify_student_app_startup 
Move verify_student signal registration to ready()
 2017-10-27 11:10:30 -04:00
Brian Beggs
3608b86273 Merge pull request #16309 from edx/bbeggs/PLAT-1411 
Replace SubfieldBase functionality PLAT-1411
 2017-10-27 10:41:32 -04:00
Cliff Dyer
2cadbbad0b Merge pull request #16186 from open-craft/cliff/complete-scored-blocks 
Complete scored blocks
 2017-10-27 10:32:05 -04:00
Ayub khan
b85b793c18 Merge pull request #16363 from edx/you/update_translations 
Update translations
 2017-10-27 17:50:05 +05:00
M. Rehan
f04594b8f6 Merge pull request #16290 from edx/mrehan/exlude-bumper 
Exclude bumper from VAL handling the transcripts
 2017-10-27 17:37:27 +05:00
ayub-khan
8ba42a3355 Update translations 2017-10-27 15:19:08 +05:00
rabiaiftikhar
9260f8813a EDUCATOR-1542 give access to Special Exam tab to the course team 2017-10-27 07:02:54 +00:00
Brian Beggs
ca92ffe21d Remove SubfieldBase metaclass 2017-10-26 16:59:51 -04:00
Eric Fischer
3fc342e6e8 Webpack config prod/dev split 
EDUCATOR-1448

Modifies paver webpack task to use production configuration in all
non-devstack environments, and a development config in devstack.
 2017-10-26 14:03:53 -04:00
Troy Sankey
3be0fa81b8 Move verify_student signal registration to ready() 2017-10-26 13:57:52 -04:00
Dillon-Dumesnil
e712a2f1f1 Merge pull request #16356 from edx/ddumesnil/flaky-test 
Removing flaky test
 2017-10-26 13:55:25 -04:00
Harry Rein
7091ed0f70 Merge pull request #16337 from edx/HarryRein/home-page-styling-fixes 
Course home page styling with bootstrap.
 2017-10-26 13:39:44 -04:00
Tyler Hallada
52897d5808 Merge pull request #16346 from edx/thallada/ret-org-opt-out 
Org-level schedule upgrade deadline opt-out
 2017-10-26 13:31:21 -04:00
Dillon Dumesnil
f54edeff2e Removing flaky test 2017-10-26 11:31:42 -04:00
Gabe Mulley
05dd63e85a fix tests, I hope? 2017-10-26 10:32:33 -04:00
ayub-khan
8ede3a53b3 Added REFRESH_TOKEN_EXPIRE_SECONDS=20160 
When edx_clear_expired_tokens command will run it will clear
all refresh,access tokens and grants expired before 2 weeks.
 2017-10-26 18:43:59 +05:00
Harry Rein
d4e93fc655 Course home page styling with bootstrap. 
Updates the new bootstrap course home page to match the old course home page.
 2017-10-26 09:25:58 -04:00
Qubad786
4aef8d1c7b exclude bumper 2017-10-26 16:28:25 +05:00
Tyler Hallada
806114a3ef Check org before course deadline config w/ tests 2017-10-25 17:54:47 -04:00
Andy Armstrong
8dc47f5797 Merge pull request #16336 from edx/andya/fix-browser-tab-i18n 
Fix i18n for the page title in course tabs
 2017-10-25 17:40:51 -04:00
Diana Huang
df89a1d238 Merge pull request #16314 from edx/diana/programs-dashboard-grades 
ECOM-7387 - Add grade display to the programs dashboard
 2017-10-25 16:31:45 -04:00
Tyler Hallada
4c8b257bbb Add OrgDynamicUpgradeDeadlineConfiguration model 2017-10-25 15:56:28 -04:00
Diana Huang
b0877270bf Add course grades to programs dashboard. 2017-10-25 15:44:47 -04:00
J. Cliff Dyer
69271d043b Handle completion of scorable blocks 
* Add a handler to mark a block complete when a problem is scored.
* Also handle marking incomplete when user problem state is deleted.
* Add score_deleted to published providing_args for PROBLEM_{RAW,WEIGHTED}_SCORE_CHANGED

OC-3089
 2017-10-25 11:50:09 -04:00
John Eskew
fa6d94d144 Remove NoseTestSuiteRunner - now using pytest. 2017-10-25 11:49:12 -04:00
Andy Armstrong
9cb906cb51 Fix i18n for the page title in course tabs 2017-10-25 11:22:30 -04:00
Cliff Dyer
ab13544cf2 Merge pull request #16112 from open-craft/cliff/handle-completion-events 
Handle completion events
 2017-10-25 10:13:18 -04:00
Harry Rein
618cf6aec5 Merge pull request #16333 from edx/HarryRein/responsive-updates-bookmarks-page 
Update bookmarks and updates pages to be responsive.
 2017-10-25 10:01:03 -04:00
Waheed Ahmed
8c0e87ab65 Fix unicode error on financial assistance page. 
If country name has special character str() raises unicode error.

LEARNER-2951
 2017-10-25 17:27:46 +05:00
Hasnain Naveed
b9cd1043df Merge pull request #16320 from edx/hasnain-naveed/WL-1060 
WL-1060 | Made the dashboard social sharing site aware.
 2017-10-25 16:01:41 +05:00
Albert (AJ) St. Aubin
93c3ff2a98 Merge pull request #16273 from edx/aj/LEARNER-1733 
Implement Entitlement Model for Course Centric Architecture
 2017-10-25 07:00:32 -04:00
J. Cliff Dyer
94d05bceb5 Add handler to receive completion events 
* Submit a completion when receiving a completion event from an XBlock.
* Handle legacy progress events.
* Convert handler to use a dispatch dict instead of an if-else chain.
* Extract masquerade checking from individual handlers.
* Gate submit_completion on waffle switch
* 404 on handler views when trying to submit completion without waffle
switch enabled.

OC-3087

Disallow calling submit_completion when waffle flag is disabled.

Add tests that trying to publish completion errors.
 2017-10-25 06:54:59 -04:00
tasawernawaz
d839d17714 update css and html/ add basics for react 
LEARNER-2804
 2017-10-25 11:12:26 +05:00
Albert St. Aubin
a9011fde58 Implement Entitlement Model for Course Centric Architecture 
[LEARNER-1733]
 2017-10-24 19:12:55 -04:00
Gabe Mulley
e6abdf7e63 Merge pull request #16328 from edx/mulby/fix-course-sock 
Merge PR 16260 back into master with a fix for the course sock
 2017-10-24 15:08:05 -04:00
Harry Rein
73455ac378 Updating bookmarks and updates pages to be responsive. 2017-10-24 14:17:35 -04:00
Gabe Mulley
7efa805fbc fix tests 2017-10-24 13:51:22 -04:00
bmedx
78ebffa861 Clean up survey warnings 2017-10-24 12:58:02 -04:00
Harry Rein
ed2e6dc889 Merge pull request #16306 from edx/HarryRein/responsive-dashboard 
Harry rein/responsive dashboard
 2017-10-24 12:33:12 -04:00
Uman Shahzad
0084b3b4ae Merge pull request #16303 from open-craft/uman/ent-tagline-logistration 
[ENT-671] Show the Enterprise tagline on the logistration page.
 2017-10-24 21:01:45 +05:00
Alex Dusenbery
5cf016cf5b EDUCATOR-1570 | Wire up a stub signal receiver to handle comment_created signals. 2017-10-24 11:32:07 -04:00
Gabe Mulley
44e5afba1e Revert "Revert "Merge pull request #16260 from edx/mulby/dynamic-deadline-upgrade-messaging"" 
This reverts commit b541dfa3fd.
 2017-10-24 11:18:06 -04:00
Uman Shahzad
0a726a4679 Show the Enterprise tagline on the logistration page. 2017-10-24 20:12:27 +05:00
Harry Rein
889e9880f5 Responsive dashboard and learner profile. 2017-10-24 11:08:35 -04:00
Hasnain
2277aaca3f WL-1060 | Made the dashboard social sharing site aware. 2017-10-24 16:35:44 +05:00
Clinton Blackburn
b574641f17 Minor update to if-else to avoid unnecessary query 
If an anonymous learner visits the course tab view, we now perform one
less query to check enrollment status. This query has been moved inside
an else statement, and is only called if the learer is logged in.
 2017-10-23 17:47:35 -04:00