Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,591 Commits 1 Branch 0 Tags
18a979bb4d02fd4b5d20f620775fa1aaea69a2ee
Commit Graph

16591 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Palay
18a979bb4d put wiki templates back into Django templating 2013-08-12 16:42:07 -04:00
Adam Palay
13d54c0dd7 fix password reset templates 2013-08-12 15:57:27 -04:00
jkarni
a7568fbf43 Merge pull request #567 from edx/jkarni/fix/descriptorsystemruntime 
Make descriptorsystem inherit from Runtime
 2013-08-12 12:06:42 -07:00
Julian Arni
7fc6057700 Merge branch 'master' into jkarni/fix/descriptorsystemruntime 
Conflicts:
	cms/djangoapps/contentstore/views/preview.py
 2013-08-12 15:04:49 -04:00
Julian Arni
91b23c406a Merge branch 'master' into jkarni/fix/descriptorsystemruntime 2013-08-12 15:00:26 -04:00
David Baumgold
6a3f0c141d Merge pull request #564 from edx/db/xblock-student-view 
XBlock integration for Studio: student view
 2013-08-12 11:55:40 -07:00
Adam
0db8ad28dc Merge pull request #640 from edx/adam/i18n-bug-fixes 
instructor dash fixes
 2013-08-12 11:16:22 -07:00
Will Daly
df38f80506 Merge pull request #638 from edx/will/coffee-too-many-files 
Coffee compile command now executes for just *.coffee items.
 2013-08-12 11:14:23 -07:00
chrisndodge
bb644bb6ae Merge pull request #645 from edx/fix/cdodge/add-tech-support-email-config 
Add new setting to cms project
 2013-08-12 11:10:53 -07:00
Chris Dodge
7fd5a00c2c import default TECH_SUPPORT_EMAIL setting from LMS 2013-08-12 14:07:03 -04:00
Lyla Fischer
e817fb4ca1 Merge pull request #637 from edx/vaxxxa/videoalpha_to_video 
Migration videoalpha module to one main video module
 2013-08-12 10:56:12 -07:00
Carlos Andrés Rocha
c727d43ce6 Merge pull request #617 from edx/rocha/change-console-stream-to-stderr 
Change console logging stream from stdout to stderr
 2013-08-12 10:55:29 -07:00
Chris Dodge
0231e64f36 also define TECH_SUPPORT_EMAIL in cms.envs.common config file 2013-08-12 13:41:05 -04:00
Miles Steele
e6d44f5ae7 Merge pull request #626 from edx/feature/msteele/instrdash 
Enable beta dashboard, add copy, add i18n
 2013-08-12 10:38:26 -07:00
Chris Dodge
0da2fb842f Add new setting to cms project 2013-08-12 13:29:15 -04:00
Miles Steele
43afb9a940 fix i18n 2013-08-12 13:21:46 -04:00
Peter Baratta
bfccfba9d4 Merge pull request #512 from edx/peterb/formula-preview 
Calc module changes: previewing and <formulaequationinput>

To see individual commits, see tag peterb/formula-preview/presquash
 2013-08-12 09:24:29 -07:00
Peter Baratta
69fa1b069d Added user documentation 2013-08-12 11:49:04 -04:00
Peter Baratta
735e3b01a2 Create a new response type for Numerical/Formula 
Named `FormulaEquationInput` (name up for debate)

- Based off ChemEqnIn
- Add FormulaEquationInput in inputtypes.py
- Add a call to a skeleton method for a preview

javascript:

- Queue up some MathJax
- Put some ordering on the AJAX requests: add a parameter when the request was started, when it returns check that it isn't outdated before displaying the preview
- Tests

Note: we moved the `jsinput` tests and DISABLED them, because they were causing the tests to fail.
 2013-08-12 11:48:45 -04:00
Peter Baratta
a1162cbb34 Change calc module 
- Create a method called `parse_algebra`. It takes a string of math and returns with a `pyparsing.ParseResults` object representing it.
- `evaluator` takes this tree and applies the old "parse actions" to it to get the same number as it used to.
- Change calc's API: `evaluator` to use `case_sensitive` rather than `cs`
- Add most of the capability for latex rendering
 2013-08-12 11:40:20 -04:00
Adam Palay
b2b574ffb6 instructor dash fixes 2013-08-12 11:36:26 -04:00
Miles Steele
b1074ff1ac add i18n 2013-08-12 11:25:26 -04:00
Will Daly
d1e0005f30 Merge pull request #622 from edx/will/fix-js-tests-using-number-input 
Failing JavaScript tests in Firefox
 2013-08-12 08:12:12 -07:00
Carlos Andrés Rocha
4f4f0e9a23 Merge pull request #619 from edx/rocha/fix-help-on-manage-dot-py 
Fix manage.py to ouput the help of the django command if requested
 2013-08-12 07:32:40 -07:00
Miles Steele
6cf8643da5 Merge pull request #545 from edx/feature/msteele/fix-sql-index 
Fix mysql indexing validity in migrations
 2013-08-12 06:29:43 -07:00
Will Daly
d947b0ecc8 Coffee compile command now executes for just *.coffee items. 
This resolves an error that would sometimes occur on Mac OS X:
"Error: EMFILE, too many open files"
 2013-08-12 09:26:22 -04:00
Will Daly
4b738d4cc3 Refactored into helper method 2013-08-12 08:55:30 -04:00
lapentab
86741d948e Merge pull request #613 from edx/blapenta/site-packages 
Blapenta/site packages
 2013-08-12 05:49:19 -07:00
chrisndodge
a8646561fd Merge pull request #635 from edx/bugfix/ichuang/cms-user-view-if-bad-course 
Make CMS user view not show ErrorDescriptor courses
 2013-08-12 05:35:06 -07:00
Anton Stupak
74f3595d54 Add acceptance tests for checking rendering. 2013-08-12 14:32:15 +03:00
Peter Fogg
e20acee4c4 Working on Videoalpha test fix. 
Fixed all common and LMS tests.

The tests were failing because XMLDescriptor adds in some attributes
to _model_data, such as `xml_attributes`, that aren't necessary. The
solution is to handle all XML parsing in VideoDescriptor. There's
still one test failing in CMS, which has to do with metadata being
saved. I'm still working out how to update it in such a way that it
doesn't fail, but still tests something meaningful.
 2013-08-12 14:32:15 +03:00
Anton Stupak
a6f6a50792 Disable js unit tests. 2013-08-12 14:32:14 +03:00
Anton Stupak
d846462ce9 Migrate acceptance tests: old Video -> new Video. 2013-08-12 14:32:07 +03:00
Vasyl Nakvasiuk
b33b5c7bd4 Python: videoalpha -> video. 2013-08-12 14:31:48 +03:00
Anton Stupak
dad9f26a99 Make VideoAlpha out of Alpha. 2013-08-12 14:31:48 +03:00
Anton Stupak
e381adbc3e Make js unit tests out of Alpha. 2013-08-12 14:31:48 +03:00
Anton Stupak
8ba94bb2a5 Remove js unit tests. 2013-08-12 14:31:47 +03:00
Vasyl Nakvasiuk
28b0ba5e10 Migrate video tests to videoalpha tests, remove video tests. 2013-08-12 14:31:47 +03:00
ichuang
12ad9c8558 make CMS user view not show ErrorDescriptor courses 2013-08-11 15:27:12 +00:00
chrisndodge
4f321897df Merge pull request #620 from edx/feature/cdodge/convert-to-portable-links-on-import-and-clone 
Feature/cdodge/convert to portable links on import and clone
 2013-08-11 06:20:11 -07:00
Peter Fogg
8b2346fc51 Merge pull request #628 from edx/peter-fogg/fix-unit-delete-jump 
Fix jumping to the top of the page on unit delete.
 2013-08-10 06:48:51 -07:00
Chris Dodge
e23ec4f221 on the new envs configuration file, we need to squelch pylint errors on the from dev import * 2013-08-10 00:29:17 -04:00
Chris Dodge
20b957518c resolve last code violation 2013-08-09 20:53:17 -04:00
Chris Dodge
f170d85547 fix wrapping, but mainly want to kick off another build due to Jenkins problem 2013-08-09 20:46:14 -04:00
Chris Dodge
1c2958e35d address PR feedback 2013-08-09 20:46:14 -04:00
Chris Dodge
c6f277427c add a few debug messages to get localhost debug information. Also partition out the MongoDjangoToolbar configuration into a separate env config. This is because doing imports on large courses grinds localdev to a halt due to all the stack trace generation. 2013-08-09 20:46:14 -04:00
Chris Dodge
b1b8f19c88 add another test. Seems like we never had an explicit test on an import into a new course-id. This fixes that 2013-08-09 20:46:13 -04:00
Chris Dodge
6b0e992d9e change regex names to better reflect what the actually match on 2013-08-09 20:46:13 -04:00
Chris Dodge
d9d8d96e05 also support a link rewriting on course import and clone for the following format /courses/[org]/[course]/[run]/. We just need to substitute in the new course-id. 2013-08-09 20:46:13 -04:00
Chris Dodge
607573fbd9 add test files 2013-08-09 20:46:13 -04:00