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

2444 Commits

Author SHA1 Message Date
cahrens
8c36918abf Support display names for choices. 2013-05-13 15:35:55 -04:00
Steve Strassmann
7b71271bc1 prefix unused vars with _ 2013-05-13 15:21:29 -04:00
Steve Strassmann
9b7374ab73 pull from master 2013-05-13 15:07:14 -04:00
Steve Strassmann
10b7622018 declare exports from course, component 2013-05-13 15:06:52 -04:00
David Baumgold
f0bd73b2fb Merge pull request #2022 from edx/kill-submodules 
Install phantom-jasmine via npm, rather than git submodules
 2013-05-13 12:02:41 -07:00
Arthur Barrett
55942b8a0b fix brokn tab test 2013-05-13 14:57:36 -04:00
Steve Strassmann
b3cc9a1174 pep8 cleanups 2013-05-13 14:55:41 -04:00
Arthur Barrett
8f07072d3d added unit tests to add/remove course tab utility functions. 2013-05-13 14:44:56 -04:00
Arthur Barrett
8cddec41bf updated comments about adding/removing tab types for advanced modules 2013-05-13 13:55:59 -04:00
Steve Strassmann
96c37089dc whitespace for pep8 2013-05-13 13:47:51 -04:00
Arthur Barrett
be98b5fa3e merged master. resolved conflict in cms/djangoapps/contentstore/views.py (added word_cloud to advanced_modules list) 2013-05-13 13:26:55 -04:00
Steve Strassmann
cdc2de7e65 Merge branch 'master' of https://github.com/edx/mitx into feature/straz/views 
pull from master
 2013-05-13 13:22:39 -04:00
Steve Strassmann
b0cc989b1e pull from master 2013-05-13 11:45:23 -04:00
David Baumgold
7c98981498 Install phantom-jasmine via npm, rather than git submodules 
Because removing a step from our install process is a Good Thing™
 2013-05-13 11:33:09 -04:00
Steve Strassmann
8bb6ad3689 relative imports 2013-05-13 11:31:56 -04:00
Chris Dodge
0ef2944d43 Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting 2013-05-13 11:13:43 -04:00
Mark L. Chang
85ae7b9744 Merge pull request #2012 from edx/feature/markchang/500-copy-change 
copy change
 2013-05-13 08:12:02 -07:00
Chris Dodge
4d197e10ec fix some violations. Build up karma 2013-05-13 11:10:11 -04:00
Steve Strassmann
e03585d85c pylint: refactor imports 2013-05-13 11:07:08 -04:00
Chris Dodge
d32e7a5b61 Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting 2013-05-13 11:06:49 -04:00
cahrens
5edbf3d8f7 Merge branch 'master' into feature/christina/metadata-ui 2013-05-13 10:55:32 -04:00
Chris Dodge
3cf865a88f added another unit test check point for export/import of classic textbooks 2013-05-13 10:16:18 -04:00
Steve Strassmann
b288a8e3bd fix export from tabs.__all__ 2013-05-13 10:03:20 -04:00
Steve Strassmann
979e3be174 fix pep8: imports and blank lines 2013-05-13 09:58:30 -04:00
Chris Dodge
d98e726a8e Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting 2013-05-13 09:51:05 -04:00
Steve Strassmann
5ab6d47264 pull from master 2013-05-13 09:39:33 -04:00
marco
68cd922e04 Merge branch 'feature/christina/metadata-ui' of github.com:edx/mitx into feature/christina/metadata-ui 2013-05-13 09:27:18 -04:00
marco
97de97cc18 minimal mce editor style changes to borders 2013-05-13 09:27:13 -04:00
Alexander Kryklia
bdc62e7d2e word cloud studio integration 2013-05-13 14:44:09 +03:00
cahrens
125c9c13c1 Got clearing of fields working. 2013-05-12 15:45:31 -04:00
marco
c36046bedd Merge branch 'feature/christina/metadata-ui' of github.com:edx/mitx into feature/christina/metadata-ui 2013-05-12 13:18:45 -04:00
marco
2360a111c8 attempt to trigger js event for mode button press, not breaking yet but nonfunctional 2013-05-12 12:08:04 -04:00
Mark L. Chang
f864a6c00c more copy tweaks 2013-05-11 16:16:30 -04:00
Mark L. Chang
317831a813 copy change 2013-05-11 16:16:30 -04:00
Arthur Barrett
beabdf1434 Merge branch 'master' into feature/abarrett/lms-notes-app 2013-05-11 14:52:39 -04:00
Steve Strassmann
c071ee448f pep8 compliance 2013-05-10 16:51:26 -04:00
Jason Bau
408e26a0c1 parameterizes CMS email settings 2013-05-10 13:42:28 -07:00
cahrens
f4b06b2e96 Beginnings of is-set work. 2013-05-10 16:41:07 -04:00
Steve Strassmann
571a9af0c0 declared exports 2013-05-10 16:37:28 -04:00
cahrens
fd52980a2d Option view, changes getting persisted. 2013-05-10 16:02:22 -04:00
Chris Dodge
1db66957af Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting 2013-05-10 15:44:55 -04:00
Steve Strassmann
70cca0540d reorder imports for pep8 2013-05-10 15:23:28 -04:00
Steve Strassmann
01d4fbeb7c reorder imports 2013-05-10 14:14:36 -04:00
Steve Strassmann
8c8377f1df Merge branch 'master' of https://github.com/edx/mitx into feature/straz/views 
pull master
 2013-05-10 13:59:07 -04:00
Steve Strassmann
9350a2c067 refactoring views 2013-05-10 13:56:30 -04:00
marco
04bb7335e7 removed extra section heading in settings DOM, placed settings after editor 2013-05-10 13:18:43 -04:00
Greg Price
a0fb4d6c85 Merge branch 'master' into drupal-new 
Conflicts:
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/base/_base.scss
	lms/templates/forgot_password_modal.html
 2013-05-10 10:30:10 -04:00
Chris Dodge
51809965fe Merge branch 'master' of github.com:edx/mitx into feature/cdodge/autoprovision-forums-master 2013-05-10 10:01:53 -04:00
Chris Dodge
1b0eff52ed create test cases to simulate error exporting/importing textbooks 2013-05-10 10:01:10 -04:00
Steve Strassmann
0bea50ede1 start refactoring views.py 2013-05-09 16:24:21 -04:00