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

6714 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victor Shnayder
b401a97ca2 Merge pull request #1014 from MITx/bugfix/dave/use_toy_course_for_discuss_test 
Use one of our test courses when testing course permissions for the discussion client
 2012-11-05 06:35:34 -08:00
David Ormsbee
d1aa0a254e Use one of our test courses when testing course permissions for the discussion client, because we now have course policy level overrides. 2012-11-02 17:21:00 -04:00
David Ormsbee
f38ba3ce5c Merge pull request #1012 from MITx/bugfix/victor/xml-loading 
Fix a bug with pointer-tag detection on load
 2012-11-02 14:04:53 -07:00
Victor Shnayder
55a0cada7b Fix a bug with pointer-tag detection on load 
if a tag has text but no children, wasn't properly detected as an inline definition.
 2012-11-02 16:59:41 -04:00
David Ormsbee
7595ab4a24 Merge pull request #1006 from MITx/content/rocha/job-page-update 
Remove learning designer and producer openings from job page
 2012-11-02 13:52:38 -07:00
Calen Pennington
4608803182 Merge pull request #999 from MITx/feature/jm/fixing_devenv 
Fixed install by adding mysql
 2012-11-02 13:41:02 -07:00
Victor Shnayder
9db977feae Merge pull request #1002 from MITx/feature/victor/inputtypes-refactor 
More inputtype refactor …
 2012-11-02 13:05:40 -07:00
Victor Shnayder
79174259cb Address Ike's comments. 
- change a few comments / strings
- move extract_choices into the ChoiceGroup class
 2012-11-02 14:00:51 -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
Aaron Culich
4db61f2531 Fixed mysql_config not found error by adding libmysqlclient-dev to APT_PKGS 2012-11-01 19:31:19 +00:00
Carlos Andrés Rocha
32498f3468 Remove learning designer and producer openings from job page 2012-11-01 13:21:40 -04:00
Александр
3ed4b77d8c removed testsing comments 2012-11-01 17:43:41 +02: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
Aaron Culich
40ce5d2ff6 Fixed dependency problem introduced by MySQL-python by forcing distribute version >= 0.6.28 in pre-requirements 2012-11-01 14:08:24 +00:00
Aaron Culich
4712a039dc Added DEBIAN_FRONTEND=noninteractive to sudo apt-get which is required for silent mysql-server installation 2012-11-01 14:06:03 +00:00
Aaron Culich
2203a0bd70 Updated APT_PKGS with valid Ubuntu package name: mysql -> mysql-server 2012-11-01 14:05:11 +00: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
b78fb8dff6 Refactored the rest of the input types 2012-11-01 00:05:48 -04:00
Victor Shnayder
3a0999702b Merge remote-tracking branch 'origin/master' into feature/victor/inputtypes-refactor 2012-10-31 23:50:10 -04:00
Victor Shnayder
7fcf02a0cc Further refactor 
- small Attribute and InputTypeBase interface changes to make things cleaner
- move html quoting into templates (use ${blah | h} syntax)
- converting input types to use new format.
 2012-10-31 23:40:19 -04:00
Victor Shnayder
74e23546af More inputtype refactor 
- add an Attribute class
- input types just need to declare which attributes they want, and how to transform and validate them, and the base class will do all the rest.
- change OptionInput to new format.
 2012-10-31 18:40:10 -04: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
JM Van Thong
ca5c33cdf3 Fixed install by adding mysql 2012-10-31 13:46:27 -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
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
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
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