Gabe Mulley
fce9344ddc
new relic tracing for ace
2017-10-18 10:29:53 -04:00
Brian Mesick
9e91d3d0be
Merge pull request #16070 from edx/bmedx/settings_tuple_to_list_PLAT-1530
...
Change Django settings from tuples to lists to prep for 1.11 upgrade
2017-10-18 09:20:14 -04:00
sanfordstudent
d4ff8c1597
Merge pull request #16254 from edx/sstudent/EDUCATOR-1511
...
add logging for EDUCATOR-1511
2017-10-18 09:19:02 -04:00
Brian Mesick
ba4c6ca2aa
Merge pull request #16256 from edx/bmedx/django111_models_and_migrations_cleanup
...
Remove empty models.py files
2017-10-18 09:03:32 -04:00
John Eskew
eb99657770
Merge pull request #16220 from edx/jeskew/delete_historical_data
...
Mgmt commands to clear data from historical tables.
2017-10-18 09:00:21 -04:00
Uman Shahzad
c35ab5c9ae
Merge pull request #16259 from open-craft/uman/0.52.2
...
[ENT-685] Bump edx-enterprise to 0.52.2.
2017-10-18 17:37:55 +05:00
Gabe Mulley
9c63d1f338
Merge pull request #16251 from edx/include-upsell-in-10-day
...
include upsell messaging in the 10 day nudge emails
2017-10-18 08:37:41 -04:00
Uman Shahzad
80084bb295
Bump edx-enterprise to 0.52.2.
2017-10-18 16:09:11 +05:00
Uman Shahzad
b7011ec85c
Merge pull request #16199 from edx/mattdrayer/ENT-698
...
mattdrayer/ENT-698: Log additional context for SuccessFactors errors.
2017-10-18 15:01:03 +05:00
Matt Drayer
8e51c69a51
Log additional context for SuccessFactors errors.
2017-10-18 12:41:35 +05:00
Gabe Mulley
02aae86b30
Merge pull request #16244 from edx/fix-flaky-test
...
fix flaky throttling test
2017-10-17 21:48:10 -04:00
Uman Shahzad
0ebeda25b6
Merge pull request #16239 from open-craft/uman/0.52.0
...
[ENT-643] Bump edx-enterprise to 0.52.1.
2017-10-18 06:26:36 +05:00
McKenzie Welter
0375e42d59
Merge pull request #16167 from edx/McKenzieW/course-cert-hours-of-effort
...
Flag for Hours of Effort in course certificates
2017-10-17 18:27:22 -04:00
Braden MacDonald
d64e0b9501
Merge pull request #16047 from open-craft/cliff/block-completion-model
...
Block completion model
2017-10-17 15:06:34 -07:00
McKenzie Welter
39bf59e6d3
Flag for Hours of Effort in course certificates
...
Retrieve different data fields from Discovery
2017-10-17 17:07:54 -04:00
bmedx
763fa4de99
Remove empty models.py files
2017-10-17 16:21:21 -04:00
Uman Shahzad
4055cc00cc
Bump edx-enterprise to 0.52.1.
2017-10-18 00:50:00 +05:00
John Eskew
f3e089bd3f
Mgmt commands to clear data from historical tables.
2017-10-17 15:27:59 -04:00
Sanford Student
5c90b786fe
add logging for EDUCATOR-1511
2017-10-17 15:09:15 -04:00
Sofiya Semenova
7382fe12aa
Merge pull request #16203 from edx/ssemenova/dashboard-cert-info
...
Clean up dashboard_certificate_information template.
2017-10-17 14:50:42 -04:00
J. Cliff Dyer
4ab64f76a2
Add BigAutoField for BlockCompletion primary key.
2017-10-17 14:45:49 -04:00
J. Cliff Dyer
6f89157d62
Introduce BlockCompletion model.
...
* Includes custom manager.
* Includes percent validation.
* Includes useful indices.
* Subclasses TimeStampedModel
OC-3086
2017-10-17 14:35:58 -04:00
Sofiya Semenova
b8d73df5a4
Cleaning up dashboard_certificate_information template.
2017-10-17 13:27:19 -04:00
bmedx
21791ccb58
Change Django settings from tuples to lists to prep for 1.11 upgrade
2017-10-17 12:53:02 -04:00
Tyler Hallada
1dc9b1194f
Merge pull request #16209 from edx/thallada/dont-send-emails-after-course-end
...
Don't send RET emails after course end
2017-10-17 10:52:18 -04:00
Troy Sankey
e507dac87c
Merge pull request #16247 from edx/pwnage101/avoid_implicit__in_query_PLAT-1525
...
Use singular getter function where only one requirement is expected
2017-10-17 10:43:32 -04:00
Matt Tuchfarber
77c1ca51d8
Merge pull request #16248 from edx/tuchfarber/program_marketing_edits
...
Fix program marketing page to assume less (fix 500 error on stage/prod)
2017-10-17 10:31:26 -04:00
Gabe Mulley
34cc63d993
remove slow and flaky throttling tests
2017-10-17 09:25:22 -04:00
Muzaffar yousaf
1266fbf67a
Merge pull request #16253 from edx/fix-quality-voilation
...
Fix quality issues to get green build for master.
2017-10-17 17:32:12 +05:00
muzaffaryousaf
ef8b2994cc
Fix quality issues to get green build for master.
2017-10-17 16:33:58 +05:00
Muzaffar yousaf
b34b5d9a12
Merge pull request #15872 from edx/video-transcript-preferences
...
Video transcript preferences
2017-10-17 14:45:29 +05:00
Waheed Ahmed
f520f9bd4e
Merge pull request #16202 from edx/waheed/LEARNER-2769-course-dates-web-fragment
...
Course dates web fragment for mobile apps.
2017-10-17 14:29:08 +05:00
Waheed Ahmed
202f190104
Course dates web fragment for mobile apps.
...
Implement a course dates fragment as a web view, currently we are using
the course info page to get the course dates section by parsing the
whole html page.
LEARNER-2769
2017-10-17 13:09:38 +05:00
Gabe Mulley
71a62f827c
use pixel measurements
2017-10-16 22:33:23 -04:00
Gabe Mulley
7ab0f39df0
include upsell messaging in the 10 day nudge emails
2017-10-16 22:22:22 -04:00
Troy Sankey
2eba1b5122
Use singular getter function where only one requirement is expected
...
This avoids a fatal error in Django 1.9+ in most scenarios, where this
code (before this commit) will no longer result in an implicit __in
query. This commit should be a no-op functionally for Django 1.8.
More info: https://code.djangoproject.com/ticket/25284
PLAT-1525
2017-10-16 17:35:32 -04:00
Tyler Hallada
1c8fcf218a
Fix tests
2017-10-16 16:15:10 -04:00
Matt Tuchfarber
17dd47bf76
Assume less perfect data
2017-10-16 15:46:10 -04:00
Andy Armstrong
80126fc79f
Merge pull request #16232 from edx/andya/bootstrap-support-modal
...
Make the support modal responsive
2017-10-16 14:39:51 -04:00
Andy Armstrong
fb820f9b25
Merge pull request #16211 from edx/andya/further-stylelint-fixes
...
More Sass quality fixes
2017-10-16 14:39:21 -04:00
edx-pipeline-bot
c011e7134d
Merge pull request #16243 from edx/release-mergeback-to-master
...
Merge release back to master
2017-10-16 14:14:37 -04:00
Andy Armstrong
af4d419824
Make the support modal responsive
...
LEARNER-142
2017-10-16 13:33:50 -04:00
Gabe Mulley
7d6aa950e9
fix flaky throttling test
2017-10-16 12:46:00 -04:00
Andy Armstrong
bd1a0d96cf
More Sass quality fixes
2017-10-16 12:41:20 -04:00
Gabe Mulley
4a13f9bf53
ACE writes to a file by default
2017-10-16 12:17:25 -04:00
Tyler Hallada
bf95f2371c
Standardize on var names: *_datetime and *_day
2017-10-16 11:33:45 -04:00
Tyler Hallada
3c250e5649
Address Gabe's comments
2017-10-16 11:12:19 -04:00
Tyler Hallada
5bfb322f1e
Don't send RET emails after course end
2017-10-16 11:11:16 -04:00
muzaffaryousaf
d4147e7d37
Update edx-val dependency.
2017-10-16 19:23:39 +05:00
Qubad786
d6acfa679f
Add video source language support for Cielo24 - EDUCATOR-1491
2017-10-16 19:23:19 +05:00
