Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,409 Commits 1 Branch 0 Tags
db82cbdeb7cbce454f79c25b52dd2cdcfda2256f
Commit Graph

391 Commits

Author SHA1 Message Date
Awais Jibran
ded7682090 Studio "Schedule & Details" page is broken in IDBx+IDB9x+2015_T2 
TNL-2435
 2015-07-06 18:26:00 +05:00
Davorin Sego
7374624b3c Add feature flag to skip enrollment start date filtering for course search 
add flag to lms/envs/common

update edx-search release tag
 2015-07-03 13:24:25 +02:00
Ali Mohammad
eb70f2303c Merge pull request #8749 from edx/rc/2015-06-29 
Merge back into master
 2015-07-02 13:34:42 -04:00
Sven Marnach
e8398b571e Add the Poll XBlock to the requirements and ADVANCED_COMPONENT_TYPES. 2015-07-01 18:34:10 +02:00
Adam Palay
4bb4efe9d9 Merge remote-tracking branch 'origin/release' into rc/2015-06-29 
Conflicts:
	requirements/edx/github.txt
 2015-06-29 16:55:57 -04:00
Adam Palay
61431015c2 update xblock only to mark field values as dirty if they've changed (TNL-2475) 
force save "download_video" field if not set

set timezone to UTC explicitly
 2015-06-29 14:28:45 -04:00
Sarina Canelake
ed51fe0d74 Update i18n-tools to latest version 2015-06-26 17:29:25 -04:00
Calen Pennington
ba971db1ba Merge pull request #8594 from cpennington/pass-xblock-parents 
Pass xblock parents
 2015-06-26 12:15:41 -04:00
Calen Pennington
a25f91da69 Fix XBlock inheritance ordering. XBlockMixin and derivatives should always come after XBlock and derivatives 2015-06-26 11:05:38 -04:00
Calen Pennington
fdf81042f5 Pass XBlock parents down to their children when constructing them, for caching 2015-06-25 13:59:46 -04:00
Utkarsh
dac018f459 Adding dependency for edx-user-state-client 2015-06-25 03:10:50 +00:00
Jesse Zoldak
79527f8191 Update bok-choy version 2015-06-23 11:22:12 -04:00
Xavier Antoviaque
f04547cf0f Updates the XBlock utilsrequirement to the latest 
This integrates the fixes from https://github.com/edx/xblock-utils/pull/20 and https://github.com/edx/xblock-utils/pull/21 - cf the PRs for the code review & +1s.

CC @smarnach @sarina
 2015-06-22 17:29:21 +02:00
Nimisha Asthagiri
84753740e3 Merge pull request #8570 from edx/mobile/video-upload-MA-844 
MA-844 Video Upload: remove dependency on AssetMetaDataStore.
 2015-06-19 11:21:50 -04:00
Nimisha Asthagiri
26d4a15d63 MA-844 Video Upload: remove dependency on AssetMetaDataStore. 2015-06-18 18:28:48 -04:00
Matt Drayer
e710ba7ebe Update edx-milestones Github reference 2015-06-18 11:01:24 -04:00
chrisndodge
57c8072752 Merge pull request #8539 from edx/cdodge/update-edx-search-hash 
update edx-search hash to include faceted search
 2015-06-18 10:23:34 -04:00
Jesse Zoldak
d382b69954 Revert "Update bok-choy version and move to base.txt" 2015-06-17 14:50:27 -04:00
Jesse Zoldak
8f769d2345 Merge pull request #8533 from edx/zoldak/update-bok-choy 
Update bok-choy version and move to base.txt
 2015-06-17 08:25:51 -04:00
zubair-arbi
6ed4ac08d0 update reverification block version to fix error for 'skip_reverification' service method 
ECOM-1738
 2015-06-17 12:49:58 +05:00
Chris Dodge
e8b2d9961d update edx-search hash to include faceted search 2015-06-16 17:14:21 -04:00
Jesse Zoldak
c0a0505de8 Update bok-choy version and move to base.txt 2015-06-16 11:51:58 -04:00
Calen Pennington
3c2bfc70a3 Merge pull request #8259 from jazkarta/include-ccx-key-dependency 
MIT CCX add ccx-keys as a dependency of edx
 2015-06-10 09:57:45 -04:00
Sven Marnach
40b4bc65f6 Merge pull request #8411 from open-craft/smarnach/bump-submissions-hash 
Bump edx-submissions hash to latest version.
 2015-06-10 11:51:59 +02:00
cewing
a57cc930b6 add ccx-keys as a dependency of edx 2015-06-08 11:25:13 -07:00
Feanil Patel
e488896f2f Merge pull request #8409 from edx/dsego/SOL-875 
Update edx-search dependency to reference latest edx-search
 2015-06-08 13:08:50 -04:00
Feanil Patel
924bbe6b9f Update github.txt to use a tag instead of a commit 2015-06-08 13:07:14 -04:00
Sven Marnach
5cc599af3f Bump edx-submissions hash to latest version. 
This will pull in the new get_all_submissions() interface method.
 2015-06-08 15:48:18 +02:00
Davorin Sego
40e89e6cb8 update edx-search commit reference 2015-06-08 15:31:14 +02:00
Calen Pennington
faff5b1acd Update XBlock dependency to use the merged commit from the edx repo 2015-06-03 14:39:19 -04:00
zubair-arbi
38b859fd40 use 'name' field in 'CreditRequirement' model to save the location of xblocks 2015-06-03 18:54:33 +05:00
Ned Batchelder
5b6294fe23 Update edx_lint to latest, with range checker 2015-06-02 09:47:12 -04:00
swdanielli
49f378b2af handle more exceptions for file uploading 2015-06-01 11:44:51 -04:00
zubair-arbi
c6439b53d0 Merge pull request #8231 from edx/zub/story/ecom-1612-change-icrv-block-fields 
use reverification xblock location as an identifier of reverification…
 2015-06-01 20:41:47 +05:00
zubair-arbi
803bc5532d use reverification xblock location as an identifier of reverification checkpoint 
ECOM-1612
 2015-06-01 19:33:04 +05:00
Martyn James
7f633fc045 Course Discovery feature using edx-search 2015-06-01 10:33:45 +02:00
Sarina Canelake
e72d5d542b Add fake Arabic testing language 2015-05-29 10:16:30 -04:00
Christine Lytwynec
df758d7917 Add an explicit accessibility test TE-890 2015-05-26 11:55:27 -04:00
Sarina Canelake
b0b6967a43 Merge pull request #8148 from edx/xblock-utils-has-update 
Bumped xblock-utils version
 2015-05-22 09:05:57 -04:00
E. Kolpakov
57738de2a0 Bumped xblock-utils version 2015-05-21 18:08:06 +03:00
Calen Pennington
a2cbd16680 Merge pull request #7789 from cpennington/wrap-csm 
Wrap access to CSM (inside FieldDataCache) to use the new interface
 2015-05-20 16:11:07 -04:00
Calen Pennington
bd1e9aa129 Record valid scopes when raising InvalidScopeError 2015-05-20 15:33:30 -04:00
David Baumgold
fb777fa48f Update devops in requirement file comments 2015-05-19 15:34:26 -04:00
Nickersoft
5359ff9d71 Passing full name to E-Commerce API 2015-05-18 16:12:10 -04:00
Martyn James
20a32a7e4f Merge pull request #8043 from edx/dcikatic/SOL-487-filter-staff-view-rebase 
Dcikatic/sol 487 filter staff view (rebase against master)
 2015-05-18 10:40:57 -04:00
swdanielli
09b7fee38e update xml 
the xml parsing was out-of-date and we fix it
 2015-05-15 14:11:02 -04:00
jsa
31a232edc7 Update ecommerce-api-client and add regression test for XCOM-1606 2015-05-14 16:54:56 -04:00
Davorin Sego
a455d9d50a SOL-495 Cohort-Aware content search 2015-05-14 14:07:42 -04:00
Jesse Zoldak
e15590d28a Update bok-choy version to the latest release 2015-05-13 10:12:27 -04:00
Adam
9115960eac Merge pull request #8013 from edx/merge-release-into-master 
Merge release into master
 2015-05-13 08:39:23 -04:00