Commit Graph

38890 Commits

Author SHA1 Message Date
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
Simon Chen
b4dd18b16a Merge pull request #13578 from edx/tasawer/ecom-2979/learner-reverification-flow-update
Fixing issues with photo verification flow
2016-10-11 09:16:15 -04:00
Ahsan Ulhaq
b5e0d547fd Merge pull request #13649 from edx/ahsan/ECOM-5758-user-menu-role-information
User Menu Added Role information missing from menu items
2016-10-08 12:28:28 +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
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
84bdd8598b Merge pull request #13686 from edx/openedx_cleanup/misc
Remove few LMS references from openedx/core
2016-10-07 13:33:51 -04:00
Brian Beggs
8371e21b3c Merge pull request #13701 from edx/edx-django-release-util/0.1.2
Change edx-django-release-util version.
2016-10-07 13:30:12 -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
fd49f88e08 Moves external_auth from common to openedx/core. 2016-10-07 12:34:22 -04:00
Brandon DeRosier
9563b4d2fe Change content groups message when in a CCX 2016-10-07 11:59:16 -04:00
Brandon DeRosier
8c3224b4f0 Finish implementing CCX coach as staff 2016-10-07 11:53:32 -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
John Eskew
60294f2739 Updating edx-django-release-util requirement to version 0.1.2 2016-10-07 10:20:16 -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
Nimisha Asthagiri
af5f7789d1 Move datadog from common to openedx/core. 2016-10-07 08:57:02 -04:00
Nimisha Asthagiri
c8bca627f0 Move monitoring from common to openedx/core 2016-10-07 08:43:24 -04:00
noraiz-anwar
0f3a146177 Merge pull request #13551 from noraiz-anwar/na/mathjax-fix
Fix mathjax rendering
2016-10-07 16:58:03 +05:00
Muhammad Ammar
07caef951f Merge pull request #13696 from edx/ammar/fix-attribute-access
fix attribute access
2016-10-07 16:10:50 +05:00
Ahsan Ulhaq
2ef42cbc51 User Menu Added Role information missing from menu items 2016-10-07 15:28:55 +05:00
muhammad-ammar
aed1ea8028 fix attribute access 2016-10-07 12:14:32 +05:00
Nimisha Asthagiri
07801f3b96 Move performance from common to openedx/core 2016-10-07 00:39:39 -04:00
Nimisha Asthagiri
579145f0e1 Move geoinfo from common to openedx/core 2016-10-07 00:26:35 -04:00
Nimisha Asthagiri
7b365bcaa0 Move view_course_access functionality to sole caller lms/mobile_api. 2016-10-06 22:28:23 -04:00
Nimisha Asthagiri
9ae36152e8 Have core module use common's JsonResponse utility instead of LMS's. 2016-10-06 22:18:04 -04:00
Nimisha Asthagiri
15d9883f76 Create core/url_utils.py, moving utilities from lms_xblock/runtime 2016-10-06 21:59:11 -04:00
Christina Roberts
256223d07b Merge pull request #13052 from edx/alisan/capa-problem-button-bar-tnl4880
Problem (capa) feedback rework
2016-10-06 21:20:25 -04:00
Andy Armstrong
1da5572830 Merge pull request #13674 from edx/andya/move-i18n-tests
Move i18n_tests from common into pavelib
2016-10-06 20:17:55 -04:00
Andy Armstrong
9f08457c53 Merge pull request #13675 from edx/andy/move-service-status
Move service_status from common into openedx
2016-10-06 20:16:07 -04:00
Nimisha Asthagiri
1717e0c4f6 Decouple student's dependency on badges with django signals. 2016-10-06 18:13:37 -04:00
Nimisha Asthagiri
8ebc4106f2 Merge pull request #13673 from edx/common_cleanup/cache_toolbox
Move cache_toolbox from common to openedx/core
2016-10-06 18:07:46 -04:00
muhammad-ammar
47280eddb6 support descriptons for multiple inputs group
TNL-5403
2016-10-06 17:36:04 -04:00
cahrens
1122c40f07 Moving ignore rules to relevant classes instead general rule.
Also replaces section with div, updates short_id, and makes textbox accessible.

TNL-5576, TNL-5575, TNL-5574, TNL-5671, TNL-5376
2016-10-06 17:35:54 -04:00