cahrens
e44c6b6bf8
Don't reach in to default value.
2013-05-03 17:05:02 -04:00
cahrens
32d67be5f5
Get rid of _computed_default.
2013-05-03 16:42:41 -04:00
Sarina
72584b5937
Merge pull request #1914 from edx/fix/sarina/new_formularesponse_defaults
...
Fix/sarina/new formularesponse defaults
2013-05-03 12:32:10 -07:00
cahrens
5c3719b915
Get HTML LaTeX "working" again.
2013-05-03 15:31:18 -04:00
cahrens
9dd074f25b
Cleanup.
2013-05-03 15:09:02 -04:00
David Baumgold
b344976fe7
Making linters happier
2013-05-03 15:08:28 -04:00
Diana Huang
c9a6fe18f0
Create new marketing_link function to abstract link generation
...
and use it for the new marketing site links.
2013-05-03 15:06:24 -04:00
Diana Huang
3e217c8f85
Use new login page for marketing site when student is trying to
...
access login_required page.
2013-05-03 15:04:41 -04:00
cahrens
37d594ce37
Get rid of non-editable scope.
2013-05-03 14:58:33 -04:00
Greg Price
0f7378a171
Modify UserFactory to create a profile for the user
...
This allows specification of profile parameters when creating a user. Because
the profile contents are always accessed from the database, the user must be
saved to the database before the profile is created. This means that the
profile cannot be created if the user is merely being built (and not saved)
rather than created.
2013-05-03 10:31:35 -04:00
Greg Price
e5846e64bd
Modify course registration flow for new login and registration pages
...
Now that we are using separate pages for login and registration rather than
modals, clicking the registration button for a course should direct an
unauthenticated user to the registration page, and the user should be enrolled
in the course upon successful registration. Likewise, an unauthenticated user
attempting to unenroll from a course should be directed to the login page and
subsequently unenrolled from the course upon successful login. The enrollment
change service also now uses HTTP status codes rather than JSON to communicate
status to the front end.
2013-05-03 10:01:11 -04:00
Victor Shnayder
aae40b4378
Press updates
...
LH: 381, 382, 383
2013-05-03 08:55:40 -04:00
ichuang
60977b0e74
formularesponse requires the "samples" attribute; enforce this,
...
instead of just failing with an obscure error
2013-05-02 18:56:15 -04:00
Diana Huang
45baf013fe
Merge branch 'master' into drupal-new
2013-05-02 17:04:39 -04:00
cahrens
c7713b6211
Merge branch 'master' into feature/christina/fields
2013-05-02 12:32:56 -04:00
cahrens
46100fd258
Cleanup.
2013-05-02 12:32:32 -04:00
cahrens
01ede40b03
Switching branches
2013-05-02 09:43:03 -04:00
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
Sarina Canelake
2cb3af1e35
Only throw factorial-related exception on factorial raised exception
2013-05-01 10:53:22 -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
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
dcadams
7c7471d31c
Merge branch 'master' of github.com:MITx/mitx into feature-dcadams-usermanagement
2013-04-30 11:40:09 -07: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
Sarina Canelake
95a224fcea
Fix pep8 violations
2013-04-30 11:21: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
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
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
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
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
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
Chris Dodge
d7693d96b7
unit test should just use direct store. Also remove unused import and logging.
2013-04-29 09:18:49 -04:00
Calen Pennington
8c4526ed07
Fix coffeescript error in video spec file
2013-04-29 07:32:16 -04:00
