brianhw
2efa160c56
Merge pull request #2128 from edx/bugfix/brian/remove-debug-request
...
make debug_request available only when DEBUG is enabled, so that product...
2013-05-28 14:11:20 -07:00
Greg Price
f0e688e8f8
Merge tag 'hotfix-2013-05-28'
...
Hotfix for 2013-05-28
Conflicts:
requirements/edx/github.txt
2013-05-28 17:01:15 -04:00
Will Daly
9f48c44fb6
Merge pull request #2120 from edx/feature/will/capa-template-tests
...
Added tests for capa input templates (unescaped HTML)
2013-05-28 13:55:05 -07:00
Brian Wilson
54fb46cee4
make debug_request available only when DEBUG is enabled, so that production doesn't have this security risk.
2013-05-28 15:30:25 -04:00
James Tauber
be70e016d4
Merge pull request #2127 from edx/jtauber/mitxmako-readme
...
updated mitxmako README to clarify license and origin
2013-05-28 12:24:58 -07:00
JonahStanley
c3c4a0e9ad
Hopefully fixed registration flakey test
2013-05-28 15:22:47 -04:00
James Tauber
d38f266153
updated mitxmako README to clarify license and origin
2013-05-28 15:14:47 -04:00
marcotuts
ab18953eec
Merge pull request #2020 from edx/ux/marco/forums-icons
...
updated pinning icons
2013-05-28 11:22:13 -07:00
caesar2164
3106ad027d
Merge pull request #2125 from edx/giulio/fix-footer-layout
...
fix footer and header spacing/margin issues
2013-05-28 11:12:49 -07:00
Christina Roberts
0e4c08112f
Merge pull request #2115 from edx/bug/christina/preview_url
...
Bug/christina/preview url
2013-05-28 11:08:22 -07:00
Greg Price
b668ab62f3
Merge pull request #2126 from edx/gprice/tweak-500-text
...
Reviewed by cale and brian (https://rbcommons.com/s/edx/r/3/ )
2013-05-28 11:08:07 -07:00
cahrens
625c6b518c
Cleanup, change how we load templates.
2013-05-28 14:07:35 -04:00
Giulio Gratta
186da0d5fe
fix user button/dropdown spacing/scrolling issue
2013-05-28 10:49:58 -07:00
Brian Talbot
25305dc8f7
lms/mktg - removes margins from social icons and reinstates flex-gutter margin to colophon area of footer
2013-05-28 13:44:16 -04:00
Brian Talbot
ef6c365ca0
lms/mktg - revises paragraph in colophon portion of footer to match footer's flex-grid value
2013-05-28 13:36:47 -04:00
Giulio Gratta
8d7b46b51b
fix footer element spacing issues
2013-05-28 10:15:39 -07:00
cahrens
f3d4381fde
Minor cleanup.
2013-05-28 12:53:00 -04:00
cahrens
aca5cbb215
Merge branch 'master' into bug/christina/preview_url
2013-05-28 12:13:19 -04:00
cahrens
e0bb4ad4dd
Preview url is read in from environment file.
2013-05-28 12:04:48 -04:00
cahrens
2c32200cce
Updated text per Alex's e-mail.
2013-05-28 11:12:22 -04:00
Greg Price
e755bdfdfd
Tweak text on 500 error page
2013-05-28 10:59:19 -04:00
Will Daly
dcb95291a9
Merge branch 'master' into feature/will/capa-template-tests
2013-05-28 08:07:54 -04:00
Greg Price
7d3d34c69e
Remove tags for comment client request time histogram in Datadog
...
According to someone from Datadog, this was generating tags like "knowledgeable_
people_who_put_this_course_together._this_is_harvard._you_can_t_tell_us_there_s_
a_shortage_of_editorial_talent." They say that they can handle tens or hundreds
of unique tags but not thousands. Given that we have a unique URL for each
thread, we can't even use that as a tag. Thus, all tags are removed for now
until we can determine whether there is a useful set of tags with small enough
cardinality. In light of this, I did not investigate why the long tag mentioned
above was being generated.
2013-05-27 22:01:51 -04:00
cahrens
6be9463eca
Cleanup.
2013-05-27 21:50:56 -04:00
cahrens
a195c4f55f
Continue merge.
2013-05-27 20:36:10 -04:00
cahrens
851ed6722a
Continue merge.
2013-05-27 20:28:56 -04:00
cahrens
34082efad5
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:19 -04:00
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
