Jay Zoldak
|
f2fd90bc61
|
Merge pull request #1917 from MITx/fix/cale/lms-jasmine-tests
Fix/cale/lms jasmine tests
|
2013-05-01 08:23:41 -07:00 |
|
Jay Zoldak
|
7f93443dfb
|
Make the test_root/db directory and add a .gitignore for the db files that will be created there.
|
2013-05-01 10:53:58 -04:00 |
|
Sarina Canelake
|
2cb3af1e35
|
Only throw factorial-related exception on factorial raised exception
|
2013-05-01 10:53:22 -04:00 |
|
cahrens
|
6ee2ab8664
|
Merge branch 'master' into feature/christina/fields
|
2013-05-01 09:34:25 -04:00 |
|
cahrens
|
13fe9c11cb
|
Merged with master.
|
2013-05-01 09:33:35 -04:00 |
|
cahrens
|
1c8cef32ef
|
Remove unused import.
|
2013-05-01 09:30:20 -04:00 |
|
cahrens
|
94e41319ee
|
Unit test, remove display_name for now so there is no visible change.
|
2013-05-01 09:09:33 -04:00 |
|
Christina Roberts
|
a537bd7f05
|
Merge pull request #1908 from MITx/fix/btalbot/studio-courseinfo
Fix/btalbot/studio courseinfo
|
2013-04-30 13:34:52 -07:00 |
|
Ned Batchelder
|
cc1a8a4bc7
|
Merge pull request #1918 from MITx/ned/personal-requirements
Ned/personal requirements
|
2013-04-30 13:13:01 -07:00 |
|
Ned Batchelder
|
5b82ffd2ad
|
A little documentation.
|
2013-04-30 16:11:22 -04:00 |
|
Ned Batchelder
|
091ca9c3f0
|
Add a private-requirements.txt for personal changes to how things are installed. Good for installing libs as working dirs.
|
2013-04-30 16:11:22 -04:00 |
|
Christina Roberts
|
3e314a2c9e
|
Merge pull request #1915 from MITx/feature/christina/xblock-version
Change xblock version.
|
2013-04-30 13:03:15 -07:00 |
|
Jay Zoldak
|
aa4e29d2f1
|
Add leanModal vendor src to files.json for cms jasmine tests. Also .gitignore compiled js from coffee specs
|
2013-04-30 15:22:08 -04:00 |
|
Calen Pennington
|
76599863e6
|
Compile all coffee and sass before running jasmine tests
|
2013-04-30 14:09:58 -04:00 |
|
Calen Pennington
|
771937b3da
|
Remove duplicate libraries used while jasmine testing the LMS (as they are also defined in vendor)
|
2013-04-30 14:09:42 -04:00 |
|
Calen Pennington
|
dfd369b9e9
|
Make ordering of js bundles during jasmine tests consistant
|
2013-04-30 14:09:17 -04:00 |
|
John Jarvis
|
aa895cbc6b
|
Adding mktg_iframe.html
|
2013-04-30 13:13:31 -04:00 |
|
Christina Roberts
|
4c97f92245
|
Merge pull request #1916 from MITx/fix/cdodge/more-broken-template-images
add more images to support templates
|
2013-04-30 09:50:41 -07:00 |
|
Chris Dodge
|
c5d520574d
|
also move the MIT dome image in Latex to be in our source pack
|
2013-04-30 12:02:58 -04:00 |
|
Chris Dodge
|
1f1a6e3ec5
|
add more images to support templates
|
2013-04-30 11:46:49 -04:00 |
|
cahrens
|
63371135e5
|
Change xblock version.
|
2013-04-30 11:24:45 -04:00 |
|
Sarina Canelake
|
95a224fcea
|
Fix pep8 violations
|
2013-04-30 11:21:20 -04:00 |
|
cahrens
|
a9a234f018
|
Change xblock version.
|
2013-04-30 11:19:20 -04:00 |
|
Sarina Canelake
|
573116073e
|
Add error message when factorial given non-integral value
|
2013-04-30 11:16:14 -04:00 |
|
Christina Roberts
|
1e8619288a
|
Merge pull request #1912 from MITx/fix/cdodge/broken-template-image
add dependent image for the image response template
|
2013-04-30 08:11:11 -07:00 |
|
Chris Dodge
|
02ed9f26c4
|
add dependent image for the image response template
|
2013-04-30 10:07:42 -04:00 |
|
John Jarvis
|
01f8c4c816
|
Adding iframe view
example:
http://localhost:8000/courses/HarvardX/CB22x/2013_Spring/mktg-about
|
2013-04-30 09:44:21 -04:00 |
|
marco
|
30240ff01a
|
non revision
|
2013-04-29 19:53:16 -04:00 |
|
Brian Talbot
|
886205dec3
|
revised placeholder course overview HTML value
|
2013-04-29 17:23:14 -04:00 |
|
Steve Strassmann
|
d4ec592a58
|
Merge pull request #1910 from MITx/bug/straz/i18n
fix bad url for jsi18n
|
2013-04-29 14:19:08 -07:00 |
|
Steve Strassmann
|
cdfd7c807f
|
fix bad url for jsi18n
|
2013-04-29 17:13:24 -04:00 |
|
Diana Huang
|
32b30cef92
|
Merge pull request #1909 from MITx/diana/accessibility-update
Add accessibility text to the Contact page.
|
2013-04-29 13:58:43 -07:00 |
|
Diana Huang
|
85ebdff7c2
|
Merge pull request #1905 from MITx/fix/sarina/new_formularesponse_defaults
Fix/sarina/new formularesponse defaults
|
2013-04-29 13:56:43 -07:00 |
|
Diana Huang
|
befe7beccb
|
Add accessibility text to the Contact page.
|
2013-04-29 16:55:29 -04:00 |
|
Chris Dodge
|
33aada6d22
|
fix broken test. Since we're pre-populating the course overview when creating a course, the clone_course fails because it asserts that the destination course that it clones into is empty. Need to check that the course is basically empty (e.g. a course module and a overview module)
|
2013-04-29 16:43:32 -04:00 |
|
cahrens
|
8705ff8805
|
Remove system_metadata_fields.
|
2013-04-29 16:41:07 -04:00 |
|
Don Mitchell
|
cbf9acfefb
|
Merge pull request #1896 from MITx/feature/straz/i18n
Feature/straz/i18n - rake tasks to generate strings
|
2013-04-29 13:32:44 -07:00 |
|
Brian Talbot
|
a861c8b310
|
revised placeholder course and faculty images - more opacity to reinforce placeholderness
|
2013-04-29 16:03:00 -04:00 |
|
Chris Dodge
|
680e932b8b
|
use default staff images that is in /common/static/...
|
2013-04-29 15:42:58 -04:00 |
|
Brian Talbot
|
4e251a3b19
|
adding in placeholder images for a course and its faculty
|
2013-04-29 15:38:55 -04:00 |
|
Steve Strassmann
|
39dd251b02
|
add "rake test_i18n" to rakefile; tests pass
|
2013-04-29 15:30:18 -04:00 |
|
Sarina Canelake
|
f95331dcc1
|
fix more pep8 violations
|
2013-04-29 15:01:11 -04:00 |
|
Sarina Canelake
|
6993daf116
|
Fix pep8 violations
|
2013-04-29 15:01:05 -04:00 |
|
Sarina Canelake
|
46792c82de
|
Remove debugging print statements
|
2013-04-29 15:00:54 -04:00 |
|
Sarina Canelake
|
ed43afb08f
|
Add additional unit test comment
|
2013-04-29 15:00:45 -04:00 |
|
Sarina Canelake
|
696879bd26
|
Add unit tests for formularesponse type
|
2013-04-29 15:00:36 -04:00 |
|
Sarina Canelake
|
c79843c541
|
Add factorial as a default function for formula response
|
2013-04-29 15:00:26 -04:00 |
|
Christina Roberts
|
72dfd4995e
|
Merge pull request #1903 from MITx/fix/cdodge/dangling-verticals-on-delete
Fix/cdodge/dangling verticals on delete
|
2013-04-29 11:58:22 -07:00 |
|
Brian Talbot
|
c28647be2d
|
lms - cleared document flow for .teacher elements within a course's about view to coincide with Studio's default HTML for the course overview settings field
|
2013-04-29 14:47:57 -04:00 |
|
marco
|
94390e4314
|
aria tabs v1
|
2013-04-29 14:20:37 -04:00 |
|