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

3993 Commits

Author SHA1 Message Date
Dave St.Germain
da275eae11 Tweaks course update html to avoid using list tags inappropriately. 
LMS-1724
 2014-02-26 13:28:00 -05:00
Giulio Gratta
51632a9f0a Merge pull request #2579 from edx/giulio/studio-file-urls 
Internal/External Studio file URLs
 2014-02-26 09:32:59 -08:00
zubair-arbi
2cb3cc3621 Merge pull request #2238 from zubair-arbi/zub/bugfix/std154-courseinfohtml 
update course info module to save content without modifying
 2014-02-26 21:34:10 +05:00
cahrens
8db7b0ce21 Add test for external_url being passed to assets page. 2014-02-26 09:26:50 -05:00
zubair-arbi
7ee08eae52 Merge pull request #2688 from edx/zub/bugfix/std1294-importexportcruft 
Empty course temp folder after exporting course (export_handler)
 2014-02-26 17:53:44 +05:00
zubiar-arbi
619c144c11 Empty course temp folder after exporting course (export_handler) 
STUD-1294
 2014-02-26 15:52:48 +05:00
zubiar-arbi
cf47b6b670 assign default forum role 'Student' to user on course recreate with same name STUD-1140 
STUD-1140
 2014-02-26 15:40:44 +05:00
zubiar-arbi
cfa6b14575 update course info module to save content in new 'items' field + update import/export to handle content field other than 'data' or 'metadata' 
STUD-154
 2014-02-26 13:11:59 +05:00
Calen Pennington
a2137cec35 Merge pull request #2603 from cpennington/xblock-acid-resources-test 
Add tests of local_resource_url
 2014-02-25 16:46:10 -05:00
Calen Pennington
9126777ed7 Add test of local_resource_url in AcidBlock 2014-02-25 14:01:37 -05:00
Alexander Kryklia
25407ef3e7 BLD-642: Allow multiple transcripts with video. 2014-02-24 21:57:08 +02:00
Giulio Gratta
3ffb6715e5 Internal/External Studio file URLs 
- Changed link URL of file name to use public/LMS url
- Added toggle link to display all public URLs for instructor convenience
 2014-02-24 11:54:09 -08:00
Don Mitchell
0b262e7cea Merge pull request #2660 from edx/dbarch/parse_course_id 
Dbarch/parse course
 2014-02-24 13:24:00 -05:00
Don Mitchell
81a92e4bfc Consolidate course_id triple parsing 2014-02-24 11:45:59 -05:00
Jay Zoldak
e4b6fe2c68 Merge pull request #2695 from edx/will/revert-paver-again 
Revert "Fix sys.path manipulation in pavement.py, with detailed comment"
 2014-02-24 11:31:26 -05:00
Will Daly
812e71bbbb Revert "Fix sys.path manipulation in pavement.py, with detailed comment" 
This reverts commit 544616be4b.
 2014-02-24 11:30:40 -05:00
Ned Batchelder
6bb0eee3c6 Make the i18n service available everywhere. 
To get all dates localized, we need all runtimes to have the i18n
service, and since runtimes are made by the modulestores, we need to
pass it to them.

Soon (fingers crossed), modulestores won't be involved in making
runtimes, and many of these changes will go away.
 2014-02-24 10:06:13 -05:00
zubair-arbi
b7c557ff15 Merge pull request #2621 from edx/zub/bugfix/std1248-postrequestupdatelocmapp 
add course updates location to loc_mapper on accessing course_info_updat...
 2014-02-24 19:40:27 +05:00
Will Daly
38d403f6c9 Merge pull request #2615 from edx/will/paver-attempt-2 
Paver (Part 1) -- Attempt 2
 2014-02-24 07:51:05 -05:00
zubiar-arbi
6b3c5e7d60 get updates_location from course_location directly + update tests 
STUD-1248
 2014-02-24 12:56:09 +05:00
zubiar-arbi
62a32cda21 add course updates location to loc_mapper on accessing course_info_update_handler 
STUD-1248
 2014-02-24 12:56:09 +05:00
Calen Pennington
dbc99ef8ad Implement children for pure XBlocks in edx-platform 
This requires fixing the javascript api implementation, and adding
an implementation of get_block to the ModuleSystem api.

However, the implementation is incomplete, due to mismatches between
the expectations of XModule and XBlock.

Also adds tests using the Acid block to make sure that the javascript
and python apis for children are working correctly.
 2014-02-21 15:01:20 -05:00
Calen Pennington
3093efc889 Make bok-choy correctly publish units with children 2014-02-21 15:00:32 -05:00
David Baumgold
1bf5d7120c Merge pull request #2662 from edx/db/textbook-id-unicode 
Call unicode() instead of str() for textbook IDs
 2014-02-20 17:18:23 -05:00
Jay Zoldak
4c21270f2e Merge branch 'release' 2014-02-20 16:29:06 -05:00
David Baumgold
33f56e1bba Call unicode() instead of str() for textbook IDs 
STUD-1327
 2014-02-20 14:58:17 -05:00
Jay Zoldak
3f4571ddd9 Disable course listing perf test 2014-02-20 14:43:11 -05:00
zubiar-arbi
6892bc73b2 get courses by reversing django groups for non global users (studio dashboard) 
STUD-1133
 2014-02-20 20:23:12 +05:00
zubiar-arbi
88690dab1d resolve conflict on rebase 2014-02-20 20:21:52 +05:00
Calen Pennington
1eec47a604 Fix STUD-1316 
This bug affected unpublishing content (and would trigger an error
message in studio). The fix was to uncouple the rendering of the studio_view
of an xblock with the student_view, so that content that wasn't in
draft mode already wouldn't be modified by early rendering of the
studio_view.

[STUD-1316]
 2014-02-19 14:58:41 -05:00
Will Daly
e8bf5bf78a Disable another video test that failed intermittently in master 2014-02-19 11:50:44 -05:00
Ned Batchelder
229f3522fa Move date_utils to common/djangoapps/util 2014-02-18 17:35:56 -05:00
Will Daly
544616be4b Fix sys.path manipulation in pavement.py, with detailed comment 
Restore reverted changes from paver part 1
 2014-02-18 15:09:07 -05:00
Will Daly
4ce2834b17 Disable flaky video test 2014-02-18 15:05:01 -05:00
Will Daly
c85c4b22ed Revert "Replace rake functions with python paver functions" 
This reverts commit df2e410f2a.
 2014-02-14 14:25:28 -05:00
David Glance
df2e410f2a Replace rake functions with python paver functions 
Deprecated rake functions issue a warning and then call paver
replacements

Bring Paver commands up to date with master for servers, assets, and docs.
Revert deprecation of quality, tests, and i18n for a future pull request.
Deprecate workspace migration
 2014-02-14 11:25:55 -05:00
polesye
faab4caeef BLD-837: Fix download transcript behavior. 2014-02-14 11:51:51 +02:00
Carson Gee
989a97963c Merge pull request #718 from edx/feature/ichuang/push-to-lms 
Let a Studio user export course to git (and via git, to elsewhere, eg LMS)
 2014-02-13 20:22:31 -05:00
Christina Roberts
0c74d6ac54 Merge pull request #2562 from edx/christina/lms-mixed 
Clean up of modulestore references (primarily LMS).
 2014-02-13 20:05:31 -05:00
Julia Hansbrough
5131818153 Merge pull request #2597 from edx/release 
Release
 2014-02-13 15:17:38 -05:00
Calen Pennington
3a7b265c8a Add trailing commas to multiline lists, to prevent string concatenation bugs 2014-02-13 13:12:42 -05:00
Carson Gee
5e0f781674 Major refactor and rename of feature 
All forward facing wording changed to Export to Git
Export to git functions removed from management command and put in common file
Additional error checking and documentation improvements
Nitpicks and other minor fixes
 2014-02-13 12:53:47 -05:00
Carson Gee
f02c074db9 Push To LMS updates 
Added tests
Converted scripts to django commands
Removed advanced module requirement
Generalized to platform
Switched to subprocess for shell commands
Beefed up resiliency and error checking.
Refactored since #1910 removed get_location_and_verify_access
Added settings to aws for export directory and reworked test setup and teardown
Several review based fixes
Added line to Changelog
Changed URL handler to be accepting and moved git bare repo inside of test_root/data
Added exception logging to help trace issues
Added output in exception logging
Made the branch to commit to explicit instead of implicit
Skipping git identity test on condition of global configuration set
 2014-02-13 10:21:18 -05:00
ichuang
e524f5be35 add push_to_lms to Studio; uses MITX_FEATURES['ENABLE_PUSH_TO_LMS'] 2014-02-13 10:01:28 -05:00
Christina Roberts
2b2d97cd5f Merge pull request #2578 from edx/christina/draft-bug-test 
Acceptance test for STUD-1311.
 2014-02-13 09:54:10 -05:00
cahrens
16200827c5 Acceptance test for STUD-1311. 2014-02-13 09:26:51 -05:00
Chris Dodge
6e3fb86255 Fix bug where video files with periods in them would end up producing an incorrect transcript file 2014-02-13 08:58:48 -05:00
Julia Hansbrough
d6c0ce161e Merge branch 'release' 2014-02-12 21:24:19 +00:00
Christina Roberts
b0b8257eee Merge pull request #2543 from edx/christina/reference_bug 
Rewrite Reference and ReferenceList fields on import
 2014-02-12 16:07:37 -05:00
Ali Reza Sharafat
85058ec460 Course short descriptions -- couple of more asserts and pep8 fixes 2014-02-12 20:24:26 +00:00