Jay Zoldak
|
9eb2766943
|
Change test modulestore naming differentiation scheme to uuid
|
2013-02-21 13:07:14 -05:00 |
|
Chris Dodge
|
bc1ee3dbfa
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/serializing-ints-as-empty-strings
|
2013-02-21 12:56:20 -05:00 |
|
Chris Dodge
|
041d28f0e9
|
use better variable names to assert that the expected item was indeed loaded
|
2013-02-21 12:56:17 -05:00 |
|
Chris Dodge
|
fa3402a977
|
template name got changed. Need to reflect that on test.
|
2013-02-21 12:25:10 -05:00 |
|
Chris Dodge
|
bb75a23101
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/serializing-ints-as-empty-strings
|
2013-02-21 11:58:52 -05:00 |
|
David Ormsbee
|
3494d58450
|
Merge pull request #1532 from MITx/feature/ned/clean_up_tests
Make sure temp directories are properly cleaned up so running tests does...
|
2013-02-21 08:52:09 -08:00 |
|
Ned Batchelder
|
c3b571bf9b
|
Make sure temp directories are properly cleaned up so running tests doesn't leave them behind.
|
2013-02-21 11:38:45 -05:00 |
|
Don Mitchell
|
ba7959fc4d
|
Merge pull request #1511 from MITx/feature/cdodge/metadata-inheritence-crawling
Feature/cdodge/metadata inheritence crawling
|
2013-02-21 08:29:54 -08:00 |
|
Chris Dodge
|
a7f6545cbc
|
add unit test
|
2013-02-21 11:22:20 -05:00 |
|
Chris Dodge
|
bd188f92ef
|
put back the inheritable_metadata list into the XModuleDescriptor class. Also extend the metadata_inheritance test case
|
2013-02-20 16:20:39 -05:00 |
|
cahrens
|
c572ba862a
|
Delete unused method.
|
2013-02-20 15:47:07 -05:00 |
|
cahrens
|
d9fb067355
|
Test point for formatting of JSON entry.
|
2013-02-20 15:34:53 -05:00 |
|
Brian Talbot
|
7b60ec380a
|
Merge branch 'master' into feature/cas/manual-policy-merged
|
2013-02-20 14:58:50 -05:00 |
|
Jay Zoldak
|
05f32f4bc9
|
Update tests for the advanced policy settings feature.
Includes adding a method for css_click_at.
|
2013-02-20 14:30:39 -05:00 |
|
cahrens
|
cbc0406df2
|
Merge branch 'feature/cas/manual-policy-merged' of github.com:MITx/mitx into feature/cas/manual-policy-merged
|
2013-02-20 10:57:35 -05:00 |
|
cahrens
|
305f0b2a54
|
Add number of spaces for formatting of JSON.
|
2013-02-20 10:56:49 -05:00 |
|
Jay Zoldak
|
67c2bac68f
|
Pep8fix lettuce test code
|
2013-02-20 09:53:02 -05:00 |
|
Christina Roberts
|
52caae2fee
|
Merge pull request #1515 from MITx/feature/btalbot/studio-pagechrome
Adding in Studio Page headers and actions + help text
|
2013-02-20 06:44:16 -08:00 |
|
Jay Zoldak
|
db6fa9a3aa
|
Pep8fix lettuce test code
|
2013-02-19 16:46:32 -05:00 |
|
cahrens
|
d5903c0e60
|
Make HTML better formatted.
|
2013-02-19 15:14:05 -05:00 |
|
cahrens
|
167d07037d
|
Merged, delete Ace.
|
2013-02-19 14:56:37 -05:00 |
|
Jay Zoldak
|
8c423da6db
|
Updated test to reflect new class name for course titles.
|
2013-02-19 13:50:40 -05:00 |
|
Jay Zoldak
|
301d58d648
|
Update lettuce test with new button name for add new section.
|
2013-02-19 13:31:11 -05:00 |
|
cahrens
|
f91060d197
|
Merge branch 'master' into feature/cas/manual-policy
Conflicts:
cms/djangoapps/contentstore/features/common.py
cms/djangoapps/contentstore/features/section.py
cms/djangoapps/contentstore/tests/test_course_settings.py
cms/djangoapps/contentstore/views.py
cms/static/js/models/settings/course_grading_policy.js
cms/static/js/views/settings/main_settings_view.js
cms/static/sass/_settings.scss
cms/templates/settings.html
cms/urls.py
|
2013-02-19 13:27:35 -05:00 |
|
Brian Talbot
|
585dff521a
|
Merge branch 'master' into feature/btalbot/studio-pagechrome
|
2013-02-19 12:27:49 -05:00 |
|
cahrens
|
596de8ab2c
|
Hook up "View Live" buttons and get "New Static Tab" working again.
|
2013-02-19 11:34:41 -05:00 |
|
Chris Dodge
|
1a2e794126
|
add test of inheritance on xmodule insert
|
2013-02-19 09:51:07 -05:00 |
|
Don Mitchell
|
cfa13922f5
|
Change url for login from login to signin.
|
2013-02-15 17:30:24 -05:00 |
|
Chris Dodge
|
66c91b704a
|
init work. Export the 'draft' store under a distinct folder in the export. TBD: do the import from that directory as well.
|
2013-02-15 17:16:05 -05:00 |
|
Calen Pennington
|
2bc3000156
|
Fix tests
|
2013-02-15 15:44:11 -05:00 |
|
Brian Talbot
|
93949ab342
|
resolving local merge problem
|
2013-02-15 14:12:46 -05:00 |
|
Brian Talbot
|
a5e2b5c53a
|
resolving merge conflict and missing Sass mixin
|
2013-02-15 14:10:52 -05:00 |
|
Jay Zoldak
|
34a4b35e66
|
Fix lettuce acceptance tests to reflect the new soft landing page changes.
|
2013-02-15 14:07:46 -05:00 |
|
Brian Talbot
|
6c95460761
|
studio - resolving merge from master
|
2013-02-15 09:15:06 -05:00 |
|
cahrens
|
38632c52c3
|
Beginnings of Selenium test.
|
2013-02-14 17:36:37 -05:00 |
|
Don Mitchell
|
bfcc0559a7
|
Merge pull request #1503 from MITx/fix/cdodge/export-policy-json
add exporting of policy.json
|
2013-02-14 12:47:37 -08:00 |
|
Chris Dodge
|
ea068d4aa8
|
add exporting of policy.json
|
2013-02-14 14:19:38 -05:00 |
|
Calen Pennington
|
793bbfd351
|
Set up dev environment for testing xml vs mongo vs split_mongo modulestores
|
2013-02-13 14:04:21 -05:00 |
|
Don Mitchell
|
6e5968e2cd
|
html changed; so, removed mostly meaningless comparison and fixed one.
|
2013-02-13 11:53:26 -05:00 |
|
Don Mitchell
|
6f3a954d7b
|
howitworks is default home page if not logged in. Otherwise course
index. NOTE: didn't fix old wrong behavior of going to index if not
logged in and tried to navigate to a specific page. Will work on that
next.
|
2013-02-13 09:30:54 -05:00 |
|
Christina Roberts
|
0b91c1c346
|
Merge pull request #1487 from MITx/fix/cdodge/cleanup-deleted-templates
clean up templates that were removed from disk - we need to remove from ...
|
2013-02-13 06:29:35 -08:00 |
|
Chris Dodge
|
fbe3d29f19
|
added tests
|
2013-02-13 09:25:09 -05:00 |
|
Carlos Andrés Rocha
|
dff0c10b7a
|
Merge pull request #1493 from MITx/bug/dhm/misc
Fix broken test and don't pass time units as strings but as ints.
|
2013-02-12 15:14:37 -08:00 |
|
Don Mitchell
|
c904174bb7
|
Fix broken test and don't pass time units as strings but as ints.
|
2013-02-12 17:30:57 -05:00 |
|
Don Mitchell
|
d569c559ca
|
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
Conflicts:
cms/djangoapps/contentstore/views.py
cms/static/js/views/settings/main_settings_view.js
cms/templates/index.html
cms/templates/settings.html
|
2013-02-12 16:57:00 -05:00 |
|
chrisndodge
|
af364166fe
|
Merge pull request #1491 from MITx/bug/dhm/misc
lms required grace period fields to be in specific order
|
2013-02-12 12:42:53 -08:00 |
|
Don Mitchell
|
8e213fb0d7
|
lms required grace period fields to be in specific order
|
2013-02-12 13:48:54 -05:00 |
|
Ned Batchelder
|
aa2d0ecaf2
|
We no longer need override_settings, Django has a better one.
|
2013-02-11 17:06:35 -05:00 |
|
Don Mitchell
|
46a7f7427a
|
Merge pull request #1479 from MITx/fix/cdodge/export-include-grading-policy
add exporting of grading_policy.json
|
2013-02-11 12:53:36 -08:00 |
|
Chris Dodge
|
33009eba7d
|
add exporting of grading_policy.json
|
2013-02-11 14:30:26 -05:00 |
|