Jay Zoldak
|
3657fbe33b
|
Merge pull request #2035 from edx/fix/zoldak/phantom-jasmine-version
Specify version of phantom jasmine to use.
|
2013-05-14 07:32:14 -07:00 |
|
Jay Zoldak
|
b590d344f5
|
Specify version of phantom jasmine to use.
|
2013-05-14 10:30:50 -04:00 |
|
Calen Pennington
|
465a2652b9
|
Merge pull request #2034 from edx/fix/cale/advanced-modules
Fix advanced modules list
|
2013-05-14 07:17:14 -07:00 |
|
Calen Pennington
|
bd6bb8e9c1
|
Fix advanced modules list
|
2013-05-14 09:39:25 -04:00 |
|
Calen Pennington
|
799ad92ecd
|
Add documentation of xmodule template files
|
2013-05-14 09:37:13 -04:00 |
|
Jay Zoldak
|
c69c69d27b
|
Merge pull request #2033 from edx/fix-phantom-jasmine-lms
Forgot to update phantom-jasmine location for LMS
|
2013-05-14 06:13:13 -07:00 |
|
marco
|
0aaaf84f62
|
added number metadata template, cleaned up editor theme ui bordering and settings styles
|
2013-05-14 08:22:36 -04:00 |
|
David Baumgold
|
d376cb52ca
|
Forgot to update phantom-jasmine location for LMS
|
2013-05-13 17:31:57 -04:00 |
|
cahrens
|
f42850c8a4
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
|
2013-05-13 17:28:17 -04:00 |
|
cahrens
|
aaffee5081
|
Initial cleanup of open_ended_module and peer_grading_module.
|
2013-05-13 17:27:59 -04:00 |
|
Ned Batchelder
|
29f4566a00
|
Change the XBlock target hash, not because we need new code, but because the old one was tangled up in a eponymous branch that was causing trouble.
|
2013-05-13 17:27:21 -04:00 |
|
Ned Batchelder
|
b682e1c0d3
|
Put a feature flag around the staff-only debugging page.
|
2013-05-13 17:07:13 -04:00 |
|
Arthur Barrett
|
026773b508
|
fix pep8 warnings and add empty message to notes tab
|
2013-05-13 16:54:32 -04:00 |
|
Jay Zoldak
|
38ee7bea5a
|
Merge pull request #2031 from edx/fix/zoldak/repo-name
Update repo name in jenkins test shell script.
|
2013-05-13 13:52:04 -07:00 |
|
Greg Price
|
a5bb31792b
|
Add a prefix string to Zendesk errors to be more searchable in Splunk
|
2013-05-13 16:38:52 -04:00 |
|
Steve Strassmann
|
b412dd57b6
|
Merge pull request #2026 from edx/bug/straz/pep8
pep8 cleanups
|
2013-05-13 13:37:57 -07:00 |
|
Sarina
|
c4c3b202ce
|
Merge pull request #2030 from edx/victor/fix-word-cloud-rotation
fix order of operations to make things rotate correctly
|
2013-05-13 13:33:17 -07:00 |
|
Jay Zoldak
|
30e8e2e2ae
|
Update repo name in jenkins test shell script.
|
2013-05-13 16:30:01 -04:00 |
|
Victor Shnayder
|
4f2c3b78da
|
fix order of operations to make things rotate correctly
|
2013-05-13 16:27:27 -04:00 |
|
Arthur Barrett
|
996b3513b9
|
Merge branch 'master' into feature/abarrett/lms-notes-app
|
2013-05-13 16:27:06 -04:00 |
|
Arthur Barrett
|
bea943d537
|
merged master. resolved conflict with the cms contentstore/views.py that was refactored into separate modules.
|
2013-05-13 16:26:28 -04:00 |
|
marco
|
cb4019304a
|
cleaned up references to proper elements in settings header mode buttons
|
2013-05-13 16:22:14 -04:00 |
|
Will Daly
|
17bd4d0236
|
Changed permissions on test_acceptance.sh to make it executable
|
2013-05-13 16:21:43 -04:00 |
|
James Tauber
|
9cc07d2345
|
removed duplicates
|
2013-05-13 16:20:37 -04:00 |
|
dcadams
|
5e75e91322
|
Takes care of Victor's comments on the PR.
Note, the students_lc list is used in _do_enroll_students when overload
= True so it needs to be left in.
|
2013-05-13 13:20:37 -07:00 |
|
James Tauber
|
7271440828
|
added initial AUTHORS file
|
2013-05-13 16:19:25 -04:00 |
|
dcadams
|
3890701cbb
|
Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement
|
2013-05-13 13:10:16 -07:00 |
|
Calen Pennington
|
f8a72e5cbe
|
Merge pull request #1932 from edx/feature/e0d/flexible-base.sh
flexible org repos parsing tested locally
|
2013-05-13 13:09:06 -07:00 |
|
Chris Dodge
|
5d2b8879f8
|
Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master
|
2013-05-13 16:04:28 -04:00 |
|
Chris Dodge
|
155ad08b9e
|
create forums permissions on course create
|
2013-05-13 16:04:20 -04:00 |
|
e0d
|
5e0afc63e0
|
Merge pull request #2024 from edx/bugfix/e0d/make-course-dynamic
Enable Delft and Georgetown to be handled by the dynamic path
|
2013-05-13 12:49:16 -07:00 |
|
Chris Dodge
|
cbe205328a
|
Merge branch 'master' of github.com:edx/mitx into feature/cdodge/autoprovision-forums-master
Conflicts:
cms/djangoapps/contentstore/views.py
|
2013-05-13 15:47:33 -04:00 |
|
Steve Strassmann
|
d26dc95709
|
pull from master
|
2013-05-13 15:42:43 -04:00 |
|
cahrens
|
2a8b8e2010
|
Merge branch 'master' into feature/christina/metadata-ui
|
2013-05-13 15:36:15 -04:00 |
|
cahrens
|
8c36918abf
|
Support display names for choices.
|
2013-05-13 15:35:55 -04:00 |
|
Will Daly
|
2e0b5b24d8
|
Pylint and pep8 fixes
|
2013-05-13 15:21:45 -04:00 |
|
Steve Strassmann
|
7b71271bc1
|
prefix unused vars with _
|
2013-05-13 15:21:29 -04:00 |
|
jarv
|
4774a1e92b
|
Merge pull request #2004 from edx/jarv/repo-rename
repo rename to edx-platform
|
2013-05-13 12:18:16 -07: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 |
|
jarv
|
1201d11701
|
Merge pull request #2025 from edx/jarv/sandbox-pre-requirements
adding pre-requirements for sandbox-requirements.txt
|
2013-05-13 11:15:11 -07:00 |
|
John Jarvis
|
c98ab686e6
|
adding pre-requirements for sandbox-requirements.txt
|
2013-05-13 14:11:28 -04:00 |
|
Peter Baratta
|
554d342f4e
|
Merge pull request #2018 from edx/fix/peter/numerical_infinite_bug
Fix infinity bug for numericalresponse; add tests
|
2013-05-13 11:08:54 -07:00 |
|
Will Daly
|
d1e35b14bb
|
Merge branch 'master' into feature/will/ci-lettuce-tests
|
2013-05-13 14:08:06 -04:00 |
|
e0d
|
eb843172ff
|
Enable Delft and Georgetown to be handled by the dynamic path
|
2013-05-13 14:02:41 -04:00 |
|
Arthur Barrett
|
8cddec41bf
|
updated comments about adding/removing tab types for advanced modules
|
2013-05-13 13:55:59 -04:00 |
|