Commit Graph

7201 Commits

Author SHA1 Message Date
Douglas Hall
c604cada09 Merge pull request #13830 from edx/hasnain-naveed/WL-614
WL-614 | In Studio "View Live" button fix for theming.
2016-10-27 21:13:46 -04:00
Ned Batchelder
26ab60f2f9 Update translations (autogenerated message) 2016-10-27 14:36:21 -04:00
Hasnain
b2572ee2b3 WL-614 | In Studio "View Live" button fix for theming feature. 2016-10-27 14:35:14 -04:00
Ned Batchelder
53f8516b8e Merge pull request #13825 from edx/release
Release
2016-10-24 19:33:39 -04:00
Ned Batchelder
08f7198f16 Update translations (autogenerated message) 2016-10-20 15:42:15 +00:00
Robert Raposa
13222adf05 Upgrade MathJax to 2.7. 2016-10-20 10:53:04 -04:00
Eric Fischer
8f0134b7e4 update_course_in_cache should retry on exceptions
Previously, retry() was never called, so the task was never retried despite
defining several retry-related variables.
2016-10-19 14:09:28 -04:00
Nimisha Asthagiri
6e7f131c40 Merge pull request #13790 from edx/release
Merge Release to Master
2016-10-18 19:23:23 -04:00
Christina Roberts
fbf0e9447c Merge pull request #13685 from indagation/http-duplicate-fix
Removed unnecessary http:
2016-10-18 17:53:16 -04:00
Robert Raposa
4d301b9b98 Revert MathJax -full config. 2016-10-18 13:55:25 -04:00
Christina Roberts
046ee7bd96 Merge pull request #12923 from CredoReference/static-page-for-instructors-only
Ability to hide Pages from students
2016-10-17 17:10:33 -04:00
Robert Raposa
13495d88ab Use MathJax -full config. 2016-10-17 16:50:31 -04:00
Gregory Martin
2f868e5e24 Merge pull request #13733 from edx/yro_localized-datetime
Set up DateUtil factory, modify requests to handle moment-timezones, moment-with-locales.
2016-10-17 10:10:58 -04:00
Dmitry Viskov
bb09fdb7be Ability to hide Pages from students 2016-10-14 22:43:26 +03:00
Greg Martin
4ddda443b8 Implement localized datetimes in browser
moment-timezone require config

jasmine test fix, duplicate req. cleanup
2016-10-14 15:25:38 -04:00
Eric Fischer
c4c2875232 Route grading updates to low priority queue 2016-10-14 14:24:08 -04:00
Andy Armstrong
03c3ee53e5 Move cors_crsf to openedx/core 2016-10-14 13:59:01 -04:00
Ned Batchelder
eaa0989c6a Update translations (autogenerated message) 2016-10-14 10:14:17 -04:00
chrisndodge
6d327594ac add restricted DOT OAUTH2 client with reduced privileges 2016-10-14 07:31:26 -04:00
Andy Armstrong
4d4097e13c Move dark_lang and lang_pref apps to openedx/core 2016-10-13 11:56:24 -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
172ea1a913 Merge pull request #13700 from edx/andya/move-session-inactivity-timeout
Move session_inactivity_timeout to openedx/core
2016-10-12 07:18:13 -04:00
Syed Hasan raza
97ebdb0301 Merge pull request #13633 from edx/shr/bug/TNL-557-conditional-module-children-modules-empty-context
Fix empty context KeyError for conditional module
2016-10-12 13:04:34 +05:00
Andy Armstrong
0b24614d6f Move session_inactivity_timeout to openedx/core 2016-10-12 00:17:54 -04:00
Nimisha Asthagiri
27c99e1cf2 Move header_control from common to openedx/core 2016-10-11 17:56:56 -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
Syed Hassan Raza
c41db159f4 Fix empty context KeyError for conditional module 2016-10-11 19:15:06 +05:00
Adam Palay
da58ad2a2b only dump courses to neo4j if they've been updated since the last time they were dumped
improvements to the command line interface for caching
2016-10-11 08:20:23 -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
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
Nimisha Asthagiri
fd49f88e08 Moves external_auth from common to openedx/core. 2016-10-07 12:34:22 -04:00
Nimisha Asthagiri
c703834ebf Move heartbeat from common to openedx/core 2016-10-07 10:42:47 -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
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
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
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
Kyle Boots
2028713cc4 Removed unnecessary http: 2016-10-06 18:07:43 -04:00
muhammad-ammar
c3b6b10478 Problem (capa) feedback UX revamp.
TNL-4877
2016-10-06 17:34:43 -04:00
Nimisha Asthagiri
2c7975f804 Move cache_toolbox from common to openedx/core. 2016-10-06 16:57:00 -04:00
John Eskew
24d29be3f3 Merge pull request #13667 from edx/jeskew/move_monkey_patch
Move monkey_patch to openedx.core.djangoapps.
2016-10-06 14:32:35 -04:00
Andy Armstrong
a63bb0e50f Merge pull request #13664 from edx/andya/common-refactoring
Move pipeline_js Django app into CMS
2016-10-06 14:24:45 -04:00
Andy Armstrong
a75f64b6c0 Move service_status from common into openedx 2016-10-06 13:37:35 -04:00
Andy Armstrong
0f18b740c8 Move pipeline_js Django app into CMS
Note: this used to be in common, but it was only used in Studio.
2016-10-06 12:08:04 -04:00
Ned Batchelder
4fe01bfb88 Update translations (autogenerated message) 2016-10-06 14:35:43 +00:00
Andy Armstrong
96a572dded Remove empty reverification Django app 2016-10-06 10:35:08 -04:00