Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

19654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Talbot
aa8f73ffb4 edx.org - revises base blue and color references to adhere to WCAG color contrast guidelines 2013-06-04 09:37:21 -04:00
Brian Talbot
8da62871a9 edx.org - revises registration h1 text to match the graphical banner texdt 2013-06-04 09:37:21 -04:00
Nate Hardison
64a85e19e7 Specify UTF-8 encoding when loading Mako template 
When loading a Mako template from a Django template, the file
encoding of the Mako template was left unspecified. In some cases,
this would cause the Mako template to be interpreted as an ASCII
template, resulting in blowups if the template was encoded in
UTF-8 (e.g., lms/templates/footer.html).

Now, both the input and output encodings are specified as UTF-8.
 2013-06-03 17:19:33 -07:00
marco
57c513b104 basic shell for discussion home page with both profile information and email notification settings 2013-06-03 17:23:02 -04:00
Diana Huang
f3b36b8bc9 Use from_descriptor instead of from_xml to make ErrorDescriptor 2013-06-03 17:21:41 -04:00
Peter Fogg
266938a7b3 Finish the comment I forgot about... 2013-06-03 16:55:28 -04:00
Peter Fogg
90bbff8965 Add test to be sure that advanced components require multiple clicks. 2013-06-03 16:53:14 -04:00
Peter Fogg
e06f0083e2 Adding myself to AUTHORS. 2013-06-03 16:39:16 -04:00
Peter Fogg
bf88e5ce6a Be more explicit about template location. 2013-06-03 15:48:07 -04:00
Peter Fogg
8a67454f98 Prevent creation of unnecessary template divs, and rename .single_templates to .single-templates for convention. 2013-06-03 15:36:55 -04:00
cahrens
38e3ff13ed pep8 cleanup. 2013-06-03 15:32:42 -04:00
cahrens
93be67d49a Fix bug STUD-103. The url base for about page links needs to be www.edx.org for Drupal site, vs. LMS_BASE which is used for Studio. Note that the complete URL is still not correct, but a redirect exists to take it to the new location. 2013-06-03 15:21:02 -04:00
Peter Fogg
d3ec1cb915 Add tests for single-click discussion creation. 2013-06-03 14:57:34 -04:00
Peter Fogg
eff78bfd86 Add doc for click_component_from_menu and make sure css is present in any case. 2013-06-03 14:39:02 -04:00
Joe Blaylock
6262274805 Expose site-wide anonymized ids to HTML module 
Co-authored-by: Nate Hardison <natehardison@gmail.com>
 2013-06-03 11:35:42 -07:00
Ned Batchelder
c865641f13 Merge pull request #23 from edx/ned/move-loncapa-etc-into-sandbox 
Ned/move loncapa etc into sandbox
 2013-06-03 11:27:16 -07:00
Peter Fogg
ff0c56b7fb Cleaning up code -- removed unnecessary lines, fixed indentation, renamed method. 2013-06-03 14:21:50 -04:00
James Tauber
c0859cb042 Merge pull request #35 from antoviaque/install-update-templates 
Install steps - Fixes syntax of `update_templates` django command
 2013-06-03 10:47:22 -07:00
Will Daly
afa6f485fd Added diff-cover as a requirement (installed from github) 2013-06-03 13:31:07 -04:00
Jonah Stanley
cdadcba9da Merge pull request #10 from edx/jonahstanley/add-more-tests 
Jonahstanley/add more tests
 2013-06-03 10:25:53 -07:00
Nate Hardison
8d7a2f316a Merge pull request #5 from edx/nate/asset-preprocessing-mgmt-cmd 
Preprocess assets as Django management command
 2013-06-03 10:15:33 -07:00
Will Daly
4724a35f28 Merge pull request #9 from edx/fix/will/pip-version 
Added requirement for pip>=1.3
 2013-06-03 10:02:38 -07:00
Nate Hardison
03a9765b79 Change task.invoke to Rake::Task.invoke 
Using `task()` reopens the definition of the task, and all we really
need to do is get a reference to the task itself to invoke it.
 2013-06-03 10:00:50 -07:00
Nate Hardison
1fd1f63075 Wrapper tasks for :assets-dependent Jasmine tasks 
The :browse_jasmine_<system> and :phantomjs_jasmine_<system> tasks
depend on the :assets task, which needs to receive both :system and
:env arguments. Therefore, new tasks (:browse_jasmine and
:phantomjs_jasmine) are created that do take :system and :env args.
The old :browse_jasmine_<system> and :phantomjs_jasmine_<system>
tasks now wrap the new tasks, passing in <system> as an argument
and 'jasmine' (for :env, since it's hardcoded to 'jasmine' in
django_for_jasmine()).
 2013-06-03 09:58:01 -07:00
Nate Hardison
35fb5fa47e Add wrapper task to start LMS/CMS server 
The LMS/CMS server startup depends on the :assets task, which needs
to receive :system and :env arguments. Since the existing server
startup tasks didn't take a :system argument, a new command called
:runserver is created that does take :system, :env, and :options
arguments. The old server startup tasks are adjusted to wrap the one
:runserver task that does all of the heavy lifting.
 2013-06-03 09:58:01 -07:00
Nate Hardison
1001b315a3 Preprocess assets as Django management command 
Rather than directly invoke command-line Python (and Mako) from the
assets Rakefile, or call an external Python script, use a Django
management command to preprocess all asset template files.

An "asset template file" is defined as a static asset file with a
file extension indicating that it needs to be run through a template
engine prior to Sass/CoffeeScript compilation or packaging with other
assets. The preprocess_assets management command will look through
all of the files listed in the `STATICFILES_DIRS`, preprocessing each
as needed. Preprocessing strips off the special template file
extension, creating a new file in the process.

Currently, the only variable accessible in an asset template file is
the `THEME_NAME`, defined in the settings.
 2013-06-03 09:58:01 -07:00
JonahStanley
6af54ead39 Fixed scenario wording 2013-06-03 12:43:54 -04:00
Will Daly
900dca9ef4 Merge branch 'master' into fix/will/pip-version 2013-06-03 12:25:56 -04:00
Will Daly
76ae980006 Clean the report directories before each test run, 
to ensure we don't get coverage results from a
previous test run.
 2013-06-03 12:19:13 -04:00
jkarni
4bc27b930c Merge pull request #47 from edx/hotfix/jkarni/folditpartialcred 
Add partial credit for foldit
 2013-06-03 09:19:10 -07:00
Julian Arni
198d63db86 Update docstring for get_score 2013-06-03 12:13:05 -04:00
JonahStanley
0d11eb16ba Fixed typo 
I accidently had show_answer instead of showanswer.  This error was hidden by a previous default of showanswer=always.
 2013-06-03 11:52:40 -04:00
marco
7ddb7a6784 Merge branch 'master' into feature/marco/discussionhome 2013-06-03 11:23:24 -04:00
Julian Arni
c639bbc6f0 Add partial credit for foldit 2013-06-03 11:15:45 -04:00
Peter Baratta
72d149caae Add docstrings and comments 2013-06-03 10:46:11 -04:00
Slater-Victoroff
01ef72f44d Merge pull request #37 from antoviaque/install-ubuntu-dependencies 
Dependency installation fixes for Debian/Ubuntu
 2013-06-03 07:45:02 -07:00
Peter Baratta
ed45c505a3 Simpler pyparsing 2013-06-03 10:44:06 -04:00
Peter Baratta
74866a38b0 Move parseActions and statics out of evaluator() 2013-06-03 10:42:42 -04:00
Peter Fogg
2871ce8dee Fix pep8 violations. 2013-06-03 10:36:46 -04:00
Peter Fogg
457bd30c68 Make sure advanced component creation shows even a single template. 2013-06-03 10:26:52 -04:00
Peter Fogg
55aaa1a8e9 Add lettuce tests for single-click video creation and fix previously failing tests. 2013-06-03 10:20:38 -04:00
JonahStanley
a17c487f16 Merged from Master 2013-06-03 09:46:19 -04:00
JonahStanley
8cc93cb5d8 Merge branch 'master' into jonahstanley/add-more-tests 2013-06-03 09:37:25 -04:00
Peter Fogg
cce65ce9ae Merge branch 'master' of github.com:edx/edx-platform into peter-fogg/single-click-video-creation 2013-06-03 09:15:52 -04:00
Peter Fogg
babe46e6f2 Merge pull request #17 from edx/peter-fogg/no-autoplay-studio 
Peter fogg/no autoplay studio
 2013-06-03 06:07:03 -07:00
Peter Fogg
8c5f9e6e41 Fix merge conflict. 2013-06-03 08:49:52 -04:00
Victor Shnayder
1d8e46f01c Merge pull request #13 from edx/victor/help-button-text 
Change help button text, fixing LMS-319
 2013-06-02 20:47:45 -07:00
Ned Batchelder
4c6e482d39 Merge pull request #24 from edx/ned/remove-test-ike 
Remove test_ike.py, Ike says we don't need it, and it looks like a test.
 2013-06-02 18:45:05 -07:00
Christina Roberts
de743a4812 Merge pull request #39 from edx/fix/marco/studio-latex-compiler 
hides latex compiler in settings tab by making previously specific css s...
 2013-06-02 13:19:32 -07:00
chrisndodge
7735e37585 Merge pull request #8 from edx/valera/fix_videoalpha_studio_integration 
Added videoalpha to advanced components in component.py file.
 2013-06-02 13:04:33 -07:00