Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

4136 Commits

Author SHA1 Message Date
Usman Khalid
f6193c872e Merge pull request #10059 from edx/usman/use-included-staticfiles-app 
Upgrade django pipeline to v.1.5.3.
 2015-10-08 16:10:36 +05:00
Zia Fazal
14c310017b minimum score percentage rounded 
round before converting a decimal into integer
 2015-10-08 12:01:40 +05:00
mushtaqali
296f75a07c Add template escaping in forums, progress page and course container TNL-2395, TNL-2394, TNL-2393 2015-10-07 11:20:51 -04:00
Usman Khalid
dbcd1bf430 Use django.contrib.staticfiles instead of django-staticfiles. 
TNL-3137
 2015-10-06 19:52:38 +05:00
Brian Beggs
143ca802ae Merge pull request #10043 from edx/revert-9934-usman/use-included-staticfiles-app 
Revert "Upgrade django-pipeline and staticfiles"
 2015-10-05 15:29:17 -04:00
Bill DeRusha
fe23052511 Merge pull request #9979 from edx/bderusha/boardman-traffic 
Add IP to all python Segment tracking calls
 2015-10-05 14:55:55 -04:00
Brian Beggs
0ca679e244 Revert "Upgrade django-pipeline and staticfiles" 2015-10-05 14:40:28 -04:00
Usman Khalid
0ce679fc06 Merge pull request #9934 from edx/usman/use-included-staticfiles-app 
Upgrade django-pipeline and staticfiles.
 2015-10-02 22:37:24 +05:00
David Baumgold
0219e18fa8 Merge pull request #10023 from edx/release 
Release into master
 2015-10-02 12:58:50 -04:00
Usman Khalid
2b59d46a31 Use django.contrib.staticfiles instead of django-staticfiles. 
TNL-3137
 2015-10-02 18:26:25 +05:00
Bill DeRusha
ca6633bd98 Add IP to all python Segment tracking calls 2015-10-01 21:21:16 -04:00
Bill DeRusha
bcb71a3255 Rename SEGMENT_KEY to have a unique key name for both CMS and LMS 2015-10-01 19:40:27 -04:00
David Baumgold
69bc10235e Merge remote-tracking branch 'remotes/origin/release' into release-2015-10-01-resolve-merge-conflicts 2015-10-01 15:28:55 -04:00
chrisndodge
d9a21d72fc Merge pull request #9945 from edx/cdodge/credit-status-messaging 
Make the message to the end user consistent across as requirement typ…
 2015-09-30 12:40:59 -04:00
chrisndodge
cc15a9ada8 Merge pull request #9975 from edx/cdodge/bump-proctoring 
update reference to edx-proctoring to account for requested iconograp…
 2015-09-30 12:38:31 -04:00
David Baumgold
459f2e0705 Disable some tests for comprehensive theming 
Depends on functionality that has been temporarily reverted
 2015-09-30 12:18:09 -04:00
David Baumgold
7cd9db1216 Disable some tests for comprehensive theming 
Depends on functionality that has been temporarily reverted
 2015-09-30 11:33:41 -04:00
Chris Dodge
bf26b09265 update reference to edx-proctoring to account for requested iconography changes from UX team. Also update test to conform with changes 2015-09-30 10:10:23 -04:00
Chris Dodge
799571b213 Make the message to the end user consistent across as requirement types, except for grade requirements 2015-09-29 22:24:59 -04:00
Bill DeRusha
a6873cb883 Merge pull request #9875 from edx/bderusha/segment-cleanup 
Segment Clean Up
 2015-09-29 10:33:03 -04:00
Brian Beggs
d9de52751d Merge remote-tracking branch 'origin/release' into bbeggs/2015-09-22-release-to-master 2015-09-28 20:58:34 -04:00
Ben Patterson
2fd6add524 Revert "Merge DRF 3.1 in to master" 2015-09-28 17:12:43 -04:00
Will Daly
d11ccad0fc Upgrade djangorestframework to v3.1 
* Upgrade edx-submissions
* Upgrade edx-ora2
* Upgrade edx-val
* Upgrade edx-proctoring
* Update all edx-platform code that depends on DRF, including:
  - auth_exchange
  - cors_csrf
  - embargo
  - enrollment
  - util
  - commerce
  - course_structure
  - discussion_api
  - mobile_api
  - notifier_api
  - teams
  - credit
  - profile_images
  - user_api
  - lib/api (OAuth2 and pagination)
 2015-09-28 11:52:30 -04:00
Chris Dodge
3b650133bf bump version of edx-proctoring to 0.9.11 2015-09-27 17:53:13 -04:00
Will Daly
8555630df7 Upgrade djangorestframework to v3.1 
* Upgrade edx-submissions
* Upgrade edx-ora2
* Upgrade edx-val
* Upgrade edx-proctoring
* Update all edx-platform code that depends on DRF, including:
  - auth_exchange
  - cors_csrf
  - embargo
  - enrollment
  - util
  - commerce
  - course_structure
  - discussion_api
  - mobile_api
  - notifier_api
  - teams
  - credit
  - profile_images
  - user_api
  - lib/api (OAuth2 and pagination)
 2015-09-25 12:40:57 -04:00
Bill DeRusha
c721ff5a82 Replace SEGMENT_IO_LMS & SEGMENT_IO_LMS_KEY with single key SEGMENT_KEY 2015-09-24 11:49:03 -04:00
Brian Beggs
e9fceb8bc2 Merge pull request #9891 from edx/release 
merge release in to master for release 2015-09-22
 2015-09-23 18:09:01 -04:00
clrux
0b64f2d612 Merge pull request #9525 from edx/clrux/ac-76 
LMS: Course navigation revamp
 2015-09-23 14:26:10 -04:00
Ahsan Ulhaq
508ded2673 LMS: course navigation menu refactor 2015-09-23 13:13:18 -04:00
Nimisha Asthagiri
946102a3e0 Merge pull request #9823 from edx/mobile/xblock-rendering-api 
MA-1337 xBlock Rendering View
 2015-09-21 17:00:05 -04:00
Nimisha Asthagiri
31d5d513f8 MA-1337 xBlock Rendering View 2015-09-21 16:17:11 -04:00
David Baumgold
03aeae4bd7 Merge pull request #8271 from edx/sass-theming 
Comprehensive Theming
 2015-09-21 10:55:18 -04:00
Awais Jibran
13e8761aa4 In cohort courses, student progress pages differ from the grade report. 
TNL-3204
 2015-09-18 23:43:26 +05:00
muhammad-ammar
6a5ce5d544 Upgrade factory_boy 
TNL-3179
 2015-09-18 18:02:38 +05:00
David Baumgold
6ebf2515f4 Comprehensive theming 
This is a squash of 38 commits ending with
5b080f979d692804452400ac5bed9b17c50b001e
 2015-09-17 15:39:03 -04:00
John Eskew
7c0663f25e Merge remote-tracking branch 'origin/release' into jeskew/resolve_issues_with_release 2015-09-16 15:58:08 -04:00
Peter Pinch
01eb2dffaf Merge pull request #9635 from mitocw/fix/bdero/dump-grades-command 
CRI-40 Don't assume user in request context when grading
 2015-09-14 09:05:56 -04:00
Waheed Ahmed
18411cd480 Fixed discussion module get_course. 
TNL-3237
 2015-09-12 00:27:18 +05:00
Chris Dodge
68ee28f8b0 update edx-proctoring to 0.9.x 2015-09-11 10:00:05 -04:00
Brandon DeRosier
807299a8a3 CRI-40 Don't assume user in request context when grading 2015-09-04 13:55:50 -04:00
Calen Pennington
ec49576eb4 Merge pull request #9387 from cpennington/csm-count-requested-blocks 
Record the number of blocks requested in get_many
 2015-09-03 13:37:30 -04:00
Ben Patterson
9fd1d9079f Merge pull request #9569 from edx/benp/TE-572-disable 
TE-572 disable flaky test.
 2015-09-02 11:27:21 -04:00
David Ormsbee
127467f20a Merge pull request #9023 from mcgachey/lti-collated-grades 
[LTI Provider] Grade passback for non-leaf blocks.
 2015-09-02 07:34:10 -04:00
Ben Patterson
29e1c49d6a TE-572 disable flaky test. 
This test has become unreliable. More info can be found in the JIRA ticket.
 2015-09-01 18:12:25 -04:00
Ned Batchelder
af609f103f Merge pull request #9494 from edx/ned/move-recommender-tests 
Move recommender XBlock tests to openedx/tests/external
 2015-09-01 10:20:24 -04:00
Ned Batchelder
f925a4af9c Move recommender XBlock tests to openedx/tests/xblock_integration 
I want to make clear that these tests rely on XBlocks in other repos,
and that ideally in time we would move these tests into the XBlock repo.
 2015-08-31 17:14:47 -04:00
clrux
5b545c2b0d Revert "Course navigation menu accessibility issue" 2015-08-28 13:28:08 -04:00
clrux
52a8bc50cb Merge pull request #9367 from edx/clrux/ac-76-course-nav 
Course navigation menu accessibility issue
 2015-08-28 13:27:44 -04:00
chrisndodge
69ddbc0dc4 Merge pull request #9370 from edx/cdodge/add-course-id-to-survey-answers 
add the ability to persist the course_key where the user answered the…
 2015-08-28 13:03:58 -04:00
Ned Batchelder
741f06864a Merge pull request #9502 from edx/ned/import-path-differently 
Change imports from path to use the stablest name.
 2015-08-28 11:12:10 -04:00