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

13991 Commits

Author SHA1 Message Date
Andy Armstrong
f2c3fa90f9 Merge pull request #13677 from edx/andya/move-language-apps 
Move dark_lang and lang_pref apps to openedx/core
 2016-10-13 14:47:37 -04:00
Brian Beggs
9a23babc9d Merge pull request #13747 from edx/release 
Merge hotfix back to master.
 2016-10-13 14:46:02 -04:00
Andy Armstrong
4d4097e13c Move dark_lang and lang_pref apps to openedx/core 2016-10-13 11:56:24 -04:00
Nimisha Asthagiri
14d8a46d8c Merge pull request #13739 from edx/flaky/cohort-test 
Fix flaky bokchoy test: test_automatic_cohort_help, test_manual_cohort_help
 2016-10-13 11:36:37 -04:00
Robert Raposa
e96bcbd79e Merge pull request #13682 from edx/robrap/urls-2 
Move more urls.py
 2016-10-13 10:34:03 -04:00
Nimisha Asthagiri
9ed598e607 Merge pull request #13708 from edx/jeskew/move_config_models_to_external_repo 
Remove config_models & use external config_models repo instead.
 2016-10-13 08:55:01 -04:00
Nimisha Asthagiri
9f1d4cbf6f Fix flaky test_automatic_cohort_help bokchoy test 
TNL-5709
 2016-10-13 03:58:01 -04:00
Muzaffar yousaf
9d87472804 Merge pull request #13697 from edx/mzfr/flaky-bokchoy-4954 
Fixing flaky test_studio_help_links
 2016-10-13 12:02:40 +05:00
alisan617
8d429a91f3 add child of text check unit page 2016-10-12 17:23:51 -04:00
Robert Raposa
8a9cf7e10e Move track.views to new urls.py 2016-10-12 14:37:18 -04:00
Brian Beggs
fa81f303f5 Merge pull request #13735 from edx/release 
Merge release -> master for release-2016-10-12
 2016-10-12 14:06:17 -04:00
Robert Raposa
3f7503336e Merge pull request #13672 from edx/robrap/urls 
Move student.views to student/urls.py
 2016-10-12 08:47:53 -04:00
Andy Armstrong
0b24614d6f Move session_inactivity_timeout to openedx/core 2016-10-12 00:17:54 -04:00
Jillian Vogel
3b7ca029c9 Merge pull request #13713 from open-craft/fix-reverted-itsjeyd/inline-discussion-assets 
Fix Reverted: Have DiscussionXBlock take care of loading JS and CSS files it depends on
 2016-10-12 13:38:48 +10:30
Nimisha Asthagiri
27c99e1cf2 Move header_control from common to openedx/core 2016-10-11 17:56:56 -04:00
Andy Armstrong
fbdc34e7f4 Merge pull request #13699 from edx/andya/move-contentserver 
Move contentserver to openedx/core
 2016-10-11 16:10:28 -04:00
Albert St. Aubin
088b5c6615 Corrected issue with the Show Hint button enabled state with single hint. 
TNL-5737
 2016-10-11 15:50:40 -04:00
Nimisha Asthagiri
f5ef22adeb Merge pull request #13695 from edx/common_cleanup/audit_log 
Move audit_log utility function to openedx/core
 2016-10-11 13:33:00 -04:00
alisan617
69b5a4adfc classname clash in uxpl shims TNL-5534 2016-10-11 12:51:01 -04:00
Andy Armstrong
684aec8740 Move contentserver to openedx/core 2016-10-11 12:49:33 -04:00
Robert Raposa
fea03e466c Move student.views to student/urls.py 2016-10-11 11:41:16 -04:00
Tim Krones
3649f8181d Have DiscussionXBlock take care of loading JS and CSS files it depends on. 
* Add openedx.core.lib.xblock_builtin.get_css_dependencies and get_js_dependencies,
  which respect PIPELINE_ENABLED setting when determining dependencies.
* Move new discussion-related Sass files into discussion subdirectory.
* Use "load_unicode" instead of "render_template" to load JS to add to fragment for DiscussionXBlock.
* Remove unused "course" parameter from context for DiscussionXBlock.student_view.
* Add RTL stylesheet for DiscussionXBlock, and enable the block to load correct stylesheet.
* Load MathJax only once, and include code for configuring MathJax in discussion bundle.
* Make sure username renders correctly in DiscussionXBlock response header.
* Move WYSIWYIG Markdown editor styles to _build-discussion.scss.
* Remove unnecessary import of discussion/utilities/v1-compatibility from _build-discussion.scss.
* Keep courseware-chromeless.html in sync with courseware.html.
* Load CSS for discussions on Teams tab.  This makes it possible to remove CSS for discussions from Sass files for "Course" tab.
* Load js/src/tooltip_manager.js, jquery.autocomplete.js and jquery.autocomplete.css on "Course" tab.
 2016-10-12 01:22:42 +10:30
Andy Armstrong
51167aedef Merge pull request #11710 from raccoongang/kssl/ui_conditional_module 
Add ui in studio for conditional_module.
 2016-10-11 10:45:39 -04:00
muzaffaryousaf
92d502510e Fixing flaky test_studio_help_links 
TNL-4954
 2016-10-08 16:43:03 +05:00
Tasawer
1ac94921c3 Show verification expiration message on learner dashboard and allow them to reverify if expiration is X days away. 
ECOM-2979
 2016-10-08 11:32:02 +05:00
Brandon DeRosier
6e23a2ca95 Merge pull request #13196 from open-craft/haikuginger/change-coaches-to-staff 
Change CCX coaches to have staff role on CCX courses.
 2016-10-07 18:29:14 -04:00
Bill DeRusha
a776733d51 Merge pull request #13638 from edx/bderusha/utm-tracking 
Add UTM tracking for registrations
 2016-10-07 17:45:43 -04:00
Edward Zarecor
ed7f32ee27 Merge pull request #13678 from edx/e0d/ignore-email-case 
comparison should be case-insensitive
 2016-10-07 16:42:09 -04:00
Nimisha Asthagiri
cf2c48ab8f Merge pull request #13688 from edx/common_cleanup/datadog 
Move datadog from common to openedx/core
 2016-10-07 14:13:34 -04:00
John Eskew
4fb3da23e4 Remove config_models & use external config_models repo instead. 2016-10-07 14:13:10 -04:00
Nimisha Asthagiri
5cb129e222 Merge pull request #13690 from edx/common_cleanup/heartbeat 
Move heartbeat from common to openedx/core
 2016-10-07 13:59:25 -04:00
Nimisha Asthagiri
0df9fb355b Merge pull request #13692 from edx/common_cleanup/monitoring 
Move monitoring from common to openedx/core
 2016-10-07 13:52:00 -04:00
Edward Zarecor
569e6745ef is 2016-10-07 13:46:26 -04:00
Nimisha Asthagiri
3b304029e6 Merge pull request #13679 from edx/common_cleanup/remove_old_one_off_script 
Move sync_user_info management command from common to LMS
 2016-10-07 13:44:43 -04:00
Nimisha Asthagiri
010f7eb5c8 Merge pull request #13684 from edx/student_cleanup/decoupled_dependencies 
Decouple student's dependency on badges with django signals
 2016-10-07 13:44:11 -04:00
Nimisha Asthagiri
2112e7f8c8 Merge pull request #13659 from edx/common_cleanup/external_auth 
Moves external_auth from common to openedx/core
 2016-10-07 13:39:21 -04:00
e0d
1841fe9b92 comparison should be case-insensitive 
test

quality
 2016-10-07 13:38:00 -04:00
Nimisha Asthagiri
2b9e60ad17 Merge pull request #13691 from edx/common_cleanup/performance 
Move performance from common to openedx/core
 2016-10-07 13:25:51 -04:00
Nimisha Asthagiri
6793c8f6ab Move audit_log utility function to openedx/core 2016-10-07 13:25:08 -04:00
Nimisha Asthagiri
fd49f88e08 Moves external_auth from common to openedx/core. 2016-10-07 12:34:22 -04:00
Jesse Shapiro
8533fd9734 Adding change to staff role for new users and draft migration 2016-10-07 11:52:59 -04:00
alisan617
d7c841f80d Merge pull request #13703 from edx/alisan/capa-button-bar-label-minor-fix 
put display previously removed in capa space pr
 2016-10-07 11:46:19 -04:00
Brian Jacobel
bc66285b53 Merge pull request #13588 from edx/bjacobel/5555 
UX improvements to sequence nav
 2016-10-07 11:09:45 -04:00
Mushtaq Ali
23388588e7 Merge pull request #13564 from edx/mushtaq/video-transcript 
Handle when no video transcript uploaded for a language
 2016-10-07 20:08:25 +05:00
Nimisha Asthagiri
c703834ebf Move heartbeat from common to openedx/core 2016-10-07 10:42:47 -04:00
alisan617
e1f2072c42 put display previously removed in capa space pr 2016-10-07 10:32:05 -04:00
Bill DeRusha
9877c6ad6e Add UTM tracking for registrations 
Add UTM cookie tracking for registrations.
Add config model for cookie names.

ECOM-5539
 2016-10-07 10:27:57 -04:00
Mushtaq Ali
11a07ca8c9 Show validation message when no transcript file uploaded for a language in a video component in studio. 
Also, don't show respective transcript language in video language menu when a related transcript is not uploaded for that language.

TNL-5200
 2016-10-07 19:15:44 +05:00
Nimisha Asthagiri
74912bc50d Merge pull request #13693 from edx/common_cleanup/geoinfo 
Move geoinfo from common to openedx/core
 2016-10-07 10:04:13 -04:00
Andy Armstrong
12ec1fffba Merge pull request #13668 from edx/andya/remove-empty-reverification-app 
Remove empty reverification Django app
 2016-10-07 09:51:28 -04:00