Commit Graph

49500 Commits

Author SHA1 Message Date
Jeremy Bowman
47516dbead Run python-modernize on student/*.py (#20411) 2019-05-06 14:50:42 -04:00
Michael Youngstrom
5f9d418d0f Merge pull request #20404 from mitodl/pdpinch/modernize-video_config
INCR-157 Modernize openedx/core/djangoapps/video_config
2019-05-06 14:38:20 -04:00
Nimisha Asthagiri
bda16a9b6b Merge pull request #20354 from edx/bom/adr-python-api
Initial top-level ADRs
2019-05-06 13:22:26 -04:00
Peter Pinch
c01d0ef6e4 modernize video_config 2019-05-06 11:18:57 -04:00
Michael Youngstrom
60af78ec40 Merge pull request #20405 from edx/youngstrom/fix-pip-installs
Fix make upgrade
2019-05-06 11:03:34 -04:00
Michael Youngstrom
a91b9dd375 Fix make upgrade 2019-05-06 10:13:42 -04:00
irfanuddinahmad
c0f13e787b Merge pull request #20403 from edx/iahmad/ENT-1836-version-bump-for-edx-enterprise
Version bump for edx-enterprise
2019-05-06 15:22:04 +05:00
AsadAzam
e0bac508dd Merge pull request #20381 from edx/asad/prod-230-added-logs
Added logs
2019-05-06 12:28:40 +05:00
AsadAzam
0e8a24c60e Merge pull request #20391 from edx/asad/educator-4013-remove-logs
Reverted logs
2019-05-06 12:28:12 +05:00
irfanuddinahmad
992b628394 Version bump for edx-enterprise 2019-05-06 10:51:38 +05:00
Nimisha Asthagiri
eb0791ec89 Inter-app API cleanup for Grades 2019-05-04 11:35:06 -04:00
Nimisha Asthagiri
a943a2cb63 Top-level ADR-2: Inter-App APIs 2019-05-04 11:00:15 -04:00
Nimisha Asthagiri
2e549c0545 Top-level ADR-1: Courses in LMS
Refactored the previous best-practices document as an ADR.
Previous document: 07f588517b/docs/best_practices.rst
2019-05-04 10:22:36 -04:00
Nimisha Asthagiri
4d66633d78 testing.rst: update regarding acceptance tests 2019-05-04 10:22:35 -04:00
Nimisha Asthagiri
7f3727d84f Refactor top-level docs directory 2019-05-04 10:22:35 -04:00
Michael Youngstrom
06bc6fbd82 Merge pull request #20370 from edx/youngstrom/fix-make-upgrade
Bump pip-tools and run make upgrade
2019-05-03 16:10:10 -04:00
Diana Huang
c8593a8615 Merge pull request #20265 from edx/diana/remove-diff-paid
Remove Diff Paid experimental features.
2019-05-03 16:03:48 -04:00
Feanil Patel
67db3155ff Merge pull request #20101 from stvstnfrd/split-core/calc
Split calc package out into an independent package
2019-05-03 15:59:27 -04:00
Michael Youngstrom
b0b1d85d8a Bump pip-tools and run make upgrade 2019-05-03 15:28:56 -04:00
Richard I Reilly
14fc1921b9 Merge pull request #20341 from edx/rir/programEnrollmentPost
Rir/program enrollment post
2019-05-03 15:21:23 -04:00
Diana Huang
c6a89b03b9 Remove Diff Paid experimental features. 2019-05-03 15:09:20 -04:00
Alex Dusenbery
a3ac84f007 Ignore expected call order in cohorts test. 2019-05-03 14:43:07 -04:00
Michael Youngstrom
3cd57bdb4b Merge pull request #20395 from edx/testeng/bokchoy_auto_cache_update_b33e0716c48cbe1d897ae0400ad750fba75e4f9b
Bokchoy Testing DB Cache update
2019-05-03 14:33:12 -04:00
Rick Reilly
350b4a2589 Add POST method for program enrollments 2019-05-03 14:14:04 -04:00
edX cache uploader bot
e3079c2eb3 Updating Bokchoy testing database cache 2019-05-03 13:41:08 -04:00
Alex Dusenbery
403fb52e93 Add a GET endpoint to list ProgramCourseEnrollment data. 2019-05-03 13:39:10 -04:00
Nimisha Asthagiri
44359938c4 Merge pull request #20392 from edx/bom/discussion-consolidation-try-again
Discussions consolidation (2nd attempt)
2019-05-03 13:35:00 -04:00
Nimisha Asthagiri
dfa3728edf Move django_comment_common from common to openedx 2019-05-03 12:10:18 -04:00
Nimisha Asthagiri
c606aaeb57 Discussion consolidation: quality 2019-05-03 12:09:47 -04:00
Nimisha Asthagiri
7b4b6c3539 Move notifier and notification_prefs to discussion/ 2019-05-03 12:09:47 -04:00
Nimisha Asthagiri
e160b23903 Move django_comment_client to discussion/ 2019-05-03 12:09:46 -04:00
Nimisha Asthagiri
b949452eb2 Move discussion_api to discussion/rest_api 2019-05-03 12:07:21 -04:00
Nimisha Asthagiri
16edae0822 Move comment_client into django_comment_common 2019-05-03 12:07:20 -04:00
Matthew Piatetsky
38aeafefb0 Merge pull request #20363 from edx/REVMI-170
[WIP] add first purchase offer banner on course home
2019-05-03 11:56:21 -04:00
asadazam93
eb2422990c Reverted logs 2019-05-03 16:10:17 +05:00
asadazam93
bc324c8cd4 Added logs 2019-05-03 15:13:49 +05:00
Uzair Rasheed
a72d71deea Merge pull request #20380 from edx/PROD-185/fix-text-alignment-in-table
Fix text alignment for word-break
2019-05-03 12:50:11 +05:00
stv
e72967e349 Split calc package out into an independent package
This is part of a larger effort to split packages out into independent,
composable, PyPI installable Python packages.

While this package itself isn't monumental, it represents the bottom of
the dependecy tree and can be split out before any other packages.
2019-05-02 15:26:02 -07:00
stv
f984c277e4 Install calc from new edx repo 2019-05-02 15:25:39 -07:00
jansenk
6052a4e4c6 add program course enrollment post endpoint 2019-05-02 17:42:18 -04:00
Matthew Piatetsky
75dc4459cd add first purchase discount banner on course home 2019-05-02 16:14:16 -04:00
Nimisha Asthagiri
4140e17946 Merge pull request #20387 from edx/revert-20355-bom/discussions-colocation
Revert "Discussions consolidation"
2019-05-02 15:59:35 -04:00
Alex Dusenbery
464eb5b354 omgz check if the list is empty before you pick something from it (bokchoy) 2019-05-02 15:40:39 -04:00
Nimisha Asthagiri
ef0e06cc0a Revert "Discussions consolidation" 2019-05-02 14:59:56 -04:00
Dave St.Germain
d9c7db3c44 Merge pull request #20367 from edx/dcs/ada-reason
Added a reason field for due date extensions
2019-05-02 14:27:07 -04:00
Hammad Ahmad Waqas
c1c830160a Merge pull request #20340 from edx/hammad/WL-1913
WL-1913 | sync_hubspot_contacts Jenkins job disabled due to OOM
2019-05-02 17:23:53 +05:00
Nimisha Asthagiri
83f35b544d Merge pull request #20355 from edx/bom/discussions-colocation
Discussions consolidation
2019-05-02 08:08:03 -04:00
uzairr
64a87c9173 Fix text alignment for word-break
Recent google chrome updates showing awkard alignments on table.To
avoid them modifications in word-break css property are carried out
so that usability of content remains coherent on all browsers.

PROD-185
2019-05-02 16:19:08 +05:00
Hammad Ahmad Waqas
0ea3080ed0 slicing users_queryset and fetching users from database according to
initial_sync_days
2019-05-02 15:42:55 +05:00
adeelehsan
194d158a3f Merge pull request #20379 from edx/zamir/fix_email_template
Remove extra quotation mark from template
2019-05-02 12:40:49 +05:00