John Jarvis
|
64f0855055
|
Adding removed code from master rebase
|
2013-01-23 18:41:17 -05:00 |
|
John Jarvis
|
8a0cc6e610
|
Revert "Fixing namespace issue for "login""
This reverts commit dcc53c2bcd.
|
2013-01-23 18:34:53 -05:00 |
|
John Jarvis
|
dcc53c2bcd
|
Fixing namespace issue for "login"
* renaming login to login_user
* renaming register to register_user
|
2013-01-23 18:22:14 -05:00 |
|
John Jarvis
|
9af7c6cc5d
|
adding login views
|
2013-01-23 18:22:12 -05:00 |
|
Ned Batchelder
|
037fe5f722
|
When checking types to convert data, don't forget about longs. 32-bit Pythons make longs from values that are ints on 64-bit Pythons.
|
2013-01-23 17:11:02 -05:00 |
|
Diana Huang
|
cc67017d4c
|
Merge branch 'master' into diana/open-ended-ui-updates
|
2013-01-23 16:45:40 -05:00 |
|
cahrens
|
4a79643fde
|
Make code inline instead of block.
|
2013-01-23 16:43:49 -05:00 |
|
Victor Shnayder
|
abcc5c0204
|
Merge pull request #1342 from MITx/feature/cdodge/add-standard-problem-metadata
update templates to include attemps and weight values. Also update capa_...
|
2013-01-23 13:40:46 -08:00 |
|
Chris Dodge
|
2856971b45
|
update templates to include attemps and weight values. Also update capa_module.py to accept empty strings ('') to mean 'default value'
|
2013-01-23 16:36:16 -05:00 |
|
chrisndodge
|
fe8e25e72d
|
Merge pull request #1341 from MITx/feature/christina/tiny-mce
Toggling of code should mark editor as dirty.
|
2013-01-23 13:25:01 -08:00 |
|
cahrens
|
2969a9e48d
|
Toggling of code should mark editor as dirty.
|
2013-01-23 16:19:17 -05:00 |
|
Chris Dodge
|
9d5ac308b1
|
remove flag to hide progress tab
|
2013-01-23 15:11:41 -05:00 |
|
Calen Pennington
|
27b57bb48b
|
Don't update settings based on data from content for discussion modules during init
|
2013-01-23 14:51:07 -05:00 |
|
Calen Pennington
|
993c24b72b
|
WIP: Model data caching work
|
2013-01-23 14:51:07 -05:00 |
|
Calen Pennington
|
c44898b1de
|
Remove random printing during XModuleDescriptor equality check
|
2013-01-23 14:47:05 -05:00 |
|
Calen Pennington
|
2eca8bd0e9
|
Set default video position to 0, but don't overwrite it during __init__
|
2013-01-23 14:47:05 -05:00 |
|
Calen Pennington
|
e5a6509bb0
|
Add a first_time_user attribute to CourseModule so that we can check for that explicitly, rather than looking for an implicitly created StudentModule
|
2013-01-23 14:47:05 -05:00 |
|
Calen Pennington
|
ce76b64bae
|
Handle problem resets in such a way that the LoncapaProblem generates the new random seed, and the CapaModule saves that seed
|
2013-01-23 14:47:05 -05:00 |
|
Calen Pennington
|
9d66169d06
|
Don't set a seed to None that's already None
|
2013-01-23 14:47:05 -05:00 |
|
Calen Pennington
|
8e5373f993
|
Make Randomization return un-adjusted values as a passthrough
|
2013-01-23 14:47:05 -05:00 |
|
Christina Roberts
|
cd78b27b50
|
Merge pull request #1334 from MITx/bug/btalbot/cms-problemmenu
studio - resolved bug with .header CSS inheritance and problem editor
|
2013-01-23 11:40:24 -08:00 |
|
Brian Talbot
|
5fee7eeaec
|
studio - further resolved bug with .header CSS inheritance and problem editor menu UI
|
2013-01-23 12:58:20 -05:00 |
|
Brian Talbot
|
2ca267dc52
|
studio - resolved bug with .header CSS inheritance and problem editor menu UI
|
2013-01-23 12:50:10 -05:00 |
|
cahrens
|
a1eeb56839
|
Import requireJS.
|
2013-01-23 12:30:06 -05:00 |
|
Don Mitchell
|
b0bbb34644
|
Merge pull request #1331 from MITx/feature/christina/tiny-mce
Feature/christina/tiny mce
|
2013-01-23 09:14:42 -08:00 |
|
jmvt
|
549a5e9fe9
|
Merge remote-tracking branch 'origin/master' into jmpm-analytics
|
2013-01-23 12:02:48 -05:00 |
|
Ned Batchelder
|
376575dedd
|
Make system.xblock_model_data more explicit to fix the problem where error descriptors can't get any data because the schema and the data don't match.
|
2013-01-23 11:34:24 -05:00 |
|
cahrens
|
2609ba4093
|
Delete unused icon, reorder dropdown.
|
2013-01-23 11:02:16 -05:00 |
|
Don Mitchell
|
966db4fbaf
|
Merge pull request #1329 from MITx/fix/cdodge/draft-store-get-items
add optional course_id parameter to DraftMongoStore.get_items()
|
2013-01-23 07:39:36 -08:00 |
|
Diana Huang
|
5ca1586e0c
|
Merge branch 'feature/diana/rubric-input' into diana/open-ended-ui-updates
|
2013-01-23 08:57:47 -05:00 |
|
Diana Huang
|
71e4541c69
|
Merge branch 'master' into feature/diana/rubric-input
|
2013-01-23 08:56:55 -05:00 |
|
Brian Wilson
|
9d28c37724
|
add more test coverage for openid provider.
|
2013-01-23 04:23:30 -05:00 |
|
Brian Wilson
|
ba62a657bf
|
Merge remote-tracking branch 'origin/master' into bugfix/brian/openid_provider_post
|
2013-01-22 23:50:38 -05:00 |
|
Brian Talbot
|
5e7726079e
|
studio html editor - styled <pre> and <code> elements, revised code tinyMCE icon
|
2013-01-22 23:32:51 -05:00 |
|
Don Mitchell
|
1f261e6556
|
Removed unused and stylistically incorrect class defs
|
2013-01-22 17:34:45 -05:00 |
|
Brian Talbot
|
023dadd074
|
studio - resolved base variable missing issue on lms side
|
2013-01-22 16:31:42 -05:00 |
|
Brian Talbot
|
fd3ae2c478
|
studio html editor - matched up styles for <pre> elements
|
2013-01-22 16:16:30 -05:00 |
|
cahrens
|
731fb209de
|
Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce
Conflicts:
cms/static/css/tiny-mce.css
|
2013-01-22 16:15:27 -05:00 |
|
Brian Talbot
|
aec7692d27
|
studio html editor - revised header styles for editing/displaying HTML components (including separating studio editing chrome from style rules)
|
2013-01-22 15:51:12 -05:00 |
|
cahrens
|
13945994f0
|
change class on right element!
|
2013-01-22 15:47:09 -05:00 |
|
cahrens
|
b554eb5afe
|
Cleanup of format dropdown, toolbar buttons.
|
2013-01-22 15:28:47 -05:00 |
|
Ned Batchelder
|
532285e558
|
Only need one of these lines.
|
2013-01-22 15:22:30 -05:00 |
|
Calen Pennington
|
75b0a8eed6
|
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
|
2013-01-22 14:47:52 -05:00 |
|
Diana Huang
|
24f23176af
|
Add the ability to set up custom text for short form and
and long form results.
|
2013-01-22 13:17:37 -05:00 |
|
Chris Dodge
|
9520290018
|
add optional course_id parameter to DraftMongoStore.get_items()
|
2013-01-22 11:55:36 -05:00 |
|
Don Mitchell
|
edda80d485
|
New style base python classes and basestring type.
|
2013-01-22 11:30:24 -05:00 |
|
Diana Huang
|
9a53c37530
|
Use something more visually easy to use for self-assessment.
|
2013-01-22 11:25:12 -05:00 |
|
Brian Wilson
|
9653631e9a
|
Add initial openid_provider tests (covers xrds and authentication requests)
|
2013-01-22 11:15:30 -05:00 |
|
Diana Huang
|
a34a9dd038
|
Merge branch 'master' into diana/open-ended-ui-updates
|
2013-01-22 08:40:40 -05:00 |
|
Diana Huang
|
e7bc32fd4d
|
Merge branch 'master' into feature/diana/rubric-input
|
2013-01-22 08:38:17 -05:00 |
|