Commit Graph

5314 Commits

Author SHA1 Message Date
Sarina Canelake
3d1c54fefa Merge pull request #5595 from Stanford-Online/caijim/resetbutton
Support and tests for adding a reset button to units
2014-10-24 11:49:24 -04:00
stephensanchez
61436ea195 Merge branch 'release' 2014-10-23 19:41:31 +00:00
Jim
6d19a0c87c Support and tests for adding a reset button to units
Users may want to start anew when answering a question. This commit decouples reset from randomization while still preserving backward compatibility. Users can clear their input.
Instructors can set course-wide and problem-specific settings for reset button display.
2014-10-23 12:14:27 -07:00
Anton Stupak
b12aa0b1b6 Merge pull request #5518 from edx/anton/requirejs-optimizer
Add RequireJS Optimizer.
2014-10-23 15:29:42 +03:00
Don Mitchell
00ca7cbde5 Merge pull request #5649 from edx/dhm/update_ok
Update opaque_keys to new release
2014-10-22 09:42:29 -04:00
Don Mitchell
2ac069a6ae Merge pull request #5653 from edx/dhm/PLAT-189
Add command line command to create course in either split or mongo
2014-10-22 09:41:55 -04:00
Don Mitchell
0d36dd7264 Merge pull request #5646 from edx/dhm/migrate_bug
Fix command line migrator
2014-10-21 16:55:59 -04:00
Don Mitchell
a4d13dc42c Add command line command to create course in either split or mongo
PLAT-189
2014-10-21 16:34:36 -04:00
Ben Patterson
bf0378f39f Merge pull request #5669 from edx/benp/solano2-flaky-couse-export
Add wait to fix flaky tests.
2014-10-21 15:31:01 -04:00
Ben Patterson
f3facddee6 Add wait to fix flaky tests. 2014-10-21 14:21:42 -04:00
Don Mitchell
f89a6944de Re-enable the unit tests and fix 2014-10-21 13:14:21 -04:00
Don Mitchell
98f962274c Update opaque_keys to new release 2014-10-21 09:30:33 -04:00
Oleg Marshev
f5294358a6 Do not deprecate giturl. 2014-10-21 13:21:38 +03:00
Brian Talbot
d238fa1477 Studio: resolving a display issue for longer usernames in Studio's navigation 2014-10-20 16:55:14 -04:00
Jesse Zoldak
1d7c8d39b2 Update js-test config with new sources 2014-10-20 15:23:34 -04:00
Don Mitchell
4fc8ed8e7a Fix command line migrator 2014-10-20 14:34:33 -04:00
polesye
83fbdc2ac4 TNL-481: Add RequireJS Optimizer. 2014-10-20 17:33:21 +03:00
Frances Botsford
c92f52e0bd cleanup and response to PR review 2014-10-17 13:51:43 -04:00
Omar Al-Ithawi
d8bf0ef5a5 Elegant rtl/ltr css switch, LMS RTL fixes, language aware @cache_if_anonymous 2014-10-17 13:51:42 -04:00
Frances Botsford
ce3cb27864 switching RTL on the fly - added bi-app for sass compiling 2014-10-17 13:51:42 -04:00
Frances Botsford
e255ac1f29 Initial pass at LMS and Studio RTL 2014-10-17 13:51:42 -04:00
Jesse Zoldak
f0b7850de3 Merge pull request #5609 from edx/zoldak/remove-tmp-references
Remove references to /tmp in tests
2014-10-17 12:12:53 -04:00
Jesse Zoldak
24f90307f7 Remove references to /tmp in tests
Including:

* Change path for mongo_metadata_inheritance to use unique temp dir
* Update SASS_CACHE_PATH with thread-safe temp dir
* Remove hard coded directory reference for grades download tests
* Remove hard coded directory reference for direct mongo test
2014-10-17 10:00:12 -04:00
cahrens
d3012af733 Do not save an xblock after rendering the Studio view.
TNL-399

Content and settings are no longer saved when Studio view is rendered.
2014-10-17 09:29:32 -04:00
Ben Patterson
5703adb722 Merge branch 'release'
Includes rc/2014-10-14
2014-10-16 20:11:55 -04:00
David Baumgold
eba03512d5 Replace course status message 2014-10-15 11:35:56 -04:00
David Baumgold
0f07bad3ed Some strings were missing i18n calls 2014-10-15 11:35:56 -04:00
Brian Talbot
0a633eaf09 Studio: resolving post-course rerun outline UI alert icon display issue
UX-1054
2014-10-14 14:09:15 -04:00
Don Mitchell
7e52ba872e Merge pull request #5535 from edx/dhm/unit_perf
Performance enhancements for unit tests
2014-10-14 09:37:08 -04:00
Don Mitchell
f3aaa4e68b Merge pull request #5558 from edx/dhm/bug_index_count
Dont' need error check call in old mongo on this test
2014-10-14 09:36:06 -04:00
Usman Khalid
32c6dad526 Moved imports to manage.py and wsgi.py. 2014-10-14 18:27:31 +05:00
Ben Patterson
3ef0653711 pylint cleanup. 2014-10-11 12:51:20 -04:00
Don Mitchell
1ce2c2cda7 Dont' need error check call in old mongo on this test 2014-10-10 16:19:24 -04:00
Don Mitchell
90723d9191 Make unit tests work on older mongo versions 2014-10-09 15:14:37 -04:00
Don Mitchell
01205cdee2 tz aware 2014-10-09 11:55:14 -04:00
Don Mitchell
a63d58cff5 Remove unused credentials from mongo init
was breaking pymongo 2.7
2014-10-09 11:55:14 -04:00
Don Mitchell
5c00ce674d Test multiple threads linear growth 2014-10-09 11:55:14 -04:00
Don Mitchell
b7b5400c3e Upgrade pymongo
LMS-11437
2014-10-09 11:55:14 -04:00
Don Mitchell
3c42e8c725 Performance enhancements for unit tests
in test_contentstore, don't load the xml course if not necessary
2014-10-09 11:47:56 -04:00
David Baumgold
fc5148438d Merge pull request #4730 from edx-solutions/secure-cookies
secure-cookies: Allow to use secure HTTPS cookies (Django setting)
2014-10-09 10:24:34 -04:00
Calen Pennington
f47a5e1b68 Merge pull request #5498 from edx/jeskew/split_fix_auto_auth
Optimize LMS views for Split courses.
2014-10-07 16:02:31 -04:00
John Eskew
5e3e366147 Remove unused jQuery code. - LMS-11481 2014-10-07 15:02:18 -04:00
Don Mitchell
eb33f0e0eb Cons up new dict to not hurt cached value 2014-10-07 13:48:27 -04:00
Jesse Zoldak
f34b57ad45 Merge pull request #5485 from edx/zoldak/disable-flaky-js-tests
Disable flaky JS FileUploader SystemFeedback and NotificationView tests
2014-10-07 10:29:23 -04:00
Don Mitchell
4f795f8270 Fix hardcoded course urls 2014-10-03 10:56:00 -04:00
John Eskew
d4927de0f7 Remove unneeded import 2014-10-03 10:55:59 -04:00
Don Mitchell
8e67549484 Fix cms hardcoded keys 2014-10-03 10:55:59 -04:00
John Eskew
fd6c9bed28 Fix course export/updates and upload CMS acceptance tests. 2014-10-03 10:55:59 -04:00
Jesse Zoldak
9a8753d41e Disable flaky JS FileUploader SystemFeedback and NotificationView tests
TNL-559
2014-10-03 10:50:20 -04:00
Don Mitchell
785a3c823d Merge pull request #5469 from edx/split/content_update
Fix cached definition change detection
2014-10-03 09:16:01 -04:00