Commit Graph

19363 Commits

Author SHA1 Message Date
brianhw
5ff9f3be88 Merge pull request #81 from edx/zoldak/skip-mktg-url-link-test
Skip a test that is causing intermittent failures due to the way it is ordered.
2013-06-05 23:01:36 -07:00
Jay Zoldak
1f284c56c1 Skip a test that is causing intermittent failures due to the way it is overriding urls 2013-06-05 18:15:16 -04:00
dcadams
bc5d792338 Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement 2013-06-05 15:14:48 -07:00
Will Daly
582b35a90e Merge pull request #80 from edx/will/fix-rake-test
Will/fix rake test
2013-06-05 14:33:30 -07:00
Will Daly
359e61d0f2 Fixed issue with xargs on Mac OS X.
Removed cleaning of reports folders, since this was
interferring with coverage reports generated
sequentially by rake test.
2013-06-05 17:06:41 -04:00
Piotr Mitros
af2416756e Moved from djanalytics to edinsights 2013-06-05 17:06:36 -04:00
Ned Batchelder
56385cdf32 Merge pull request #79 from edx/ned/private-settings
Developer-private settings files
2013-06-05 13:17:26 -07:00
Ned Batchelder
7e8c06caf3 Developer-private settings files
Developers can have private settings files by creating
lms/envs/private.py or cms/envs/private.py.  They are imported
at the end of dev.py.  Note that they won't be imported if you
are using one of the other dev*.py variants.
2013-06-05 16:07:17 -04:00
Victor Shnayder
97c788a33a Merge pull request #78 from edx/victor/fix-help-button
Re-insert "if in course" check for displaying paragraph about forums.
2013-06-05 13:04:55 -07:00
Victor Shnayder
1b81d06337 Re-insert "if in course" check for displaying paragraph about forums.
Accidentally got removed in pull request 13.
2013-06-05 16:04:21 -04:00
JonahStanley
d226a21eb0 Changed wording to I will 2013-06-05 16:01:45 -04:00
JonahStanley
f652a5d8c4 Small wording fix 2013-06-05 15:57:42 -04:00
JonahStanley
260659cfc6 Fixed wording in the step 2013-06-05 15:56:45 -04:00
JonahStanley
d147103be0 Fixed tab issue (tabs are now correctly spaces) 2013-06-05 15:55:12 -04:00
Peter Baratta
83f1f9c2fc Set numpy so it does not print out warnings on student input 2013-06-05 15:50:35 -04:00
Peter Baratta
a85a7f71df Rename variables; get rid of OPS 2013-06-05 15:50:17 -04:00
JonahStanley
0548b119a9 Fixed other scenarios that were skipped 2013-06-05 15:21:23 -04:00
marco
786d8a9d7c cleaned up variables styling to sync up closer to studio, incorporated fontawesome icons into discusison home with basic positioning 2013-06-05 15:17:19 -04:00
JonahStanley
acc743eea8 Added functionality to bypass alerts
This is done with the following steps:
'I confirm all alerts' means that all alert and confirm windows are returned and returned true respectively
'I dismiss all alerts' means that all confirm windows are returned false
'I answer all prompts with "([^"]*)"' means that all prompts are returned with the given string

Please note that these settings are on a PER PAGE basis.  This means that for best results, the step must be given right before the alert is generated.
2013-06-05 15:08:58 -04:00
Calen Pennington
3c498f66b3 Add script to generate lists of changes made by all users in a release 2013-06-05 15:04:08 -04:00
Will Daly
ee0115971b Merge pull request #68 from edx/will/diff-cover-integration
Will/diff cover integration
2013-06-05 12:00:16 -07:00
chrisndodge
5d3f6dc477 Merge pull request #74 from edx/fix/cdodge/about-elements-not-exporting
[STUD-244] add exporting of 'about' content as well as adding unit test checks
2013-06-05 11:53:24 -07:00
chrisndodge
7fc994831f Merge pull request #75 from edx/feature/cdodge/allow-setting-of-session-cookie-name
seems like there's a Django bug and the SESSION_COOKIE_NAME needs to be ...
2013-06-05 11:35:26 -07:00
Chris Dodge
ffdeac3dcd seems like there's a Django bug and the SESSION_COOKIE_NAME needs to be an explicit str() 2013-06-05 14:31:32 -04:00
Nate Hardison
442532d024 Merge pull request #57 from edx/nate/theming
LMS theming for Stanford 6/11/13 launch
2013-06-05 11:20:27 -07:00
Brian Talbot
0b62ec7d8d theming - revised variables and link/button styling to account for edX's registration and login constrast/styling changes 2013-06-05 10:56:26 -07:00
Brian Talbot
e9d4749877 theming - resolves some variable defintions to help with edX theme 2013-06-05 10:56:25 -07:00
Brian Talbot
110899620f edx.org - revises new register/login banner image variable paths to resolve a Sass rendering issue 2013-06-05 10:56:25 -07:00
Giulio Gratta
268524597c fix a few text weights and moved ugly mixins to mixin file and implemented in shame file 2013-06-05 10:56:25 -07:00
Giulio Gratta
27fce3e473 SASS diff from stanford themed branch for master 2013-06-05 10:56:25 -07:00
Nate Hardison
4ea6692e11 Change if ... is not None to if ...
Minor stylistic tweak.
2013-06-05 10:56:24 -07:00
Nate Hardison
96c4c53505 Use default PLATFORM_NAME in AWS settings
Rather than require the `PLATFORM_NAME` to be specified in the
`ENV_TOKENS`, allow the default setting in `common.py` to be used.
2013-06-05 10:56:24 -07:00
Nate Hardison
4031c193a1 Adjust available routes based on theme presence
Themes do not necessarily want all of the available LMS routes, such
as `/jobs` and `/university_profiles`. This change splits up the
`lms/urls.py` file and selectively enables/disables routes based on
whether or not a theme is enabled. This is a naive solution for now;
a better solution gives themes a way to selectively overrides such
routes.

Additionally, with the `MKTG_URL_LINK_MAP` setting that hits certain
routes immediately on each page render (whenever the `marketing_link`
helper function is called), themes may crash if they don't leave
all marketing link routes present in `lms/urls.py`. This change also
provides the ability to override the `MKTG_URL_LINK_MAP` in the
settings.

Finally, modify the mitxmako marketing URL middleware to not try to
reverse disabled URLs, which are those keys in the map whose values
are `None`.
2013-06-05 10:55:12 -07:00
Nate Hardison
e0590c356b Rewrite the main course.scss file as well
Just as is done with the main LMS application.scss file, rewrite the
course.scss file with Mako to conditionally import a theme's
variables overrides. Add the course.scss file to the list of ignored
Git files so that it doesn't keep getting committed over and over
again.

This also requires us to add a hardcoded line in the assets Rakefile
for the moment, so that the course.scss.mako file gets properly
preprocessed. Once the preprocessing is done by a Django management
command, we won't have to do this anymore.
2013-06-05 10:27:26 -07:00
Nate Hardison
c7f56cf456 Move theme import right after variables import
Since the theme Sass is just a simple variables overrides (for the
moment), it must be imported right after the default variables Sass
file (if at all). At the bottom of the file, it has no effect.
2013-06-05 10:27:25 -07:00
Nate Hardison
2640ab49e0 Stanfordize LMS emails
Adjust language of LMS emails to work specifically for Stanford. Here
there be dragons: lots of ugly conditionals that will need to be
changed once we develop a way to "theme" arbitrary strings throughout
the site.
2013-06-05 10:27:25 -07:00
Nate Hardison
adf9dd3d35 Make email change templates use main layout
Update the email change templates to fit with the rest of the main
site and use the standard notification template. Now they're far
prettier than before.
2013-06-05 10:27:25 -07:00
Nate Hardison
2c90948623 Use settings in LMS emails, not hardcoded values
Instead of hardcoding things like the platform name, use the
corresponding overrideable settings instead. This allows themes to
control emails as well.
2013-06-05 10:27:25 -07:00
Nate Hardison
940888da37 Use bugs email from settings, not hardcoded value 2013-06-05 10:27:25 -07:00
Nate Hardison
2ab00eefa7 Use the contact email setting instead of if/else
Remove the Stanford-specific if/else hack to set the appropriate
contact email address and use the `CONTACT_EMAIL` setting instead.
2013-06-05 10:27:24 -07:00
Nate Hardison
07511e20be Add settings for contact and bugs emails
Allow themes to override contact and bugs email addresses via the
settings.
2013-06-05 10:27:24 -07:00
Nate Hardison
799d56d028 Theme static error pages
Reference the `PLATFORM_NAME` and `TECH_SUPPORT_EMAIL` settings in
the static error pages instead of hardcoded, edX-specific values.
2013-06-05 10:27:24 -07:00
Nate Hardison
41a6a352de Add setting for technical support email config
Configure the technical support email address in the settings so that
themes can override with an email of their own in the appropriate
env.json file in production.
2013-06-05 10:27:24 -07:00
Nate Hardison
d79f064248 Fix forgot password modal for theming
Use the `PLATFORM_NAME` setting instead of "edX"
2013-06-05 10:27:23 -07:00
Nate Hardison
f25fdebe67 Theme the authenticated index view
Much like the work done on the default (unauthenticated) index view,
adjust the background image (actually, let the CSS handle it instead
of an embedded `style` attribute in the HTML). Other adjustments
(language, logo) are made for Stanford specifically and need to be
reworked for general theming.
2013-06-05 10:27:23 -07:00
Nate Hardison
dc8bd32fb2 Theme the individual course about pages
Use the theme's own Google Analytics template (should probably
update to just use parameters once the default GA template is kept
up-to-date). Don't link to the university profile page when a theme
is enabled, as that's an edX-specific feature. Adjust social links
for Stanford, but leave them alone for everyone else (this is just
a hack for the 6/11/13 launch).
2013-06-05 10:27:23 -07:00
Nate Hardison
227271fec6 Theme the courseware dashboard
Again, most of the work here is replacing "edX" with the
`PLATFORM_NAME` setting. Need to ensure that the `news` boolean is
indeed a falsy value as well, or just add a `theme_enabled()` test
to disable the news block entirely (since news is an edX-specific
feature).
2013-06-05 10:27:23 -07:00
Nate Hardison
34c49e73f7 Don't return any news if a theme is enabled
When a non-edX theme is enabled, then don't return anything for "top
news," which is edX-specific.
2013-06-05 10:27:23 -07:00
Nate Hardison
90ebb4c836 Theme the login page
As with the registration page, the bulk of the theming work here is
replacing instances of "edX" with the `PLATFORM_NAME` setting. There
is also a change to the "help" section, disabling it if the FAQ
marketing link isn't set.
2013-06-05 10:27:22 -07:00
Nate Hardison
8c19b0c98b Theme the base registration page
This mostly involves rewriting all mentions of "edX" to reference the
`PLATFORM_NAME` setting instead. However, there are also some
Stanford-specific rewrite hacks that need to be pulled out
eventually. Additionally, don't display links to marketing pages (or
the sections referencing those marketing pages) if the links are not
defined by the theme.
2013-06-05 10:27:22 -07:00