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

21126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
polesye
d9ec9cecf4 BLD-837: Fix download transcript behavior. 2014-02-14 09:03:54 -05:00
Adam Palay
227197ec18 fixes css to render properly poll module (BLD-839) 2014-02-13 16:53:59 -05:00
Calen Pennington
3a7b265c8a Add trailing commas to multiline lists, to prevent string concatenation bugs 2014-02-13 13:12:42 -05:00
Calen Pennington
a2efb796b6 Fix LMS-2249 (https://github.com/edx/edx-platform/issues/2516) 2014-02-13 13:12:29 -05:00
Calen Pennington
869198e44b Merge pull request #2573 from cpennington/zub/bugfix/std1311-changestodraft 
Fix for STUD-1311
 2014-02-12 11:39:23 -05:00
Calen Pennington
4403eb7209 Fix STUD-1311 (Don't overwrite published content w/ draft content accidentally) 2014-02-12 11:11:01 -05:00
zubiar-arbi
f7e78544de failing test for xblock_handler 
STUD-1311
 2014-02-12 10:13:58 -05:00
Anton Stupak
9b0c8d266e Merge pull request #2557 from edx/anton/revert-download-transcript-rc 
Video: Revert Download transcript button behavior.
 2014-02-12 12:41:43 +02:00
polesye
f957b34427 BLD-811: Revert functionality. 2014-02-12 12:05:02 +02:00
Anton Stupak
6be1fc841f Merge pull request #2554 from edx/anton/fix-video-import 
Video: Fix for Download Video link.
 2014-02-11 20:52:56 +02:00
polesye
cebc0c47fd BLD-824: Download Video link missing from video player. 2014-02-11 20:17:22 +02:00
Diana Huang
b1fa5ec5ef Merge pull request #2548 from edx/diana/drupal-registration-i18n 
Don't internationalize strings we use for enrollment.
 2014-02-10 16:17:15 -05:00
Diana Huang
4a16846426 Don't internationalize strings we use for enrollment. 
LMS-2218
 2014-02-10 15:29:09 -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
6635233b3c Merge pull request #2529 from edx/ned/second-dummy-language 
Add a second fake translation language
 2014-02-10 15:19:27 -05:00
Sarina Canelake
6f32324e28 Merge pull request #2537 from edx/sarina/add-greek 
Add Greek language translations
 2014-02-10 15:17:28 -05:00
Ned Batchelder
30aede6fb2 Merge pull request #2541 from edx/ned/remove-unused-imports 
Remove unused imports.
 2014-02-10 15:00:49 -05:00
Dave St.Germain
70b602fbfe Merge pull request #2498 from edx/dcs/a11y-sequence-nav 
Accessibility improvements to the sequence navigation
 2014-02-10 14:51:59 -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
01ac04ca60 Merge pull request #2496 from edx/dcs/a11y-hide-things 
For a11y, modal dialogs and script templates should be hidden...
 2014-02-10 14:50:30 -05:00
Sarina Canelake
0ea941da69 Add Greek language translations 2014-02-10 14:40:11 -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
Ned Batchelder
1bd213beba Remove unused imports. 2014-02-10 14:07:50 -05:00
Jay Zoldak
552e20471d Merge pull request #2511 from edx/zoldak/pycharm 
Add pycharm helpers to gitignore
 2014-02-10 14:01:18 -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
Sarina Canelake
46897d8b40 Merge pull request #2528 from edx/sarina/lms-2197 
i18n word cloud LMS-2197
 2014-02-10 09:44:40 -05:00
Mark Hoeber
43ac1d23a8 Updated title and template for image modal html component 
LMS-2215
 2014-02-10 09:18:00 -05:00
Ned Batchelder
9938ff683c Latest eo strings, lots of small differences due to Dummy changes 2014-02-08 10:37:02 -05:00
Ned Batchelder
ece123e90f More than one dummy language 2014-02-08 10:37:01 -05:00
Feanil Patel
95f31e5036 Merge remote-tracking branch 'origin/release' 2014-02-07 17:07:29 -05:00
Feanil Patel
b5031cbdd2 Merge pull request #2523 from edx/db/create-account-400-release 
Registration HTTP status code fix for release
 2014-02-07 17:06:41 -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
Sarina Canelake
ad8ee2f2fc i18n word cloud LMS-2197 2014-02-07 16:42:14 -05:00
Calen Pennington
db17bf4c15 Add tests of XML exporting to test_xblock_wrappers 2014-02-07 15:50:34 -05:00
Andy Armstrong
a60abede7b Merge pull request #2524 from edx/andya/dev-show-template 
Add the ability to view templates in a browser in development mode
 2014-02-07 15:43:17 -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
Jason Bau
50f7c0ebed Merge pull request #2510 from edx/jbau/fix-timezone-test-breakage 
fix tests that were breaking on dev envs due to TIME_ZONE='UTC'
 2014-02-07 12:28:36 -08:00
David Baumgold
d1dc8c9191 Add README to tilde fixture, fix pylint/pep8 issues 2014-02-07 15:03:37 -05:00
Greg Price
b1fc36d513 Merge pull request #2514 from edx/gprice/fix-single-thread-recursive 
Avoid requesting unnecessary thread responses
 2014-02-07 15:01:44 -05:00
Andy Armstrong
651d1afbf8 Add the ability to view templates in a browser in development mode 
This adds a simple mechanism to view any template file directly in a browser. The intention is that we can use this to build up reference HTML files which illustrate common UX patterns. We can then view the resulting pages without having to have a working implementation.

In development mode, the URL is /template followed by the path to the template file. For example, you can view the 404 page at:

    /template/404.html

You can also supply string parameters to the template by specifying them as query parameters in the URL.

e.g.  /template/my_template?name=Foo
 2014-02-07 14:56:35 -05:00
Mark Hoeber
2086fcb811 Merge pull request #2427 from edx/sylvia/documentation/BLD-793 
Remove warning about LTI not working in Preview mode
 2014-02-07 14:53:31 -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
732051311d Merge pull request #2362 from edx/giulio/image-modal-squash 
Image Modal CMS HTML Block subtype
 2014-02-07 09:41:39 -08: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
Dave St.Germain
44109d16ab For a11y, modal dialogs and script templates should be hidden from 
screen readers. Also, the mathjax message should be wrapped to prevent
non-IE browsers from complaining about a feature that is IE-only.
 2014-02-07 11:12:41 -05:00
Greg Price
bc0ca63f7e Avoid requesting unnecessary thread responses 
The front-end code for rendering a thread always makes an AJAX request
for the resopnses, regardless of how the thread was accessed (directly
by URL or by selecting it from the thread list). Previously, when
a user accessed a thread directly by URL, the LMS would initially
request the thread from the comments service with responses, but that
response data was never actually used. Now, the responses are not
fetched with that initial query.
 2014-02-07 10:50:59 -05: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