Brian Talbot
|
eaeae03315
|
drupal integration - further sass refinment and hiding example error states
|
2013-01-23 18:22:12 -05:00 |
|
Brian Talbot
|
009ac06d4d
|
drupal integration - added unified account-centric Sass, which holds registration/login styling
|
2013-01-23 18:22:12 -05:00 |
|
Brian Talbot
|
7c7d0da5b4
|
drupal integration - styled page layout, form fields and states, added in status message areas/standards and revised Sass
|
2013-01-23 18:22:12 -05:00 |
|
Brian Talbot
|
6bff41708d
|
cleaning up LMS Sass variables a bit
|
2013-01-23 18:22:12 -05:00 |
|
Brian Talbot
|
1db87e0533
|
drupal integration - added sass files to architecture and plumbed HTML for login and register views
|
2013-01-23 18:22:12 -05:00 |
|
Brian Talbot
|
2c604bc473
|
changing url name to signin
|
2013-01-23 18:22:12 -05:00 |
|
John Jarvis
|
9af7c6cc5d
|
adding login views
|
2013-01-23 18:22:12 -05:00 |
|
Brian Talbot
|
ed39ca2303
|
initial branch creation for reg/login revisions with drupal
|
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 |
|
Kevin Chugh
|
1bd9366e40
|
Merge remote-tracking branch 'origin/master' into feature/kevin/groups
|
2013-01-23 16:26:06 -05:00 |
|
Kevin Chugh
|
59b3dc61a2
|
lms producing grouped content
|
2013-01-23 16:25:26 -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 |
|
chrisndodge
|
548f3de508
|
Merge pull request #1340 from MITx/fix/zoldak/fix_jenkins
Do not run the lms jasmine tests on jenkins for now, until we fix them.
|
2013-01-23 13:05:50 -08:00 |
|
Jay Zoldak
|
29c4e6c066
|
Do not run the lms jasmine tests on jenkins for now, until we fix them.
|
2013-01-23 16:03:25 -05:00 |
|
Christina Roberts
|
2ed5fdf76b
|
Merge pull request #1338 from MITx/fix/cdodge/remove-hide-progress-tab
Fix/cdodge/remove hide progress tab
|
2013-01-23 12:20:54 -08:00 |
|
chrisndodge
|
247199d699
|
Merge pull request #1337 from MITx/feature/cale/fix-staff-debug-link
Feature/cale/fix staff debug link
|
2013-01-23 12:17:17 -08:00 |
|
Chris Dodge
|
9c3e727889
|
add unit test to assert that the flag is not set on course metadata
|
2013-01-23 15:14:36 -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
|
507d2021cd
|
Remove unused reference to StudentModuleCache
|
2013-01-23 14:47:06 -05:00 |
|
Calen Pennington
|
abb21ab111
|
staff_problem_info.html only renders for staff, so don't check for staff access
|
2013-01-23 14:47:06 -05:00 |
|
Calen Pennington
|
4779043a5f
|
Add message during 404 for debugging
|
2013-01-23 14:47:05 -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 |
|
Calen Pennington
|
6e7afb968d
|
Move xqueue handler to new module format, and continue to distinguish grades set by xqueue from those set by ajax in stats
|
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 |
|
Calen Pennington
|
ae2a8e0c58
|
Whitespace cleanup
|
2013-01-23 14:37:42 -05:00 |
|
Calen Pennington
|
6c181470c6
|
staff_problem_info.html is only put on the page for staff, so we don't need to check staff_access inside it
|
2013-01-23 14:37:36 -05:00 |
|
Don Mitchell
|
4bdabb38e4
|
Oops, double edit backed out.
|
2013-01-23 14:17:23 -05:00 |
|
Don Mitchell
|
3e048d7072
|
Removed old function
|
2013-01-23 14:15:09 -05:00 |
|
Don Mitchell
|
2db0401273
|
Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag
Conflicts:
cms/envs/common.py
|
2013-01-23 14:13:17 -05:00 |
|
Brian Talbot
|
25df02fedd
|
studio - syncing cheatsheet language with new class name for heading 1 again
|
2013-01-23 13:04:16 -05:00 |
|
Brian Talbot
|
0e061ca726
|
studio - syncing cheatsheet language with new class name for heading 1
|
2013-01-23 13:02:33 -05:00 |
|
Don Mitchell
|
7cca46e691
|
Requirejs doesn't belong here
|
2013-01-23 13:00:01 -05: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 |
|
Don Mitchell
|
6a4c6ad4d8
|
Merge pull request #1333 from MITx/feature/christina/misc
Import requireJS.
|
2013-01-23 09:35:50 -08: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 |
|
Don Mitchell
|
4d0d46462c
|
Fixed the y axis drop problem by requiring it to be within the x bounds.
|
2013-01-23 12:12:40 -05:00 |
|