David Baumgold
fa87cccb9b
Document old-style rake lms command
2013-05-06 10:29:26 -04:00
David Baumgold
98243b2b53
Document django-admin[update_templates] step
2013-05-06 10:29:26 -04:00
Ned Batchelder
03470fc48e
Add a mention of create-dev-env.sh
2013-05-06 10:29:26 -04:00
David Baumgold
06ade12f6a
Also need to install Mongo
2013-05-06 10:29:26 -04:00
David Baumgold
fccee7a1e3
Node does virtual environments using npm
2013-05-06 10:29:26 -04:00
David Baumgold
1bda218e17
Clarify purpose of data dir
2013-05-06 10:29:26 -04:00
David Baumgold
a0727ac226
Virtualenv is a tool, and should be surrounded by backticks
2013-05-06 10:29:26 -04:00
David Baumgold
a58f39695a
Remove install.txt, because all that information is in the README.md file now
2013-05-06 10:29:25 -04:00
David Baumgold
457b678af7
Wrote a proper README file
...
So that no one else will have to go through what I went through. Hopefully.
2013-05-06 10:29:25 -04:00
Jay Zoldak
8ef88fa5b0
Fix tests that randomly fail when run in concurrent jobs on jenkins.
2013-05-06 10:24:38 -04:00
David Baumgold
5e288b60ca
Merge pull request #1943 from edx/cleanup
...
One more attempt at making linters happier
2013-05-06 07:15:21 -07:00
Diana Huang
5b3f5a47de
Add marketing_link to the Template context dictionary.
...
Pep8 fixes
2013-05-06 10:03:00 -04:00
marco
6b4ab20d02
styled modes header, added inactive and active mode visibility as well as is-set mode styling. no js behavior in yet. adds overscoll fix for webkit
2013-05-05 14:09:59 -07:00
marco
ad0909dfbd
style input boxes
2013-05-04 23:19:49 -07:00
marco
d1595892fd
starting settings
2013-05-04 12:23:40 -07:00
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
Steve Strassmann
03b9a9e22a
tweak file reference
2013-05-03 15:42:39 -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
Steve Strassmann
138e0569dd
pull master
2013-05-03 15:18:45 -04:00
Steve Strassmann
e6334584d6
rakefile cleanup
2013-05-03 15:18:29 -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
e4e6c0dd7b
Add new URLS to MKTG_URLS.
2013-05-03 15:05:03 -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
jarv
5d729c306b
Merge pull request #1942 from edx/fix/jbau/email_timezone_config
...
Inserts overrides in env.lms.aws for email settings and timezone
2013-05-03 11:54:51 -07:00
Jason Bau
7720c0fc8d
Inserts overrides in env.lms.aws for email settings and timezone
...
overrides what is set in env.lms.common using the lms.env.json
file
2013-05-03 11:45:21 -07:00
Brian Talbot
192e1d798d
edx.org - trying a fix for IE ignoring styles within registration button iframe
2013-05-03 13:33:47 -04:00
John Jarvis
258537e3d2
adding csrf middleware token to form submission
2013-05-03 13:05:10 -04:00
John Jarvis
58dbcf9d31
break out of iframe
2013-05-03 13:04:36 -04:00
Greg Price
d61945081d
Fix disable/re-enable submit button
2013-05-03 13:01:39 -04:00
Steve Strassmann
63e6ff16c3
merge with master
2013-05-03 12:46:29 -04:00
Steve Strassmann
55dd0fc8bc
workaround for gettext parser bug
2013-05-03 12:45:55 -04:00
Steve Strassmann
dea1198d75
Merge pull request #1925 from edx/bug/straz/date
...
Bug/straz/date - fix date interpolation
2013-05-03 09:32:00 -07:00
marco
018a3d8a38
branch now runs, but none of the styles are there yet. pushing this mostly to view component.html
2013-05-03 09:20:43 -07:00
marco
370df65d89
Merge branch 'master' into ux/marco/studio-componentsettings
2013-05-03 09:04:03 -07:00
marco
b9da0ffb0a
reverting all variables in attempt to properly load unit pages
2013-05-03 09:02:32 -07:00
Brian Talbot
7dd763212e
edx.org - fixes to the iframe-based register button's styling
2013-05-03 11:55:14 -04:00
marco
110a51b74e
removing variable names to get it to run again
2013-05-03 08:40:35 -07:00
marco
036991dce8
moved bad variable name
2013-05-03 08:10:37 -07:00
brianhw
a294e2d1ac
Merge pull request #1937 from edx/victor/press
...
Press updates
2013-05-03 07:50:26 -07: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
Diana Huang
d35283cf65
Reduce the amount of repeated HTML and add checks for the correct settings.
2013-05-03 10:17:40 -04:00
Greg Price
031a74865e
Add login link to registration page if user is trying to enroll in a class
...
If an unauthenticated user clicks on a course registration button, they will
be redirected to the user registration page. Now, that page will include a link
to the login page. If the user follows the link and logs in successfully, then
they will be enrolled in the class.
2013-05-03 10:01:11 -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
Diana Huang
1d42df8cb1
Add MKTG_URLS to settings for new footer and header links.
2013-05-03 09:31:47 -04:00
Diana Huang
e0ac6834da
Fix links between marketing site and courseware.
...
Update links in footer to point to the right pages.
Update link on dashboard without any classes.
Update links in header.
Update links on sign in and register pages.
2013-05-03 09:31:47 -04:00
