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
dcadams
44bdea0044
Merge branch 'master' of github.com:MITx/mitx into feature-dcadams-usermanagement
2013-04-29 14:35:45 -07: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
dcadams
aa4b61180c
Some cleanup.
2013-04-29 10:03:11 -07:00
Steve Strassmann
8358e866cf
more robust cleanup of default po files
2013-04-29 12:45:07 -04:00
dcadams
b62b4ac267
Merge branch 'master' of github.com:MITx/mitx into feature-dcadams-usermanagement
2013-04-29 09:38:32 -07:00
dcadams
c64f0b1a18
Modifications to instructor dashboard - enrollment tab:
...
- Remove single enrollment/unenrollment
- Make unenrollment work with multi-email listbox.
- Provide checkbox for auto-enroll on activate if user not yet signed
up.
- Enroll student when activating if auto-enroll flag set.
2013-04-29 09:38:10 -07:00
Steve Strassmann
e287244151
rm test dir (replaced by tests dir)
2013-04-29 11:49:51 -04:00
cahrens
cd53dd222b
Merge branch 'master' into feature/christina/fields
2013-04-29 11:48:41 -04:00
Steve Strassmann
d63a37c252
rename test dir to tests; add SkipTest for test_extract.py
2013-04-29 11:47:56 -04:00
Steve Strassmann
393e6ffc23
added test cases for converter and dummy
2013-04-29 11:35:01 -04:00
Steve Strassmann
c00d71d422
integrate dummy string tools; added rake tasks and unit tests
2013-04-29 11:32:22 -04:00
marco
80d46401bf
Merge branch 'master' into ux/marco/studio-componentsettings
2013-04-29 10:19:22 -04:00
marco
45a665c7c7
added mode bar up top
2013-04-29 10:18:56 -04:00
Steve Strassmann
2e81fc5152
sync with master
2013-04-29 09:55:12 -04:00
