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

10228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cahrens
a1bb533b60 Workaround for sandbox. 2013-01-17 21:04:17 -05:00
Chris Dodge
44cfcb88a3 Merge branch 'master' into feature/cdodge/cms-master-merge4 2013-01-17 20:30:22 -05:00
Chris Dodge
0e2d8be442 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-master-merge4 2013-01-17 20:29:41 -05:00
David Ormsbee
7ac36d2f43 Merge pull request #1306 from MITx/fix/vik/remove-mitxmako 
Fix/vik/remove mitxmako
 2013-01-17 14:19:23 -08:00
Vik Paruchuri
18dc59c93a Error message fix 2013-01-17 17:18:10 -05:00
Vik Paruchuri
eaa6701c6f Remove mitxmako dependencies, make rubric and oechild inherit fro object 2013-01-17 17:13:31 -05:00
Don Mitchell
30c87be20f Subsection drag between sections should work now. 2013-01-17 17:09:31 -05:00
Brian Talbot
5b82a68c18 studio - removing extra line/whitespace in sass 2013-01-17 17:06:07 -05:00
Brian Talbot
66a3e9621b studio - removed editor type icon and text for all components except for problems 2013-01-17 17:04:28 -05:00
jarv
af086c2029 Merge pull request #1304 from MITx/mysql-python 
Add MySQL-Python back in for AWS.
 2013-01-17 12:56:20 -08:00
Ashley Penney
2d55f871ee While this is a pain for content developer local environment updates it breaks the LMS in EC2 which is vastly more important. We'll jsut have to address helping individual content people with installing MySQL if needed. This is a real dependency in production and I think those belong in here. 2013-01-17 15:51:26 -05:00
chrisndodge
f64ffd2577 Merge pull request #1303 from MITx/feature/christina/tiny-mce 
Feature/christina/tiny mce
 2013-01-17 12:44:54 -08:00
marco
2b23c40345 minor tweaks to dropdown text and addition of dropdown menu (without data links) for intructor visilibility dropdown in main discussion forum; 2013-01-17 15:25:35 -05:00
Don Mitchell
ac09e18b9e Now traps out of bounds as implying no change. Seems very slow. 2013-01-17 15:09:23 -05:00
David Ormsbee
18d5792025 Merge pull request #1302 from MITx/bugfix/brian/pearson-reg 
Bugfix/brian/pearson reg
 2013-01-17 11:42:00 -08:00
John Jarvis
08b8a9f674 Better help message for the force-gen option 2013-01-17 14:36:08 -05:00
Diana Huang
87990b36f4 Rubric sizing tweaks and text improvements. 2013-01-17 14:35:49 -05:00
cahrens
77865f7ab2 Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce 2013-01-17 14:22:18 -05:00
Diana Huang
7171e6b7cc Merge branch 'feature/diana/rubric-input' into diana/open-ended-ui-updates 2013-01-17 14:02:00 -05:00
Diana Huang
18a3d5e734 Merge branch 'master' into feature/diana/rubric-input 2013-01-17 14:00:43 -05:00
Diana Huang
3646ff53d8 Display updates and fixes. 2013-01-17 14:00:02 -05:00
chrisndodge
fe5d72857f Merge pull request #1300 from MITx/fix/cdodge/no-caching-in-preview 
disable caching in draft mode stores. It doesn't behave as we expect and...
 2013-01-17 10:17:16 -08:00
cahrens
5f05ec83f1 Change the div being used to create code mirror to a textarea-- just make sure to escape the content! Update tests accordingly. 2013-01-17 13:11:47 -05:00
Chris Dodge
fe964ec8ba disable caching in draft mode stores. It doesn't behave as we expect and we need more time to investigate 2013-01-17 13:11:16 -05:00
Chris Dodge
45bb511e15 remove obsolete test (per Vik) 2013-01-17 12:06:21 -05:00
Diana Huang
2b4e9f45b9 Updates to the CSS and html formatting for statuses 
and self-assessment
 2013-01-17 11:34:44 -05:00
Don Mitchell
1782c54e68 Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag 2013-01-17 11:23:45 -05:00
Don Mitchell
db4455e6e1 Cache 2013-01-17 11:23:39 -05:00
Don Mitchell
480aa80db3 Cache 2013-01-17 11:23:39 -05:00
David Ormsbee
9f33e3c755 Merge pull request #1294 from MITx/content/rocha/faq-update 
Update content: FAQ, help page and front page video
 2013-01-17 08:15:12 -08:00
David Ormsbee
15249b03d6 Merge pull request #1296 from MITx/hotfix/alex/gst 
Hotfix/alex/gst
 2013-01-17 08:14:39 -08:00
Brian Talbot
fdd395e0b3 pearson registration - synced up link text for emailing edx 2013-01-17 10:50:58 -05:00
Don Mitchell
ebb2976332 Merge pull request #1298 from MITx/feature/christina/misc 
Escape text being passed to markdown editor, delete copied (and unused) JS code
 2013-01-17 07:50:43 -08:00
Brian Talbot
59b328f4b2 pearson registration - removed telephone/fax placeholder attributes since they can't represent both domestic and international formatting easily 2013-01-17 10:49:57 -05:00
Carlos Andrés Rocha
9fdb4d0923 Replace front page video 
[#154]
 2013-01-17 10:47:50 -05:00
Carlos Andrés Rocha
1be58c62e3 Update /faq page: change certificate of completion to mastery 2013-01-17 10:47:50 -05:00
Carlos Andrés Rocha
00f83d03a0 Restore /faq page, and moved new content to /help 2013-01-17 10:47:50 -05:00
cahrens
b6fcf3a51e Some refactoring from Brian's submission. 2013-01-17 10:36:04 -05:00
Brian Wilson
80b2f45ac5 move pearson_import to another branch 2013-01-17 10:14:55 -05:00
Diana Huang
280a2f290e Merge branch 'master' into diana/open-ended-ui-updates 2013-01-17 10:09:16 -05:00
Chris Dodge
fcf92a371d fix up testing failures post merge 2013-01-17 09:48:10 -05:00
Diana Huang
df8d088492 Display updates to the xmodule. 2013-01-17 09:44:47 -05:00
Diana Huang
589e848fd4 Pass along the correct display name to the controller 2013-01-17 09:44:13 -05:00
Chris Dodge
48cbf38a41 resolve merge conflicts 2013-01-17 09:36:09 -05:00
Chris Dodge
22695d80c7 Merge branch 'master' into feature/cdodge/cms-master-merge4 
Conflicts:
	common/djangoapps/student/models.py
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/xml_module.py
	jenkins/test.sh
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/django_comment_client/models.py
	requirements.txt
 2013-01-17 09:15:37 -05:00
cahrens
d07a9203d1 in progress 2013-01-17 09:10:23 -05:00
chrisndodge
358c56da9e Merge pull request #1297 from MITx/fix/cdodge/filesystem-xml-fixes 
Fix/cdodge/filesystem xml fixes
 2013-01-17 05:55:22 -08:00
Alexander Kryklia
176be15998 removed unnecssary debug information 2013-01-17 14:25:28 +02:00
Alexander Kryklia
f22af62f2c removed jstat, added javascript_loader 2013-01-17 14:22:13 +02:00
Alexander Kryklia
1d36e7baf9 now we invoke gst consturctor as callback to javascript_loader, so dependencies are loaded first 2013-01-17 14:21:52 +02:00