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

7172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Dodge
e37d4d7a1e Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/mongo-perf-instrumenting 2012-11-05 12:39:25 -05:00
Calen Pennington
e35d1483c6 Merge pull request #1009 from MITx/bug/lyla/latextemplate 
fixed typo
 2012-11-02 13:38:40 -07:00
Chris Dodge
918de8b4a9 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/mongo-perf-instrumenting 
Conflicts:
	requirements.txt
 2012-11-02 15:09:54 -04:00
Chris Dodge
b75a814f7a add django performance metering 2012-11-02 15:08:45 -04:00
Calen Pennington
0bfa443520 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 2012-11-02 11:09:19 -04:00
Victor Shnayder
d05f6c8a06 Merge pull request #1005 from MITx/fix-alex-vsepr-2-mitx 
Fix alex vsepr 2 mitx
 2012-11-01 17:52:16 -07:00
Александр
3ed4b77d8c removed testsing comments 2012-11-01 17:43:41 +02:00
Lyla Fischer
8ed4ef4412 fixed typo 2012-11-01 11:36:41 -04:00
Александр
07a2a105ca added comments 2012-11-01 17:35:27 +02:00
Александр
5ba2c2e785 converted unittests 2012-11-01 16:48:44 +02:00
Александр
5755325a41 changed syntax to support e1,e2 in AX6 and add convert_to_p behavior 2012-11-01 16:26:54 +02:00
David Ormsbee
482800064b Merge pull request #1003 from MITx/feature/dave/close_forum 
Support blackout periods for restricting student forum posts per class
 2012-11-01 06:15:25 -07:00
David Ormsbee
ddc4f705e0 Remove raise that was there just for debugging purposes 2012-11-01 04:50:23 -04:00
David Ormsbee
8f756f0304 Document advertised_start and discussion_blackouts attributes of course 2012-11-01 04:45:00 -04:00
David Ormsbee
8a453e99ca Implement basic ability to close off a forum for a given course such that Students can no longer post or edit, but can still view. 2012-11-01 04:37:16 -04:00
Александр
fa2cf6a49c add convert_to_perepherial flag and removed order flags 2012-11-01 08:22:33 +02:00
Victor Shnayder
e4c49f3a1e Merge pull request #1001 from MITx/feature/victor/inputtypes-refactor 
Feature/victor/inputtypes refactor
 2012-10-31 15:18:28 -07:00
Victor Shnayder
cf2402aee9 bugfix: always set queue len 2012-10-31 18:17:12 -04:00
Victor Shnayder
01f5f59235 Merge pull request #998 from MITx/feature/rocha/hd-video-player 
Add HD control to video player
 2012-10-30 17:00:03 -07:00
Carlos Andrés Rocha
e5b11a9c57 Add HD control to video player 2012-10-30 19:21:17 -04:00
Calen Pennington
827f7d5aa3 Merge pull request #988 from MITx/feature/cale/changelogs 
Add changelogs for the CMS and LMS
 2012-10-30 13:48:57 -07:00
Calen Pennington
d4a6b589f1 Add comment about the target of change log entries 2012-10-30 16:48:47 -04:00
David Ormsbee
5223e9d3ca Merge pull request #995 from MITx/features/rocha/google-analytics-for-course-pages 
Add google analytics to course info pages
 2012-10-30 13:48:36 -07:00
Carlos Andrés Rocha
8ec2c34ea5 Add google analytics to course info pages 2012-10-30 16:05:06 -04:00
David Ormsbee
9206341817 Merge pull request #969 from MITx/content/rocha/job-page-update 
Update Job Page with new positions
 2012-10-30 12:58:03 -07:00
Carlos Andrés Rocha
376dcb7982 Correct job description item 2012-10-30 15:44:28 -04:00
Carlos Andrés Rocha
f82f4f531d Merge pull request #991 from MITx/feature/dave/open_date 
Allow optional advertised_start metadata in Course
 2012-10-30 12:10:23 -07:00
Calen Pennington
e6ff0b52d0 Merge pull request #994 from MITx/apenney/requirements 
Add MySQL-python to the requirements.
 2012-10-30 11:37:47 -07:00
Ashley Penney
ab57c7d759 Add MySQL-python to the requirements. 2012-10-30 14:32:50 -04:00
Calen Pennington
b8dcf0c40c Merge pull request #993 from MITx/bug/cas/tom/long-class-names 
added handling for long class names in the header
 2012-10-30 09:59:36 -07:00
Tom Giannattasio
ceb17ad411 added handling for long class names in the header 2012-10-30 12:57:47 -04:00
chrisndodge
4c16781808 Merge pull request #992 from MITx/bug/cas/tom/user-not-found 
moved error message into form area; tweaked cancel behavior
 2012-10-30 08:57:47 -07:00
Tom Giannattasio
d63f82ae57 moved error message into form area; tweaked cancel behavior 2012-10-30 11:39:08 -04:00
David Ormsbee
535980eb6d Allow optional advertised_start metadata in Course, to let people pre-launch thier courses quietly if desired. 2012-10-30 11:06:50 -04:00
Victor Shnayder
a155265409 minor whitespace + comment fixes 2012-10-29 23:44:38 -04:00
Victor Shnayder
2c01bf4a48 Merge pull request #982 from MITx/feature/victor/inputtypes-refactor 
Feature/victor/inputtypes refactor
- addressed comments and added a few TODOs.  Merging.
 2012-10-29 09:07:12 -07:00
Victor Shnayder
6cc196394a fixing comments 2012-10-29 12:06:42 -04:00
Victor Shnayder
d297077775 merge in master 2012-10-29 09:22:23 -04:00
Calen Pennington
e422716045 Add changelogs for the CMS and LMS 2012-10-29 09:07:49 -04:00
Victor Shnayder
b03789156c add test for vsepr 2012-10-29 08:16:31 -04:00
Victor Shnayder
516b720f1e Rename: use 'status' in templates as well as in the code. 2012-10-29 08:05:07 -04:00
Victor Shnayder
ab03f3dddf move textinput.html to textline.html for consistency with other inputs 2012-10-29 07:56:10 -04:00
Victor Shnayder
318ea9b135 add back mathjax textarea 2012-10-29 07:51:58 -04:00
Victor Shnayder
02bd99697b Clean up section ids and classes 
- all inputtypes should have id inputtype_${id}
- should have class capa_inputtype
 2012-10-29 07:49:33 -04:00
Victor Shnayder
a97298e8f7 add note about documenting js input 2012-10-29 07:48:53 -04:00
Victor Shnayder
d6cb432842 Replace overriding constructor with a setup() method. 
- allows catching any exceptions and making sure the xml is in the error message
- isolates subclasses from external interface a bit
 2012-10-29 07:42:11 -04:00
Victor Shnayder
1a843c2d77 Remove non-working TrueFalse functionality from choicegroup, combine tests with radiogroup and checkboxgroup 2012-10-29 07:23:27 -04:00
kimth
f154202890 Merge pull request #986 from MITx/feature/arjun/allow_save 
Feature/arjun/allow save
 2012-10-28 22:15:55 -07:00
Arjun Singh
75f0a56d70 Change documentation, make values strings for save button forcing 2012-10-28 21:57:28 -07:00
Arjun Singh
e29d244a8f allow saving nonrandomized problems 2012-10-28 21:47:43 -07:00