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

18333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Chugh
d816d5fade update coffeescript to dynamically render sr spans 2013-09-27 16:24:30 -04:00
Adam Palay
202e4f94e7 make seq tooltips appear on focus 
remove focus from tab when clicked
 2013-09-27 16:22:46 -04:00
Calen Pennington
37627704dc Merge pull request #1117 from cpennington/manage.py-only-tests 
Move nose arguments around so that we can run tests with manage.py
 2013-09-27 13:13:03 -07:00
Don Mitchell
f8c7278470 Follow patterns 
Move init to top of class
Change asserts to more meaningful exception types
Refactor hard-to-read fn
 2013-09-27 16:03:57 -04:00
Vik Paruchuri
9a6ae8f740 Clean up open ended problems view and fix error. 2013-09-27 16:02:12 -04:00
Greg Price
b12e502c02 Merge pull request #1168 from edx/fix/vik/num-results-template 2013-09-27 12:59:01 -07:00
Vik Paruchuri
4ab47c4d05 Fix mako syntax in rubric template. 2013-09-27 15:57:41 -04:00
e0d
759a853464 Merge pull request #1063 from edx/e0d/django-1.4.8 
Upgrading to 1.4.8
 2013-09-27 12:54:44 -07:00
Usman Khalid
bc56ab7c13 Merge pull request #1057 from edx/usman/lms-1114-pdf-arrows 
Disables the previous/next arrows on pdf books on the first/last pages
 2013-09-27 12:50:38 -07:00
Calen Pennington
67ccf1e3bb Move nose/django arguments for tests out of rake so that raw manage.py works when running tests 2013-09-27 15:41:58 -04:00
Usman Khalid
316b4eee95 Merge pull request #1073 from edx/usman/lms1026-find-courses-link-optional 
Added setting to disable 'find courses' links
 2013-09-27 12:40:07 -07:00
Greg Price
f39886ef57 Ensure nav sidebar is sized correctly on page load 2013-09-27 15:34:32 -04:00
Usman Khalid
64d4ebdaa1 Revert last commit 2013-09-28 00:14:07 +05:00
brianhw
8d7b40f456 Merge pull request #1160 from edx/brian/fix-extauth-courseware-import 
Move Pearson courseware imports to function level.
 2013-09-27 11:40:48 -07:00
Greg Price
3e3ad4393e Merge pull request #1161 from edx/gprice/forums-labels 
Add accessible labels for forum post body inputs
 2013-09-27 11:37:45 -07:00
Giulio Gratta
abfb33c3e5 Merge pull request #1158 from edx/giulio/small-oe-fixes 
An assortment of small OE changes, both for ICE and standard
 2013-09-27 11:29:26 -07:00
Giulio Gratta
d75cdda064 An assortment of small OE changes, both for ICE and standard 
- Changed save OE message text
- Fix ICE legend positioning and content
- Add space to "offensive" checkbox
- Change tracker variable in undo to correct one
 2013-09-27 11:29:06 -07:00
Calen Pennington
eebc524cde Merge pull request #909 from cpennington/xmodule-mixin 
Pull XModule attributes out into a mixin that can be applied to xblocks
 2013-09-27 10:49:13 -07:00
Greg Price
f4971e753b Add accessible labels for forum post body inputs 2013-09-27 13:47:45 -04:00
jkarni
f27af194bc Merge pull request #1056 from edx/jkarni/feature/update-preview-reqs 
Adding Pillow jpeg and tiff system libs
 2013-09-27 10:37:29 -07:00
Greg Price
44b4204aa0 Merge pull request #1155 from edx/sarina/ins-dash-student-admin-2 2013-09-27 10:35:34 -07:00
Calen Pennington
d77491e46a Pull XModule attributes out into a mixin that can be applied to xblocks 2013-09-27 13:11:05 -04:00
Jay Zoldak
d2516b6869 Merge pull request #1142 from edx/zoldak/update-discussion-doc 
update discussion forum doc
 2013-09-27 10:06:00 -07:00
Greg Price
6b5d12e491 Merge pull request #1159 from edx/gprice/forum-focus-color 
Make discussion elements change color on focus
 2013-09-27 09:55:14 -07:00
Brian Wilson
07f94d46a6 Move Pearson courseware imports to function level. 2013-09-27 12:43:27 -04:00
Usman Khalid
59403644ae Moved jquery event handling to parent since hidden elements do not get events attached 2013-09-27 21:35:16 +05:00
Calen Pennington
f4dd50826a Merge pull request #1055 from cpennington/cleanup-xml-hotfix 
Clean up after hotfix to fix xml loading for import
 2013-09-27 09:24:22 -07:00
Sarina Canelake
3813e51cfb Add more feedback for instructors on Student Admin section of the dash. 2013-09-27 12:18:01 -04:00
jmclaus
4a9d1928d4 Merge pull request #1154 from edx/valera/fix_failing_jasmine_test_return_correct_caption_index 
Fix for PR 1119.
 2013-09-27 09:17:56 -07:00
Sarina Canelake
91d85f5c2a Enable alerts when a task succeeds. 
Note: Alerts are pop-up boxes. Not sure if this is desireable, but I couldn't figure out
how to make a success message show up in the same place that error messages do.
 2013-09-27 12:17:53 -04:00
Sarina Canelake
086f544a1a Fix, and add more, tests 2013-09-27 12:17:45 -04:00
Sarina Canelake
07e76b3b2f Enable use of student usernames on student admin page 
This is in addition to email addresses, which also work.
 2013-09-27 12:17:35 -04:00
Sarina Canelake
8a2bd25b7c Visual rearrangement of new dash "Student Admin" page 2013-09-27 12:17:24 -04:00
Usman Khalid
5ca778ef05 Display:none arrows in disabled state 2013-09-27 21:06:34 +05:00
Valera Rozuvan
36fc1a6243 Fix for PR 1119. 
A Jasmine test was falling. It went unnoticed. The PR was merged. This
is a fix for it.
 2013-09-27 18:43:58 +03:00
Greg Price
bf5a801fa8 Make discussion elements change color on focus 
Previously, colors changed to afford interaction only on hover; now, all
elements with a hover color change behave the same way on focus.
 2013-09-27 11:04:51 -04:00
jmclaus
cb56b7b9fd Merge pull request #1119 from cheng-shiwen/cheng-shiwen/master 
caption display problem
 2013-09-27 08:03:00 -07:00
Calen Pennington
f500b72290 Make sure that we have the right set of fields available during xml parsing 
We had a bug where mixins weren't being applied before `load_from_xml`
was called. This meant that not all of the fields were being loaded
correctly. To fix it, we used the mixoligist from the runtime to apply
the mixins earlier in the process. However, that caused the mixins to be
applied twice.

The included fixes to xblock resolved the multiply-applied mixins, and
the fixes to the parsing code make it simpler to understand, and add
some unit tests of the parsing to boot.
 2013-09-27 10:57:39 -04:00
Calen Pennington
813795ddf4 Add a management command to dump xml courses 
This command loads the courses with the XMLModuleStore, and then exports
the fields contents as json in a diff-friendly way. This can then be
used to validate against regressions in the xml parsing code.
 2013-09-27 10:57:39 -04:00
Shiwen Cheng
522cb8b48c fix the video caption lag issue 2013-09-27 22:41:36 +08:00
Shiwen Cheng
77f3e4f964 fix the bug: when click a caption, the previous one will be in bold 2013-09-27 22:41:35 +08:00
Shiwen Cheng
21a9446b99 fix the bug that the first caption and the second one will become current at the same time when displaying right captions 2013-09-27 22:41:35 +08:00
Jason Bau
c1d555beef Merge pull request #1118 from edx/jbau/shoppingcart-stanford 
Stanford paid course registration
 2013-09-27 07:31:17 -07:00
jmclaus
ebcb134c2e First caption does not display outline on initial mouseover. 2013-09-27 15:50:24 +02:00
Will Daly
9385b5764c Merge pull request #1143 from edx/will/skip-tests-with-comments 
Use comments to skip tests instead of a tag
 2013-09-27 05:33:49 -07:00
Jay Zoldak
94c74b5c80 update discussion forum doc 2013-09-27 08:28:18 -04:00
James Tauber
ef6d58ae80 Merge pull request #1005 from edx/jtauber/link-to-how-to-contribute 
Include / Link to How To Contribute wiki page
 2013-09-27 05:16:20 -07:00
Usman Khalid
1737984b34 Merge pull request #1122 from edx/usman/lms1167-pdfjs-update 
PdfViewer: Added missing link to compatibility.js
 2013-09-27 02:49:06 -07:00
Jason Bau
667a1eadb5 Stanford paid course registration 
With tests, some settings changes
(all should default to not breaking anything for edx)

Added styling for shopping cart User Experience
- Styled shoppingcart list page
- Styled navigation shopping cart button
- Styled receipt page
- Styled course about page for shopping cart courses

Addressed HTML/SCSS issues

Remove offending body class and unnecessary sass changes

Addresses many review comments on stanford shopping cart

* framework for generating order instructions on receipt page
  in shoppingcart.models
* move user_cart_has_item into shoppingcart.models
* move min_course_price_for_currency into course_modes.models
* remove auto activation on purchase
* 2-space indents in templates
* etc

revert indentation on navigation.html for ease of review

pep8 pylint

move logging/error handling from shoppingcart view to model

Addressing @dave changes
 2013-09-26 18:25:00 -07:00
Greg Price
7aea7369a7 Merge branch 'release' 2013-09-26 18:12:31 -04:00