Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,062 Commits 1 Branch 0 Tags
8d4ee3b05ee632fa8a0b032f941ee8bf198f5120
Commit Graph

2693 Commits

Author SHA1 Message Date
Calen Pennington
6221baf3e5 Use TEST_ROOT log directory when running jasmine tests 2012-10-30 15:58:59 -04:00
Calen Pennington
cd9fbaeb02 Add timeout so that jasmine tests eventually fail if the server doesn't start 2012-10-30 15:51:21 -04:00
Calen Pennington
e8be6b3111 Get jasmine tests running on cms 2012-10-30 11:33:21 -04:00
Calen Pennington
6d5a1264b9 Move jasmine tests to their own environment 2012-10-30 10:58:38 -04:00
Calen Pennington
684b98505d Make rake commands to run jasmine tests in browser and via phantomjs 2012-10-30 10:41:02 -04:00
Calen Pennington
f19ec64659 Point Studio forgot password at corresponding lms forgot password. There is no place for a reset password link in Studio at the moment 2012-10-25 10:47:41 -04:00
Calen Pennington
2802302162 Make LMS access depend on which course run the access is occurring in, so that permissions can be based on the course run, rather than the whole course 2012-10-24 11:51:25 -04:00
Calen Pennington
dab77e7d79 Switch to using staff group names that are only specified by org/course, rather than the full course_id 2012-10-23 13:40:50 -04:00
Calen Pennington
cac8e3453c Remove more remnants of askbot 2012-10-23 13:40:50 -04:00
Calen Pennington
ef1ba6d9f7 Remove leftover merge garbage 2012-10-23 13:40:34 -04:00
Calen Pennington
b52ed48221 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/xmodule/js/src/html/display.coffee
	lms/envs/common.py
 2012-10-23 13:38:11 -04:00
Victor Shnayder
f50519ae48 Merge pull request #906 from MITx/victor/test-speedup 
Victor/test speedup
 2012-10-22 10:45:23 -07:00
Carlos Andrés Rocha
3784c3ce18 Add fix for users with multiple licenses 2012-10-22 10:27:17 -04:00
Carlos Andrés Rocha
f890c1dccb Use test database in licenses test instead of 6.002x 2012-10-19 17:55:55 -04:00
David Ormsbee
2e03a4846c Merge pull request #935 from MITx/feature/rocha/cengage-press-release 
Add Cengage book press release
 2012-10-18 11:55:02 -07:00
Carlos Andrés Rocha
2f7733ede0 Add Cengage book press release 2012-10-18 14:45:42 -04:00
David Ormsbee
ea8b9577ce Email wording changes based on Sarina's review 2012-10-18 14:28:15 -04:00
David Ormsbee
491f10d1bf Merge branch 'master' into feature/dave/email_bugfixes 2012-10-18 12:23:09 -04:00
David Ormsbee
dbfa7bf03a Change email change success notice to say email instead of name 2012-10-18 12:20:52 -04:00
Chris Dodge
554f179957 tie in 'forgot password' workflow in CAS LMS 2012-10-16 16:18:21 -04:00
Carlos Andrés Rocha
4cadbcc556 Merge pull request #920 from MITx/feature/rocha/ut-press-release 
Removed obsolete information from site faq
 2012-10-16 10:03:05 -07:00
Carlos Andrés Rocha
b479c85310 Change order of X Universities in the front page 2012-10-16 13:02:13 -04:00
Carlos Andrés Rocha
e7c62b0fc6 Add migrations to license django application 2012-10-16 11:57:38 -04:00
Carlos Andrés Rocha
a8cedf8ab9 Update lms/djangoapps/licenses/views.py 
Remove annoying print statements
 2012-10-15 21:04:10 -03:00
Carlos Andrés Rocha
e9ec63e4b6 Add ajax endpoint to retrieve and assign course software licenses 2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
3808ff85a8 Added django command to generate random serial numbers. 2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
9cf8c02dc6 Added import_serial_numbers command test. 2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
516c41f342 Added html view of serial numbers. Refactored code. 2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
b2de8199b7 Added licenses view helper functions. 2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
ed88708d71 Renamed models and commands for importing serial numbers. 2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
24d5c9162c Created Django App with commands to import software license numbers per class. 2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
1efb9711c3 Removed obsolete information from site faq 2012-10-15 14:51:16 -04:00
Carlos Andrés Rocha
b121e620f8 Make small corrections to UT pages and announcement 2012-10-15 11:54:23 -04:00
Carlos Andrés Rocha
b13412d3b2 Make corrections of UT announcement 2012-10-15 11:12:35 -04:00
Carlos Andrés Rocha
40dd6fa105 Add missing text to FAQ 2012-10-15 07:16:13 -04:00
Carlos Andrés Rocha
516daa4710 Converted FAQ template to unix line endings 2012-10-15 06:58:39 -04:00
Carlos Andrés Rocha
c5a148639d Add announcement of UT joining edx and related changes 2012-10-15 06:57:50 -04:00
Victor Shnayder
4bf9323eed More test speedups: 
- Add tasks to test lib without coverage
- Add a coverage flag to test.py (set to True, for manual tweaking for now)
 2012-10-15 02:23:00 -04:00
Victor Shnayder
3f3df3fdb4 remove no-longer-used test dbs 2012-10-15 01:48:46 -04:00
Victor Shnayder
bc96203807 Use a faster hashing algorithm for testing 
http://slacy.com/blog/2012/04/make-your-tests-faster-in-django-1-4/

rake fasttest_lms goes from 48 to 26 seconds.
 2012-10-15 01:34:45 -04:00
Chris Dodge
a47b2be8df set position=0 when position=None. Discuss with Dave O. 2012-10-14 21:31:45 -04:00
Chris Dodge
4ac1a74117 when calling jump_to when location=<id-of-sequential> then Position is being computed as None. The redirect then yields a 404. Force Position to be 0 when Position=None 2012-10-14 21:29:00 -04:00
arjun810
b2afa82c8e Merge pull request #886 from MITx/hotfix/arjun/fix_integer_disc_ids_2 
more removal of data("id") in favor of attr("data-id")
 2012-10-12 14:59:20 -07:00
Arjun Singh
d7b237ce0a more removal of data("id") in favor of attr("data-id") 2012-10-12 14:47:44 -07:00
Carlos Andrés Rocha
f1120a1139 Removed unused import 2012-10-12 17:39:05 -04:00
Carlos Andrés Rocha
e8cd125701 Fix to read utf-8 enconded html files for custom course tabs 2012-10-12 17:36:19 -04:00
ichuang
fd5c7c622c Merge pull request #862 from MITx/feature/victor/capa-ajax 
Feature/victor/capa ajax

I'm happy with all the changes to inputtypes, modulo the minor comments.
I didn't read chemcalc.py closely, but the tests look good.
 2012-10-12 13:51:10 -07:00
David Ormsbee
f5f1e858d5 Merge pull request #874 from MITx/hotfix/arjun/fix_integer_disc_ids 
Hotfix/arjun/fix integer disc ids
 2012-10-12 11:38:28 -07:00
David Ormsbee
01ac01b62c Re-enable change name, and fix up change email styles 2012-10-12 14:31:20 -04:00
Victor Shnayder
19d3cb3870 Add a chemicalequationinput with live preview 
- architecturally slightly questionable: the preview ajax calls goes to an LMS view instead of an input type specific one.  This needs to be fixed during the grand capa re-org, but there isn't time to do it right now.
- also, I kind of like having a generic turn-a-formula-into-a-preview service available
 2012-10-12 13:52:48 -04:00