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

3684 Commits

Author SHA1 Message Date
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
Clinton Blackburn
9bf2712512 Updated edx-oauth2-provider to 0.5.1 2015-04-01 12:22:01 -04:00
Greg Price
c860f790c2 Merge pull request #7508 from edx/gprice/export-import-val 
Include VAL data in video module export/import
 2015-03-31 20:28:31 -04:00
Greg Price
cfcb304885 Include VAL data in video module export/import 
This is required so that an a video module exported by one Open edX
deployment and imported by another will work correctly if it contains an
edx_video_id but does not populate other URL fields.

JIRA: MA-110
 2015-03-31 19:35:06 -04:00
Calen Pennington
8f133f6696 Merge pull request #6035 from edx/jeskew/xmodule_to_xblock_vertical 
Convert Vertical XModule to pure Vertical XBlock.
 2015-03-31 11:10:22 -04:00
Calen Pennington
1f17538d42 Clean up tests in preparation for switching Vertical from an XModule to an XBlock 2015-03-30 16:37:53 -04:00
Adam
dad4b673e2 Merge pull request #7505 from edx/release 
Release
 2015-03-27 16:46:33 -04:00
Adam Palay
cb9c89e168 update ORA2 to fix TNL-1758 2015-03-27 10:35:46 -04:00
Christopher Lee
4423510807 Merge pull request #7480 from edx/clee/MA-169_MA-77 
Clee/ma 169 ma 77
 2015-03-26 13:31:49 -04:00
Christine Lytwynec
3a8716a36f update bokchoy with fix for TNL-1770 2015-03-25 17:02:10 -04:00
christopher lee
3b150da1d7 MA-169 return requested val encoded video profiles 
MA-169 Mobile api now calls for mobile_low (default), mobile_high,
 and youtube profiles instead of only mobile_low.
 2015-03-25 15:40:58 -04:00
Martyn James
e8cf0a35df Merge pull request #7423 from edx/mjames/update_search_hash 
Updating edx-search hash to include bugfixes
 2015-03-23 10:39:31 -04:00
Ned Batchelder
6c70f30dec pylint --> 1.4.2, and pin astroid 2015-03-20 14:35:11 -04:00
David Baumgold
f30d2a1516 Update path.py to version 7.2 
Due to this warning when trying to install requirements from github:

DEPRECATION: Uninstalling a distutils installed project (path.py) has been deprecated and will be removed in a future version. This is due to the fact that uninstalling a distutils project will only partially uninstall the project.
 2015-03-20 09:51:05 -04:00
Martyn James
10ca5affcf Updating edx-search hash to include bugfixes for SOL-289 and SOL-217 2015-03-19 12:05:50 -04:00
Brian Wilson
243e2660b0 Merge release to master for 20150317 release. 2015-03-18 18:48:56 -04:00
Ned Batchelder
6ac1b82bb2 Merge pull request #7356 from edx/ned/fix-or-remove-teardown 
Fix or remove tearDown methods that don't use super.
 2015-03-18 17:36:17 -04:00
Max Rothman
1f3a4a87ab Update newrelic agent for monitoring celery tasks 2015-03-18 10:52:47 -04:00
Ned Batchelder
81d17c516e Fix or remove tearDown methods that don't use super. 
Update edx-lint to the version that checks if tearDown uses super.

Convert a number of tearDown methods into addCleanup.

Remove some unneeded tearDown methods: no need to call patch.stopall if
none of them were started with patch.start.
 2015-03-17 15:14:52 -04:00
Calen Pennington
9379fd2711 Add tests of XBlocks/XModules with filtered children 2015-03-17 10:55:06 -04:00