Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,921 Commits 1 Branch 0 Tags
372e52bf08dade77f4e376aec1872eab08051e57
Commit Graph

315 Commits

Author SHA1 Message Date
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
David Baumgold
22804e4199 Use pytz-compatible versions of ora2 and ease 2015-04-29 12:17:29 -04:00
Sarina Canelake
1504abe292 Only pull languages we want from Transifex 2015-04-24 15:15:17 -04:00
David Baumgold
1162e609e4 Set explicit git commit hash for django-settings-context-processor 2015-04-24 13:54:55 -04: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
Nimisha Asthagiri
b124485ed6 MA-611, MA-613 Mobile Push Notification Studio Backend; Integration with Parse 2015-04-18 15:30:19 -04: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
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
Waheed Ahmed
c20c99badd Added ora release tag. 2015-04-08 11:26:36 -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
Clinton Blackburn
9bf2712512 Updated edx-oauth2-provider to 0.5.1 2015-04-01 12:22:01 -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
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
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
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
Jesse Zoldak
e4a08fb868 Update the bok-choy version being used. TE-783 2015-03-16 11:57:06 -04:00
Clinton Blackburn
eaa7a22058 Added commerce/purchase endpoint 
This new endpoint is intended to replace enrollment API call used on the login+registration page. Instead of directly enrolling students, the view will contact the external e-commerce API (Oscar) to create a new order. Oscar will be responsible for completing the order and enrolling the student.

This behavior will only apply to course modes with associated SKUs. All other course mode enrollments will be processed directly by LMS.
 2015-03-13 00:25:13 -04:00
Ned Batchelder
f8c9fdf6c8 Merge pull request #7196 from edx/ned/tweaked-pylintrc 
Use 'edx_lint write' to create our pylintrc from pylintrc_tweaks
 2015-03-06 09:50:59 -05:00
Carson Gee
da9154d10e Add Staff Graded Assignments XBlock to edx-platform 2015-03-04 10:35:54 -05:00
Ned Batchelder
ff2bb10325 Use 'edx_lint write' to create our pylintrc from pylintrc_tweaks 2015-03-03 17:09:19 -05:00
Nimisha Asthagiri
d757029fc8 Upgrade South to 1.0.1 2015-02-26 14:57:28 -05:00
Christine Lytwynec
8bdd90a5b1 Merge pull request #7037 from edx/clytwynec/flaky_test_decorator 
Clytwynec/flaky test decorator
 2015-02-25 16:35:01 -05:00
Martyn James
b2b56d067b Adds google drive components to whitelist, and imports xblock-google-drive and xblock-utils 2015-02-25 10:35:51 -05:00
Christine Lytwynec
d14c7cf14f Use flaky from clytwynec fork 2015-02-24 17:34:42 -05:00
Nimisha Asthagiri
b280e44fe1 Merge pull request #7025 from edx/mobile/oauth2-allow-inactive-user 
MA-291 Allow API access without email activation.
 2015-02-24 09:12:30 -05:00
Nimisha Asthagiri
83a3adb97b MA-291 Allow API access without email activation 2015-02-24 06:05:18 -05:00
Calen Pennington
b9c9a58aac Bump MongoDBProxy to handle AutoReconnect during find_one 2015-02-23 11:40:40 -05:00
muzaffaryousaf
4a13656864 updating the edx-submission version. 
adding myself to authors.

TNL-1466
 2015-02-18 13:12:21 +05:00
Sarina Canelake
b1d2c5c396 Update i18n-tools to fix dummy generation 2015-02-17 17:42:11 -05:00
Usman Khalid
93fa8cafbe Update edx-ora2 to release-2015-02-12T15.27. 2015-02-12 20:29:13 +05:00
muzaffaryousaf
71e267eb69 Changing the edx-submission repo version to the latest commit. 
TNL-1125
 2015-02-12 15:54:30 +05:00
Calen Pennington
b93b541733 Add our custom pylint plugin 
So far, it checks:

* Whether setUp is called in TestCase setUp methods.
* If _("translate me") functions are called with only string literals.
 2015-02-06 11:58:37 -05:00
Jesse Zoldak
1042e47e3c Revert "Add pylint plugin to check whether setUp is called in TestCase setUp methods." 
This reverts commit a92ca9d79a.
 2015-02-05 12:45:47 -05:00