David Baumgold
|
e9a8f408bf
|
Add {reset: true} to all collection.fetch() calls
This is to fix a bug with the Backbone 1.0 upgrade; some views were listening to
reset events that were not longer getting fired
|
2013-05-14 16:43:41 -04:00 |
|
Greg Price
|
60f5314ab0
|
Merge pull request #2036 from edx/feature/gprice/datadog-cs-time
Add comment service request time logging to Datadog
|
2013-05-14 12:25:59 -07:00 |
|
marco
|
6ec1a29201
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
|
2013-05-14 15:05:29 -04:00 |
|
marco
|
064d21c4e2
|
clean up of editor header styling
|
2013-05-14 15:05:22 -04:00 |
|
Ned Batchelder
|
4ea7607648
|
Check that the directory being added to the Python path is really inside the course.
|
2013-05-14 14:59:19 -04:00 |
|
Ned Batchelder
|
768665067f
|
Update the CodeJail we want.
|
2013-05-14 14:52:30 -04:00 |
|
Greg Price
|
87cc4fab5a
|
Add tags to comment service request Datadog timer
|
2013-05-14 14:49:56 -04:00 |
|
Will Daly
|
9dbcf0baa4
|
Updated login session handling to fix issue with ChromeDriver on Ubuntu
|
2013-05-14 14:47:50 -04:00 |
|
cahrens
|
17750a7d6d
|
Use min, max, and step values from server.
|
2013-05-14 14:20:10 -04:00 |
|
cahrens
|
5bd0442ffb
|
Merge branch 'master' into feature/christina/metadata-ui
|
2013-05-14 13:53:03 -04:00 |
|
Arthur Barrett
|
0e7573a2cc
|
Merge branch 'master' into feature/abarrett/lms-notes-app
|
2013-05-14 13:45:17 -04:00 |
|
Will Daly
|
36fb8f91e0
|
Acceptance tests now use the same mongo db as the unit test suite.
The LMS/CMS acceptance tests both use the collection acceptance_modules
|
2013-05-14 12:45:38 -04:00 |
|
cahrens
|
69832c57a9
|
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
|
2013-05-14 12:40:25 -04:00 |
|
cahrens
|
82899d6d2e
|
Number view.
|
2013-05-14 12:40:17 -04:00 |
|
marco
|
8d8c8d83df
|
updated unit styling, added polyfill js library, updated javascript handling for modes swap
|
2013-05-14 12:38:52 -04:00 |
|
Greg Price
|
2c1b0c831f
|
Merge pull request #2032 from edx/fix/gprice/zendesk-log-error
Add a prefix string to Zendesk errors to be more searchable in Splunk
|
2013-05-14 09:35:33 -07:00 |
|
Will Daly
|
daef910494
|
Mae mongo DB and collection names consistent for all
acceptance tests.
|
2013-05-14 12:34:15 -04:00 |
|
Arthur
|
c8bdc1ab66
|
update readme
|
2013-05-14 12:42:26 -03:00 |
|
Greg Price
|
c8970cafee
|
Add comment service request time logging to Datadog
|
2013-05-14 11:32:40 -04:00 |
|
Arthur Barrett
|
149f2ff897
|
add readme
|
2013-05-14 11:26:15 -04:00 |
|
Chris Dodge
|
5df23d15f2
|
Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master
Conflicts:
cms/djangoapps/contentstore/views/course.py
|
2013-05-14 10:57:11 -04:00 |
|
Arthur Barrett
|
5e39971fcc
|
merge master. resolved conflicts in component.py and course.py.
|
2013-05-14 10:54:21 -04:00 |
|
Chris Dodge
|
ef78c99f70
|
pep8/pylint violations fixes
|
2013-05-14 10:53:10 -04:00 |
|
Will Daly
|
e2d7f6a027
|
Changed module store directory root to test_root/data
|
2013-05-14 10:45:27 -04:00 |
|
Will Daly
|
72a42413e2
|
Fixed database to work on Jenkins (now stored in test_root),
moved syncdb/migration steps into the rake test_acceptance commands
and updated the documentation.
|
2013-05-14 10:33:25 -04:00 |
|
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 |
|
James Tauber
|
7271440828
|
added initial AUTHORS file
|
2013-05-13 16:19:25 -04:00 |
|