cahrens
|
17c710af83
|
Merge branch 'master' into feature/christina/metadata-ui
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml
|
2013-05-27 20:08:09 -04:00 |
|
cahrens
|
599a215ad0
|
Move includes to right place.
|
2013-05-27 19:36:02 -04:00 |
|
VikParuchuri
|
256a367748
|
Merge pull request #2085 from edx/feature/vik/oe-editor
Feature/vik/oe editor
|
2013-05-24 13:56:26 -07:00 |
|
Vik Paruchuri
|
b1b93e71d7
|
Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor
|
2013-05-24 16:52:14 -04:00 |
|
Vik Paruchuri
|
e17276ade8
|
Fix some pep8 stuff
|
2013-05-24 16:43:29 -04:00 |
|
Vik Paruchuri
|
cef401f246
|
Swap icon to icon-table
|
2013-05-24 16:20:59 -04:00 |
|
cahrens
|
87d904cb35
|
Merge branch 'master' into feature/christina/metadata-ui
Conflicts:
cms/templates/base.html
|
2013-05-24 16:10:34 -04:00 |
|
Will Daly
|
519ddc02f9
|
Merge pull request #2117 from edx/fix/will/testing-docs
Updated testing documentation to reflect changes to how requirements are
|
2013-05-24 13:02:59 -07:00 |
|
Vik Paruchuri
|
9cbb4e090d
|
Swap icons for font awesome
|
2013-05-24 14:40:33 -04:00 |
|
Vik Paruchuri
|
5050eab74a
|
Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor
|
2013-05-24 14:26:33 -04:00 |
|
Will Daly
|
a64476f39a
|
Removed obsolete troubleshooting tip.
|
2013-05-24 11:08:52 -04:00 |
|
frances botsford
|
d2880586a3
|
Merge pull request #2118 from edx/fix/frances/studio-iconcleanup
Removed old icon references and files
|
2013-05-24 07:31:15 -07:00 |
|
marco
|
c0aef206ae
|
Merge branch 'style/btalbot/metadata-ui' into feature/christina/metadata-ui
|
2013-05-24 09:49:57 -04:00 |
|
chrisndodge
|
27c6816bac
|
Merge pull request #2113 from edx/fix/cdodge/few-xml-serialize-fixes
randomize_module.py was missing 'import lxml' to support definition_to_x...
|
2013-05-24 06:26:23 -07:00 |
|
Frances Botsford
|
dfb623a29f
|
removed old icon css and js files and references that are no longer needed
|
2013-05-24 09:01:15 -04:00 |
|
Frances Botsford
|
8b76afb938
|
converted undo image in component settings list to FontAwesome
|
2013-05-24 08:51:14 -04:00 |
|
Valera Rozuvan
|
587ac0ecf0
|
Removed is_graded attribute. In HTML yaml it is not used, and that is not graded.
|
2013-05-24 10:14:18 +03:00 |
|
Valera Rozuvan
|
1e8c4e9edf
|
Rebase + updated videoalpha template. Now no data_dir attribute and is_graded set to false.
|
2013-05-24 10:14:18 +03:00 |
|
Valera Rozuvan
|
aaeb3a862d
|
Added Python tests for start_time and end_time parameters.
|
2013-05-24 10:14:18 +03:00 |
|
Lyla Fischer
|
56f60e06e4
|
changed 'from' and 'to' to 'start_time' and 'end_time'
|
2013-05-24 10:14:18 +03:00 |
|
Lyla Fischer
|
d68162f9fa
|
removed from and to labels
|
2013-05-24 10:14:18 +03:00 |
|
Lyla Fischer
|
c238f76fe8
|
different default section
|
2013-05-24 10:14:18 +03:00 |
|
Lyla Fischer
|
53f80d3991
|
standard video introduction
|
2013-05-24 10:14:18 +03:00 |
|
Valera Rozuvan
|
6794b73d99
|
Added videoalpha version 1 to the advanced components in studio.
|
2013-05-24 10:14:18 +03:00 |
|
Will Daly
|
bfaadd47ab
|
Updated testing documentation to reflect changes to how requirements are
installed.
|
2013-05-23 22:30:09 -04:00 |
|
Peter Baratta
|
2793bb4337
|
Add few more tests; fix a small bug with parallel resistors
|
2013-05-23 17:43:26 -04:00 |
|
Peter Baratta
|
2486f7c271
|
Fixed docstrings and other comments from PR review
|
2013-05-23 17:38:16 -04:00 |
|
cahrens
|
138ad3988f
|
Update test (and set PREVIEW_LMS_BASE to something different so we can actually test the method).
|
2013-05-23 17:06:02 -04:00 |
|
cahrens
|
a03a4fdd07
|
PREVIEW_LMS_BASE must now be set (default value does not work for both edge and edx). Make this work locally as well.
https://edx.lighthouseapp.com/projects/102637/tickets/331
|
2013-05-23 16:45:10 -04:00 |
|
cahrens
|
522b76e847
|
PREVIEW_LMS_BASE must now be set (default value does not work for both edge and edx).
https://edx.lighthouseapp.com/projects/102637/tickets/331
|
2013-05-23 16:27:05 -04:00 |
|
Ned Batchelder
|
ebc991cce6
|
Merge pull request #2094 from edx/ned/make-numpy-and-scipy-both-install
Put numpy into a pre.txt so that everything will actually install.
|
2013-05-23 12:03:07 -07:00 |
|
Chris Dodge
|
b6090952da
|
randomize_module.py was missing 'import lxml' to support definition_to_xml(). Also, fix serialization of show_timezone to expect a bool
|
2013-05-23 14:24:36 -04:00 |
|
caesar2164
|
94300608a0
|
Merge pull request #2112 from edx/feature/giulio/variablize-colors
fixing video-bg-image and homepage-bg-image urls
|
2013-05-23 11:21:23 -07:00 |
|
Calen Pennington
|
69beea854c
|
Merge pull request #2045 from edx/feature/cale/jasmine-junit-reports
Record junit reports of jasmine tests
|
2013-05-23 11:06:34 -07:00 |
|
Giulio Gratta
|
538ffe6fbe
|
fixing video-bg-image and homepage-bg-image urls
|
2013-05-23 11:04:24 -07:00 |
|
Brian Talbot
|
1371c8d0da
|
revises alignment of advanced editor and cheatsheet toggle
|
2013-05-23 13:27:23 -04:00 |
|
Brian Talbot
|
7940ca54ad
|
studio - adjusts visual vertical spacing of save/cancel actions in modal editing windows on unit and page edits.
|
2013-05-23 13:27:22 -04:00 |
|
David Baumgold
|
007a4e534f
|
Merge pull request #2110 from edx/fix/db/lettuce-tests
Fix lettuce tests
|
2013-05-23 09:55:56 -07:00 |
|
David Baumgold
|
cf1e906c13
|
Fix lettuce tests
|
2013-05-23 12:50:19 -04:00 |
|
caesar2164
|
ba93f45341
|
Merge pull request #2050 from edx/feature/giulio/variablize-colors
first round of color replacements with variables
|
2013-05-23 09:47:04 -07:00 |
|
Giulio Gratta
|
566a8b3823
|
fix bad css and clean up after rebase/merge
|
2013-05-23 09:44:42 -07:00 |
|
Giulio Gratta
|
93258c548f
|
fixed hardcoded changes left over from parent theme branch backport
|
2013-05-23 09:44:41 -07:00 |
|
Giulio Gratta
|
3dd5733cee
|
first round of color replacements with variables
|
2013-05-23 09:44:40 -07:00 |
|
e0d
|
a16cb4b134
|
resolved confict based on change branching later than the live hotfix branch
|
2013-05-23 12:35:36 -04:00 |
|
cahrens
|
1a8a721998
|
Will not do unrelated test at this time.
|
2013-05-23 12:31:20 -04:00 |
|
chrisndodge
|
a8084628e1
|
Merge pull request #1956 from edx/feature/cdodge/autoprovision-forums-master
Feature/cdodge/autoprovision forums master
|
2013-05-23 09:27:36 -07:00 |
|
Calen Pennington
|
257dae634b
|
Merge pull request #2090 from edx/fix/cale/amazon-ses-errors
Fix/cale/amazon ses errors
|
2013-05-23 09:17:51 -07:00 |
|
Ned Batchelder
|
9e542aa548
|
Merge pull request #2109 from edx/ned/hotfix-disable-codejail-memory-limit
Use the latest CodeJail, with 0 default for memory limit.
|
2013-05-23 09:13:29 -07:00 |
|
David Baumgold
|
082e24c634
|
Removed references to server_error.js
|
2013-05-23 12:09:12 -04:00 |
|
Ned Batchelder
|
1224204b4c
|
Use the latest CodeJail, with 0 default for memory limit.
|
2013-05-23 12:03:02 -04:00 |
|