Ned Batchelder
|
f5d0f3ff55
|
Remove useless pylint suppressions
|
2015-11-22 07:41:19 -05:00 |
|
muhammad-ammar
|
29acc3acfc
|
resolve merge conflicts
test fixes
|
2015-11-18 19:13:54 +05:00 |
|
muhammad-ammar
|
8d5f153201
|
Merge remote-tracking branch 'origin/release' into dj18-release-merge
Conflicts:
common/djangoapps/util/testing.py
lms/djangoapps/instructor/views/api.py
lms/djangoapps/teams/tests/test_views.py
openedx/core/djangoapps/programs/models.py
openedx/core/djangoapps/user_api/accounts/tests/test_views.py
requirements/edx/github.txt
|
2015-11-18 17:53:44 +05:00 |
|
Awais
|
86c66f5534
|
Adding cache implementation for the programs api.
ECOM-2832
|
2015-11-17 20:25:27 +05:00 |
|
Usman Khalid
|
6cb62f2697
|
Rebase upgrade Django to v1.8.5
Please note that this is a squshed commit and the work of:
Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
|
2015-11-10 15:00:19 -05:00 |
|
Ahsan Ulhaq
|
c47311b11f
|
Add the html and css and backend changes required for the xseries.
|
2015-10-30 20:59:26 +05:00 |
|
zubair-arbi
|
7f96474d01
|
basic programs api setup and dashboard integration
ECOM-2578
|
2015-10-29 20:07:51 +05:00 |
|
jsa
|
1bb29289f2
|
Programs: added platform support package and configuration model.
ECOM-2657
|
2015-10-25 21:30:26 -04:00 |
|