Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,068 Commits 1 Branch 0 Tags
603eae65d8015f1ca7598e2cb74eeaea5fb79eb9
Commit Graph

653 Commits

Author SHA1 Message Date
Gabe Mulley
411df0ae3a Merge pull request #7802 from edx/gabe/user-track 
Make user_track use eventtracking
 2015-05-07 08:43:21 -04:00
E. Kolpakov
400d90bc3e Problem builder version bump: includes presentation updates and accessibility improvements [OSPR-575] 2015-05-07 11:32:31 +03:00
Gabe Mulley
4a8b0c5ef5 Make user_track use eventtracking 2015-05-06 20:57:46 -04:00
Phil McGachey
a6afc29ced [LTI Provider] Updating submissions dependency to pull in new scoring signals 2015-05-06 07:02:46 -04:00
Clinton Blackburn
cd9c900b9a Corrected ecommerce-api-client dependency 2015-05-05 15:58:07 -04:00
jsa
26f9a5d76f Pass tracking context to ecommerce api client. 
XCOM-208
 2015-05-05 10:50:46 -04:00
Clinton Blackburn
bfb201ec7d Merge pull request #7822 from edx/clintonb/receipt-page-update 
Updated Receipt Page for Oscar
 2015-05-02 09:32:11 -04:00
Clinton Blackburn
1a1fe56b29 Added Oscar-Compatible Receipt Page 2015-05-02 00:18:05 -04:00
E. Kolpakov
6db974c8ee Fixes for course import-export: 
* Updated XBlock hash - new version forces exposes force_dirty method on fields
* Includes Scope.children fields into xml_importer._update_module_location so that they are updated as well.
* Tests for mutable fields xml_importer._update_module_location with mutable fields and children
 2015-05-01 18:36:14 +03:00
Martyn James
c776272a8f Merge pull request #7654 from edx/mjames/SOL-280 
Index course information alongside courseware
 2015-04-30 23:27:17 -04:00
Martyn James
b9f1c5db60 Index course information alongside courseware 
Conflicts:
	cms/djangoapps/contentstore/tests/test_courseware_index.py
 2015-04-30 16:05:57 -04:00
Christine Lytwynec
7982ad4e16 Merge pull request #7865 from edx/clytwynec/update-flaky-version 
update version of flaky to 2.0.3
 2015-04-30 10:02:28 -04:00
David Baumgold
372e52bf08 Merge pull request #7792 from edx/commit-hash-for-django-settings-context-processor 
Set explicit git commit hash for django-settings-context-processor
 2015-04-30 09:33:21 -04:00
Christine Lytwynec
66c527a7ac update version of flaky to 2.0.3 2015-04-29 14:33:21 -04:00
David Baumgold
22804e4199 Use pytz-compatible versions of ora2 and ease 2015-04-29 12:17:29 -04:00
David Baumgold
3684c083f2 Update pytz to 2015.2 
pytz changed their versioning scheme from using letters to using
numbers. The old scheme is screwing up new versions of pip.
 2015-04-29 12:17:29 -04:00
Feanil Patel
934207bf03 Fixes to get it working with master. 2015-04-28 10:23:08 -04:00
Sarina Canelake
abff47e587 Merge pull request #7800 from edx/sarina/20150424-update-translations 
Update translations & how translations are pulled
 2015-04-24 16:13:55 -04:00
Ned Batchelder
f38977371b Merge pull request #7745 from schoolyourself/schoolyourself-xblock-update 
Update schoolyourself-xblock to the latest version
 2015-04-24 15:49:02 -04:00
Sarina Canelake
1504abe292 Only pull languages we want from Transifex 2015-04-24 15:15:17 -04:00
Kelketek
a2c65baa59 Bump version of problem builder 
+1s available in https://github.com/open-craft/problem-builder/pull/19
 2015-04-24 13:12:23 -05:00
David Baumgold
1162e609e4 Set explicit git commit hash for django-settings-context-processor 2015-04-24 13:54:55 -04:00
Braden MacDonald
8dc4ecb4f7 Bump problem_builder version to fix DB table conflict 2015-04-24 08:59:55 -07:00
Sarina Canelake
8080d31348 Update i18n tools to the latest version 2015-04-23 15:43:29 -04:00
David Baumgold
d419eb0efa Merge pull request #7623 from edx/move-github-reqs-to-github.txt 
Move github dependencies into github.txt
 2015-04-23 14:24:35 -04:00
zubair-arbi
05068f1b94 fix reverification link in lms 
ECOM-1437
 2015-04-23 17:58:33 +05:00
David Baumgold
d8ff61f6f6 Move github dependencies into github.txt 2015-04-22 10:07:48 -04:00
John Lee
982d305f44 Update schoolyourself-xblock to the latest version, which adds the ability to set a partner ID and updates the CSS to fix the student_view things on Firefox 2015-04-22 10:00:27 -04:00
Sarina Canelake
b57bf4b25a Upgrade Django 1.4 to latest point release 2015-04-21 20:41:34 -04:00
Nimisha Asthagiri
b124485ed6 MA-611, MA-613 Mobile Push Notification Studio Backend; Integration with Parse 2015-04-18 15:30:19 -04:00
Braden MacDonald
00db27b63e Merge pull request #7638 from open-craft/problem-builder-version-bump 
Bump version of Problem Builder
 2015-04-16 16:38:57 -07:00
Braden MacDonald
513591f409 Bump problem builder version to latest edx-release build 2015-04-16 11:56:50 -07:00
Waheed Ahmed
ec16bc3710 Merge pull request #7701 from edx/waheed/tnl2000-ora-release-tag 
Added new release tag for ORA2.
 2015-04-16 16:00:47 +05:00
Waheed Ahmed
5fec96aefc Added new release tag for ORA2. 
TNL-2000
 2015-04-16 12:39:00 +05:00
aamir-khan
3b015cd8d9 ECOM-1396: added the xblock setup in github.txt of edx-platform 2015-04-14 19:28:43 +05:00
David Ormsbee
b1e8fcf614 Merge pull request #7560 from mcgachey/mcgachey-oauthlib-version 
[Dependencies] Upgrading oauthlib from 0.6.3 to 0.7.2
 2015-04-13 11:52:24 -04:00
Davorin Sego
e37a98d1be Indexing moved to celery task. Reorganised indexing to always allow for full course reindex. Indexing code no longer needs to be in common, because it is triggered by signal instead of being called.g 2015-04-10 14:30:19 -04:00
Christine Lytwynec
05a8e23d57 Merge pull request #7633 from edx/release 
Release
 2015-04-08 15:40:45 -04:00
Marko Jevtić
5cb7fe7390 Merge pull request #7567 from edx/mjevtic/SOL-294 
(SOL-294) CSS style that will display ellipsis properly
 2015-04-08 19:43:25 +02:00
marjev
050a53d954 (SOL-294) CSS style that will properly display ellipsis 2015-04-08 18:46:23 +02:00
Adam Palay
33ddecbc97 update nltk in other parts of the platform 2015-04-08 11:28:49 -04:00
David Baumgold
aac8bf2ebd Update NLTK to 2.0.5 
For setuptools compatibility
 2015-04-08 11:26:55 -04:00
Waheed Ahmed
c20c99badd Added ora release tag. 2015-04-08 11:26:36 -04:00
Ben Patterson
9190c35843 Merge pull request #7626 from edx/benp/upgrade-rednose 
Upgrade rednose
 2015-04-07 18:04:57 -04:00
Ben Patterson
3cc5879abc Upgrade rednose 
TE-779

The latest release of rednose will allow for output of the
flaky test repoort. (It was being swallowed in rednose 0.3)

Here is the diff: https://github.com/gfxmonk/rednose/compare/version-0.3.1...version-0.4.1
Here is likely the commit we care about most: c66b37c92b
 2015-04-07 14:54:37 -04:00
David Baumgold
c31e0fd1d7 Merge pull request #7429 from edx/db/update-path-py 
Update path.py to version 7.2
 2015-04-07 14:47:43 -04:00
Braden MacDonald
f2fb8bf752 Bump mentoring and its dependency xblock-utils for Harvard 2015-04-03 13:49:51 -07:00
Kelketek
042a0092f2 Update XBlock Hash 2015-04-03 11:08:54 -05:00
Nimisha Asthagiri
7e1104c421 MA-410 Update video_module import to use target course_id. 2015-04-02 11:38:01 -04:00
Phil McGachey
c1686ead00 [Dependencies] Upgrading oauthlib from 0.6.3 to 0.7.2 2015-04-01 13:54:07 -04:00