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

16553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Chris Dodge
e2358af6a9 add ability to rewrite links on the old /courses/<org>/<course>/<run>/jump_to/i4x://<org>/<course> .. intracourseware linking to the new portable /jump_to_id/<id> format 2013-08-09 20:46:13 -04:00
Chris Dodge
25d6de243e add portable link rewriting on clone. Added tests. 2013-08-09 20:46:12 -04:00
Chris Dodge
36fda35040 do portable link rewriting on import and add test to confirm it 2013-08-09 20:46:12 -04:00
caesar2164
5b5c8151d0 Merge pull request #618 from edx/giulio/secure-embeds 
changing http:// to // on intro video urls
 2013-08-09 14:19:21 -07:00
Giulio Gratta
464141c72a changing http:// to // on intro video urls to prevent browsers from blocking video embeds 2013-08-09 14:13:41 -07:00
Sarina Canelake
6b16ef0adf Merge pull request #631 from edx/sarina/upgrade-diff-cover 
Upgrade diff-cover to newest version
 2013-08-09 13:59:56 -07:00
Jonah Stanley
f4799f983e Merge pull request #630 from edx/jonahstanley/fix-courseteam-tests 
Jonahstanley/fix courseteam tests
 2013-08-09 13:09:17 -07:00
Sarina Canelake
d6e06e441f Upgrade diff-cover to newest version 2013-08-09 15:55:43 -04:00
JonahStanley
0595459c01 Revert back to old way of logging someone else in 2013-08-09 15:27:46 -04:00
Peter Fogg
cde8ee50d7 Fix jumping to the top of the page on unit delete. 2013-08-09 15:18:08 -04:00
Miles Steele
e9aca13636 enable beta dashboard 2013-08-09 14:22:56 -04:00
Miles Steele
f6fc1aeed9 hide empty management list selector, add explanation text 2013-08-09 14:22:56 -04:00
Miles Steele
58c6b9bb61 add privilege copy 2013-08-09 14:22:55 -04:00
Miles Steele
53bda391ae Merge pull request #625 from edx/fix/msteele/instr-i18n 
Fix enroll-multiple button
 2013-08-09 11:05:32 -07:00
JonahStanley
8feaa0ffa4 Added in a wait upon logging in 2013-08-09 13:57:22 -04:00
Miles Steele
8f8d70aeae fix enroll multiple button, fix module_error report 2013-08-09 13:45:27 -04:00
Feanil Patel
822f3a7865 Merge pull request #607 from edx/feanil/master_with_release 
Feanil/master with release
 2013-08-09 10:44:44 -07:00
Adam
abd17a2472 Merge pull request #623 from edx/adam/unicode-encode-error 
make template string unicode
 2013-08-09 10:35:32 -07:00
Miles Steele
25d45b8578 Merge pull request #574 from edx/feature/msteele/instrdash 
Add cronjob analytics to instructor dashbaord
 2013-08-09 10:26:50 -07:00
Adam Palay
893f05976d make template string unicode 2013-08-09 12:25:14 -04:00
Will Daly
9769f364e1 Updated tests to weaken "number" input field requirement, which 
isn't supported in Firefox.
 2013-08-09 12:10:53 -04:00
Sarina Canelake
0f9d7230c3 Merge pull request #614 from edx/sarina/update-xblock-version 
Update the XBlock version to fix save bugs
 2013-08-09 07:51:28 -07:00
chrisndodge
09a83dcd1e Merge pull request #589 from edx/fix/cdodge/better-export-error-messaging 
give some debug message regarding why export has failed
 2013-08-09 07:21:20 -07:00
Brian Talbot
5b4c15a57d Studio: revises export prompt control copy 2013-08-09 10:01:23 -04:00
Valera Rozuvan
0b58c22b97 Merge pull request #593 from edx/valera/captions_keyboard_access_2 
Valera/captions keyboard access 2
 2013-08-09 00:49:28 -07:00