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

7469 Commits

Author SHA1 Message Date
Don Mitchell
16f0d12a1f Merge pull request #2356 from edx/dhm/mixed_ms_wrapper 
MixedModulestore wraps most getters, update_item, delete_item
 2014-02-10 16:01:50 -05:00
Ned Batchelder
aab6c54a51 Merge pull request #2545 from edx/ned/remove-tabs 
Remove tabs.
 2014-02-10 15:54:11 -05:00
David Baumgold
3938e84d6a Merge pull request #2526 from edx/db/refactor-student-view 
Refactor student views
 2014-02-10 15:22:53 -05:00
Ned Batchelder
2f67d0aab4 Remove tabs. 2014-02-10 15:13:11 -05:00
David Baumgold
1dfd3310f7 Refactor student views 
Fix pylint/pep8 warnings, use JsonResponse instead of HttpResponse where useful,
put in TODOs to change HTTP status codes to be more accurate.
 2014-02-10 14:50:57 -05:00
Dave St.Germain
4810bd6d1c Improved sequence navigation accessibility 2014-02-10 14:34:28 -05:00
Calen Pennington
25c0776ca5 Merge pull request #2540 from cpennington/fix-pylint-errors 
Fix pylint violations
 2014-02-10 14:33:31 -05:00
Calen Pennington
64008200f3 Fix pylint violations 2014-02-10 13:34:25 -05:00
Mark Hoeber
678749fbad Merge pull request #2522 from edx/markhoeber/image-modal-title-change 
Updated title and template for image modal html component
 2014-02-10 11:08:47 -05:00
Mark Hoeber
43ac1d23a8 Updated title and template for image modal html component 
LMS-2215
 2014-02-10 09:18:00 -05:00
Feanil Patel
95f31e5036 Merge remote-tracking branch 'origin/release' 2014-02-07 17:07:29 -05:00
Calen Pennington
e0f6b1a24a Merge pull request #2221 from cpennington/xblock-xml-serialization 
Enable (and test) xml export of pure XBlocks
 2014-02-07 16:46:46 -05:00
Calen Pennington
db17bf4c15 Add tests of XML exporting to test_xblock_wrappers 2014-02-07 15:50:34 -05:00
David Baumgold
e09990ff30 Merge pull request #2413 from edx/bugfix/ichuang/do-not-import-tilde-files 
Skip tilde files when importing
 2014-02-07 15:42:02 -05:00
David Baumgold
d1dc8c9191 Add README to tilde fixture, fix pylint/pep8 issues 2014-02-07 15:03:37 -05:00
David Baumgold
e52c9b515f Missed some places to change the registration response status code 
LMS-2203
 2014-02-07 14:29:11 -05:00
Giulio Gratta
5e67612e9b Image Modal CMS HTML Block subtype 
- Added YAML file for the HTML template code for the modal to work
- Added CSS and JS code for modal to look and function properly
- Updated code to take comments into account.
- Simplified HTML template and expanded JS to set up image modal on load.
- Added preliminary drag script.
- Converted jQuery UI draggable to Draggabilly
 2014-02-07 09:21:20 -08:00
Greg Price
b1e5bbb8ff Merge pull request #2504 from edx/gprice/forum-pagination-acceptance 
Add acceptance tests for forum response pagination
 2014-02-07 10:47:07 -05:00
David Baumgold
ff910028fd Merge pull request #2465 from glowe/fix-sequence-position 
Fix goto_position in sequence coffeescript.
 2014-02-07 10:46:33 -05:00
David Baumgold
83b0eda4a4 Add test for ignoring tilde static files on import 2014-02-07 10:26:02 -05:00
David Baumgold
cc091f833a Add test for ignoring tilde files on import of extra content 2014-02-07 10:25:46 -05:00
Greg Price
8e3a77fa1e Add acceptance tests for forum response pagination 2014-02-06 17:52:14 -05:00
Jason Bau
c3e1184211 Merge pull request #2269 from edx/jbau/lms-localize-datetime 
make LMS accordion and progress datetime display respect settings.TIME_ZONE
 2014-02-06 12:48:10 -08:00
ichuang
09bdcbbc6f skip ~ files in static content import 2014-02-06 14:21:40 -05:00
ichuang
33f86a7af1 skip *~ files in import of extra content (e.g. info and about pages) 2014-02-06 14:21:40 -05:00
Greg Price
02a233b7e2 Rename URL_PATH to url_path in acceptance code 
It's not a constant, and some subclasses will want to make it a
function with @property.
 2014-02-06 12:02:48 -05:00
David Baumgold
698aedc329 better pylint formatting 2014-02-06 11:56:46 -05:00
David Baumgold
2d59d44bb5 Clarify DATA_DIR path 2014-02-06 11:55:41 -05:00
Calen Pennington
85c31dd24b Refactor test_xblock_wrappers to use Factories 2014-02-06 11:52:07 -05:00
Graham Lowe
c659b1c5f4 Fix goto_position in sequence coffeescript. 
Replace single-quotes with double-quotes so that #{@ajaxUrl} is
interpolated.
 2014-02-06 11:36:11 -05:00
Jason Bau
b525f40377 Start datetime localization in LMS 
Currently just coerces the time displayed for due dates
(accordion.html and progess.html) to settings.TIME_ZONE
 2014-02-06 07:57:56 -08:00
Calen Pennington
4321572708 Switch test_xblock_wrappers to use ddt, and to considate logic 2014-02-06 10:15:46 -05:00
Will Daly
28c33a4f84 Skip page check in promise for Tab Nav in bok-choy suite 2014-02-06 09:31:21 -05:00
Will Daly
4c2b76951d Merge pull request #2431 from edx/will/ora-acceptance-tests-rebase 
Peer-grading acceptance tests
 2014-02-05 16:43:47 -05:00
Don Mitchell
1de9d55844 Review-driven changes (to-be-squashed) 2014-02-05 16:34:24 -05:00
Jay Zoldak
0acb18fe1f Merge pull request #2480 from edx/zoldak/increase_lettuce_script_timeout 
Increase async script timeout in lettuce acceptance tests
 2014-02-05 15:45:31 -05:00
Feanil Patel
544b496185 Merge pull request #2484 from edx/feanil/fix_transfer_logic 
Only move students if they aren't in the new course.
 2014-02-05 15:18:32 -05:00
Will Daly
0a9b4ada86 Added stub XQueue server to bok_choy test suite. 
Added feedback check for AI-assessment test
Added peer assessment feedback test
Added tests for peer grading module
Added stub peer grading module service
Updated Studio/LMS page objects and tests to use bok-choy v0.1.0
Added LMS bok-choy tests from e2e repo
Add bok-choy tests for peer grading module, including calibration.
 2014-02-05 14:50:15 -05:00
Feanil Patel
3731144dc6 Only move students if they aren't in the new course. 2014-02-05 14:32:59 -05:00
Will Daly
8c46d4c623 Merge pull request #2479 from edx/will/update-bok-choy-for-a11y-fixes 
Bok-choy fixes (a11y, video player bug)
 2014-02-05 14:07:28 -05:00
Jay Zoldak
a4275e90b1 Increase async script timeout in lettuce acceptance tests 2014-02-05 13:14:19 -05:00
Calen Pennington
b0bed170de Enable (and test) xml export of pure XBlocks 
[LMS-179]
[LMS-209]
[LMS-1345]
 2014-02-05 13:02:40 -05:00
Christina Roberts
235d10ddc6 Merge pull request #2434 from edx/christina/preview_handler 
preview_handler changes to support Locators
 2014-02-05 12:53:11 -05:00
jsa
427468565f don't show the add response button if responses are not allowed. 
JIRA: FOR-452
 2014-02-05 12:49:52 -05:00
Diana Huang
7acc116128 Merge pull request #2477 from edx/diana/fix-sequence-titles 
Prevent bad sequential titles
 2014-02-05 12:49:31 -05:00
Will Daly
274824bf55 Updated bok-choy tests for a11y css selector changes 
Disable broken video test
 2014-02-05 12:45:52 -05:00
thedeadparrot
539cd053d1 Prevent bad sequential titles 
Don't try to set the title if we don't have anything in
the sequential

LMS-2168
 2014-02-05 12:11:52 -05:00
Dave St.Germain
a6797899da Removed inappropriate section tags. Because screen readers announce each section, they should not be used unless they are actually defining meaningful sections. 2014-02-05 11:32:08 -05:00
Will Daly
0cd7a489a5 Merge pull request #2472 from edx/will/tab-nav-page-object-fix 
Make tab nav page object more robust
 2014-02-05 11:04:55 -05:00
cahrens
1dcd5fe6e9 Deleting unused methods. 2014-02-05 10:49:37 -05:00