Commit Graph

7051 Commits

Author SHA1 Message Date
Don Mitchell
d7194e6bec struct_time to datetime conversion. 2013-06-10 17:16:34 -04:00
dcadams
0b4e03e8bc Merge pull request #66 from edx/feature-dcadams-usermanagement
Feature user-management autoenroll
2013-06-10 10:10:57 -07:00
Calen Pennington
6c24694a7c Fix tests that vary urls.py
Create a mixin class that can be used for tests that customize urls.py
to force django to reload it, so that they don't break other tests.
2013-06-10 10:56:50 -04:00
Juho Kim
98b978528b simplified analytics conf 2013-06-07 18:54:36 -04:00
cahrens
0baec0a164 Move string fields, get rid of hard-coded list of booleans. 2013-06-07 15:45:34 -04:00
caesar2164
3fe830a803 Merge pull request #98 from edx/giulio/fix-image-urls
move url() wrapper into SASS variable
2013-06-07 09:53:01 -07:00
Greg Price
2c29481611 Merge pull request #106 from edx/release
Merge hotfix-2013-06-07
2013-06-07 08:05:58 -07:00
Greg Price
625a9581eb Fix XSS vulnerability in instructor dashboard 2013-06-07 10:23:03 -04:00
e0d
6cf7d26381 Merge pull request #95 from edx/fix/e0d/no-name-e
fixing bug noticed in production
2013-06-07 07:13:39 -07:00
Valera Rozuvan
d9651d7497 GST fixes. Removed red error messages preseneted to the user. The errors are now displayed when a flag is turned on. Added graphical_slider_tool tag to the list which shows staff debug info. 2013-06-07 16:12:50 +03:00
Giulio Gratta
7104937fb8 move url() wrapper into SASS variable 2013-06-06 17:54:41 -07:00
Juho Kim
e161a0a65e simplified analyticserver settings 2013-06-06 18:58:20 -04:00
Nate Hardison
b05ff885fa Replace /faq route in LMS urls
This route was mistakenly removed by the theming changes since the
"FAQ" marketing link actually points to help_edx, not faq_edx.
2013-06-06 14:18:08 -07:00
e0d
83a490c79d fixing bug noticed in production 2013-06-06 16:04:42 -04:00
JonahStanley
1fefec2176 Fixed the need of a global variable 2013-06-06 15:28:45 -04:00
Alexander Kryklia
d6c772c5aa adds missed } 2013-06-06 14:48:41 -04:00
Brian Talbot
d3965cb3ee removes redundant h2 heading and syncs up h1 value (with broken mak/template syntax) for register view 2013-06-06 14:48:40 -04:00
JonahStanley
8d15b74a97 Fixed errors in spacing and refactoring out of scenario 2013-06-06 14:38:59 -04:00
Juho Kim
665bc6e3db analytics server setup simplified 2013-06-06 13:48:20 -04:00
dcadams
7d961bae54 undid last commit where some coffee files were inadvertantly added. 2013-06-06 10:26:30 -07:00
dcadams
de1c68796b Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement 2013-06-06 08:48:10 -07:00
Brian Talbot
86a7a255c3 resolves background color syncing for particular page/container wrappers 2013-06-06 11:45:33 -04:00
Frances Botsford
6526146b95 updated misused sass body-bg to container-bg variableon account and course views 2013-06-06 11:44:57 -04:00
Victor Shnayder
4ffe3c51b5 Adds segment-io integration into the LMS
Tell segment IO whenever a page is loaded.  Once this works, we
can add more detailed instrumentation for events we care about.

Will be turned off in prod until the SEGMENT_IO_LMS feature flag is
set to True and a SEGMENT_IO_LMS_KEY is set.
2013-06-06 11:34:03 -04:00
Brian Talbot
3775ac61a6 resolves background color syncing for particular page/container wrappers 2013-06-06 11:02:44 -04:00
Frances Botsford
6a2eedbf99 updated misused sass body-bg to container-bg variableon account and course views 2013-06-06 11:02:44 -04:00
Peter Fogg
4415fb4c42 Started removing XML from video editor.
TODO: This breaks the 1.5x and .75x speeds. I'm still looking into
why.

TODO: VideoDescriptor inherits from RawDescriptor in order to
use the from_xml and export_to_xml methods. This seems really ugly,
though; I'd rather find a better way to do this.
2013-06-06 10:29:24 -04:00
Vasyl Nakvasiuk
d0e3f99e77 BaseTestXmodule: create module on the fly 2013-06-06 16:46:47 +03:00
Vasyl Nakvasiuk
45e32107e7 video module: remove old methods 2013-06-06 16:46:47 +03:00
Vasyl Nakvasiuk
68716f99cc video module: _get_timeframe -> get_timeframe 2013-06-06 16:46:47 +03:00
Vasyl Nakvasiuk
b25710346f add python video tests 2013-06-06 16:46:28 +03:00
dcadams
bc5d792338 Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement 2013-06-05 15:14:48 -07: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
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
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
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