Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,320 Commits 1 Branch 0 Tags
2ae3fd0a08214496d33c981b5922cab36cc00a63
Commit Graph

5291 Commits

Author SHA1 Message Date
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
Oleg Marshev
f020d1c584 Show date and time on Schedules and Details in UTC (TNL-85). 2014-10-03 11:17:00 +03:00
cahrens
2286366c90 Remove unused files, add missing spec file. 2014-10-02 15:05:17 -04:00
Don Mitchell
d723425a83 Fix cached definition change detection 
LMS-11485
 2014-10-02 14:22:07 -04:00
David Baumgold
b6ed821978 Merge pull request #5457 from edx/kill-DISABLE_RESET_EMAIL_TEST-flag 
Kill DISABLE_RESET_EMAIL_TEST flag
 2014-10-01 14:16:04 -04:00
Calen Pennington
183e04106a Merge pull request #5392 from cpennington/escape-course-ids-in-html 
Properly escape CourseKeys and UsageKeys in html templates
 2014-10-01 12:32:54 -04:00
David Baumgold
31931827bf Kill DISABLE_RESET_EMAIL_TEST flag 
We're better served by just directly testing if we're in the LMS or not.
 2014-10-01 11:42:41 -04:00
Calen Pennington
77a04daa07 Properly escape CourseKeys and UsageKeys in html templates 
[LMS-11372]
[LMS-11370]
 2014-10-01 10:26:52 -04:00
Andy Armstrong
8627fdef32 Support adding students to a cohort via the instructor dashboard. 
TNL-163
 2014-10-01 09:22:31 -04:00
Anton Stupak
f221f010e9 Merge pull request #4930 from e-kolpakov/master 
Fix for TNL-147
 2014-10-01 14:52:34 +03:00
E. Kolpakov
dcc82e1abe Added default font to a list of available fonts in text editor XModule 
Added acceptance test scenario to test for existense of "Default" font and all tinyMCE built-in fonts
Updated AUTHORS
 2014-10-01 12:52:38 +04:00
Renzo Lucioni
e895e10185 Merge pull request #5427 from edx/renzo/profile-page-preferred-language 
Allow changing of language preference from profile page
 2014-09-30 23:34:52 -04:00
Renzo Lucioni
254a0ce6c8 Allow changing of language preference from profile page 2014-09-30 21:11:02 -04:00
Calen Pennington
87558c2c9c Merge pull request #5212 from cpennington/split/import-export-performance 
Improve performance of split-mongo import/export performance
 2014-09-30 15:44:04 -04:00
Calen Pennington
52beec8878 Switch inheritance in split-mongo over to using InheritingFieldData. 2014-09-29 22:35:40 -04:00
Don Mitchell
dc9654283e Fix unit tests for generated 
course ids.
 2014-09-29 11:25:56 -04:00
Don Mitchell
8fe55c9aee Fix acceptance tests to work w/ split 
11300
 2014-09-29 11:25:55 -04:00
Don Mitchell
4ca5012f3c Use split to test views 2014-09-29 11:25:55 -04:00
zubair-arbi
40f270c945 add couse key verification decorator in common for use in both studio and lms 
PLAT-88
 2014-09-29 13:26:43 +05:00
Mark Hoeber
792c8eaf82 Merge pull request #5304 from edx/markhoeber-doc910 
Updated help link and content of Studio container page
 2014-09-26 08:52:21 -04:00
Ned Batchelder
4d56f62d99 Merge pull request #5199 from edx/ned/remove-jsdraw 
Remove JSDraw
 2014-09-25 23:03:50 -04:00
John Eskew
fcf57a8e0d Merge pull request #5370 from edx/jeskew/wrap_studio_views_in_bulk_ops 
Wrap studio views in bulk operations to minimize mongo calls.
 2014-09-24 20:41:33 -04:00
John Eskew
46cd9b0ad9 Add bulk_operations wrapper around all course-query-intensive Studio views. 2014-09-24 19:23:00 -04:00
Carlos Andrés Rocha
fc04d8f262 Use strings instead of tuples as keys in SessionKeyValueStore 
Some Django packages expect only strings as keys in the user session,
and it is also a recommended practice in the Django manual.
 2014-09-24 15:17:46 -04:00