Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,968 Commits 1 Branch 0 Tags
32ea61857dfdcc7794637ae67cf174ec51ec2970
Commit Graph

288 Commits

Author SHA1 Message Date
zubiar-arbi
00bf5e4fce use unicode strings for slug and regex 
STUD-1433
 2014-03-21 15:48:29 +05:00
Jay Zoldak
c5a7911b87 Fix pylint disable pragmas that were pep8 violations 2014-03-20 10:18:40 -04:00
Don Mitchell
e13d167045 Merge pull request #2918 from edx/dhm/meld_pretty_factory 
Dhm/meld pretty factory
 2014-03-17 09:44:19 -04:00
Don Mitchell
0895e90ab8 Generate split test data via split 2014-03-12 15:15:47 -04:00
Jay Zoldak
fecc5658a6 Return valid feedback from ORA stub 
so that the logs will be much cleaner.
See test_root/log/bok_choy_lms.log
 2014-03-12 12:40:10 -04:00
Don Mitchell
542b146f2f Split: add schema version and drop pretty_id (was placeholder looking for purpose) 
STUD-1359
 2014-03-12 11:30:44 -04:00
Greg Price
cc0d227928 Improve robustness of bok choy discussion tests 
A test failed because an element disappeared between the evaluation of
the clauses of a conjunction, so rewrite to make the conjunction
unnecessary.
 2014-03-11 16:44:52 -04:00
polesye
43c16bd093 BLD-915: Fix issues with different videoIDs. 2014-03-11 17:38:29 +02:00
Usman Khalid
8f3cfa5a5f When creating a course in studio set a unique wiki_slug for it. 
Currently wiki_slug is set to course number. However, since multiple
courses can have the same number this may lead to clashes. So wiki_slug
will be set to org.course.name. To maintain the active wiki_slugs for
xml courses this cannot be changed in the CourseDescriptor.

LMS-2136
 2014-03-10 16:13:18 +05:00
jmclaus
3a740c0479 BLD-844: Add possibility to download transcripts in different formats. 2014-03-07 19:22:22 +01:00
Andy Armstrong
2c9585ea5d Merge pull request #2811 from edx/andya/container-unit-tests 
Add more tests for the container page
 2014-03-07 11:31:41 -05:00
Han Su Kim
bdfd81d2f3 Merge remote-tracking branch 'origin/master' into release, conflicts resolved 
Conflicts:
	cms/envs/common.py
	common/lib/xmodule/xmodule/seq_module.py
	lms/envs/common.py
	requirements/edx/edx-private.txt
 2014-03-06 16:56:16 -05:00
zubiar-arbi
c17cb38cd9 add location of handouts in loc_mapper 
STUD-1248
 2014-03-06 15:53:45 +05:00
Andy Armstrong
bc12869a00 Add more tests for the container page 2014-03-05 17:41:10 -05:00
Diana Huang
bce7d9e43d Add tests and clean up A/B testing 
Also fixes STUD-1351
 2014-03-05 13:46:03 -05:00
Greg Price
1d2175dce0 Merge pull request #2774 from edx/gprice/edit-forum-comment-bok-choy 
Add bok choy tests for forum comment editing
 2014-03-03 15:37:05 -05:00
Greg Price
db8ad0d20b Add bok choy tests for forum comment editing 2014-03-03 14:26:25 -05:00
Jay Zoldak
82d48b5ab3 Import BrokenPromise 2014-03-03 10:16:04 -05:00
Chris Dodge
aa43689a93 This PR addresses the open feedback on the Microsites feature 2014-02-28 16:27:12 -05:00
Dave St.Germain
fd59de346b Converted javascript confirmation dialog to jquery UI dialog (needs style) 2014-02-28 13:32:39 -05:00
Adam Palay
89795191cb Merge remote-tracking branch 'origin/release' 
Conflicts:
	cms/envs/common.py
	lms/envs/common.py
 2014-02-27 17:33:40 -05:00
Andy Armstrong
fcc0231d4d Add new container page that can display nested xblocks 
This is the changes for STUD-1244, which introduces the ability for Studio to display
arbitrarily nested xblocks. In this change, a new container page is introduced which can
display nested xblocks. In particular, the xblock type of 'vertical' is special cased
to be shown inline as a collapsible section. The unit page is mostly unchanged, except
that container xblock's are shown as a link to their container page, rather than being
shown inline.
 2014-02-27 14:53:05 -05:00
Jay Zoldak
1fe453a3a7 Update schema for bok-choy database 
Finalize tests for embargo middleware app
 2014-02-27 10:27:29 -05:00
Dave St.Germain
da275eae11 Tweaks course update html to avoid using list tags inappropriately. 
LMS-1724
 2014-02-26 13:28:00 -05: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
jsa
bea463d950 Add acceptance tests for forums comment deletion. 
JIRA: FOR-472
 2014-02-26 10:31:02 -05:00
jsa
7be356b390 auto_auth: add ability to configure forum roles and scrape user id. 2014-02-26 10:30:55 -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
c72d410083 Remove doc-ready tests, which were flaky 2014-02-25 14:01:37 -05:00
Calen Pennington
ae34c3fe9f Mark xblock initialization status using css class (in part to make testing easier) 2014-02-25 14:01:37 -05:00
Calen Pennington
35fbc15edb Add tests of more scopes in student_view 2014-02-25 14:01:37 -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
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
Will Daly
defbd87468 Protect Acid XBlock test from stale element or zero-length locator list 2014-02-20 16:19:43 -05:00
Julia Hansbrough
8fbeeeeb02 Disable flakey language change acceptance tests 2014-02-18 21:16:43 +00:00
Adam
7b3376f944 Merge pull request #2575 from edx/adam/i18n-self-assessment-2 
Adam/i18n self assessment 2
 2014-02-18 09:07:24 -05:00
thedeadparrot
ff0a6fb778 Update cms urls for language preferences 2014-02-14 22:35:14 +00:00
Julia Hansbrough
05537540d1 Fix acceptance tests 
Fixed bok-choy acceptance tests
 2014-02-14 22:35:14 +00:00
thedeadparrot
b61649f9eb Refactor out new lang_pref djangoapp 2014-02-14 22:35:14 +00:00
Julia Hansbrough
efe7bdacfc Fixed broken acceptance tests 2014-02-14 22:35:13 +00:00
thedeadparrot
48686793d7 Clean up tests. 2014-02-14 22:35:12 +00:00
Julia Hansbrough
77cce3aa1a Added acceptance test for language persistence 
Will pass once the language persistence stuff gets merged in
 2014-02-14 22:34:46 +00:00
Adam Palay
97f5b25e2c i18n for self-assessment (ORA-314) 
make openendedchild and open_ended_module_v1 act enough like xblocks to get xblock 18n
 2014-02-14 17:27:32 -05:00
Julia Hansbrough
d867e87b72 Acceptance test for language selector 
Tests language selection feature for student dashboard
 2014-02-14 10:32:11 -05:00
Will Daly
a5207708f8 Added dark lang database fixture to bok choy tests 2014-02-14 10:32:11 -05:00
Julia Hansbrough
cb6b52f890 wiring for language selector 2014-02-14 10:32:10 -05:00
Julia Hansbrough
5131818153 Merge pull request #2597 from edx/release 
Release
 2014-02-13 15:17:38 -05:00