Brian Talbot
|
2b749b9728
|
studio - tweaking the depth/shadow on the help sock UI
|
2013-04-03 09:00:56 -04:00 |
|
Mark L. Chang
|
1d70509da1
|
fixed merge on env
|
2013-04-03 00:31:48 -04:00 |
|
Mark L. Chang
|
43f6f0ce8f
|
put survey behind MITX_FEATURES flag
|
2013-04-03 00:28:08 -04:00 |
|
Mark L. Chang
|
5df7f41c8f
|
added net promoter score tracking javascript shim from Qualaroo
|
2013-04-03 00:28:08 -04:00 |
|
Chris Dodge
|
1d8f9c225b
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules
|
2013-04-02 16:12:05 -04:00 |
|
Brian Talbot
|
bf82af9db6
|
Merge branch 'master' into feature/btalbot/studio-helpsock
|
2013-04-02 15:40:41 -04:00 |
|
Brian Talbot
|
6952b8e63b
|
studio - revising design, interaction, and FED of help sock
|
2013-04-02 15:37:49 -04:00 |
|
Chris Dodge
|
1789814ceb
|
wip
|
2013-04-02 14:19:54 -04:00 |
|
Brian Talbot
|
8b9ecd9367
|
studio - reverting footer UI to existing
|
2013-04-02 12:53:11 -04:00 |
|
Brian Talbot
|
899714a3c2
|
studio - resolving broken nav width
|
2013-04-02 10:19:17 -04:00 |
|
Chris Dodge
|
63085ec65b
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules
|
2013-04-02 09:10:00 -04:00 |
|
Chris Dodge
|
3727edabf2
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules
Conflicts:
cms/djangoapps/contentstore/views.py
common/lib/xmodule/xmodule/modulestore/draft.py
common/lib/xmodule/xmodule/modulestore/xml_importer.py
common/lib/xmodule/xmodule/xml_module.py
|
2013-04-02 09:09:45 -04:00 |
|
Brian Talbot
|
6042f80703
|
studio - syncing up class naming conventions for icons
|
2013-04-02 09:02:59 -04:00 |
|
Brian Talbot
|
f07da92ab8
|
studio - adding in content/links to studio sock
|
2013-04-01 16:59:46 -04:00 |
|
Brian Talbot
|
769e209091
|
resolving local merge
|
2013-04-01 16:56:11 -04:00 |
|
Brian Talbot
|
57e5eb683b
|
studio - basic design, interaction, and content for static in-page help
|
2013-04-01 16:54:56 -04:00 |
|
Christina Roberts
|
ac180ca2b9
|
Merge pull request #1765 from MITx/feature/btalbot/studio-tenderwidget
Adding in reference and UI for Tender discussion submission widget
|
2013-04-01 13:17:06 -07:00 |
|
Christina Roberts
|
a8592b749a
|
Merge pull request #1783 from MITx/bug/btalbot/studio-datepickerzindex
Studio - JQUI's default date picker z-index bug
|
2013-04-01 13:07:51 -07:00 |
|
cahrens
|
42b4ffdcf9
|
Cleanup.
|
2013-04-01 13:40:32 -04:00 |
|
brianhw
|
98a717b6b2
|
Merge pull request #1771 from MITx/feature/rocha/enable-sass-source-maps
Enable dev env support for sass source maps
|
2013-04-01 09:44:57 -07:00 |
|
cahrens
|
8ace7fe57c
|
Merge branch 'master' into bug/christina/studio
Conflicts:
cms/djangoapps/contentstore/views.py
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
|
2013-04-01 12:30:07 -04:00 |
|
cahrens
|
16f4a3f9c1
|
Convert due date to a Date (vs. a string with no year).
|
2013-04-01 11:37:05 -04:00 |
|
Brian Talbot
|
9c2dbb91b4
|
studio - resolving a bug where JQUI sets the z-index of our datepickers to 1, which is less than our dynamic tooltips, causing visual display/access issues.
|
2013-04-01 10:34:31 -04:00 |
|
Victor Shnayder
|
9c4a88b570
|
Merge pull request #1743 from MITx/fix/will/bug_288
Fix/will/bug 288
|
2013-04-01 07:22:20 -07:00 |
|
ichuang
|
1969a6633e
|
if user course creation is disabled & if staff email given, add link to request course creation by email
|
2013-03-31 16:05:09 +00:00 |
|
ichuang
|
a0fab132a1
|
sort course index in studio my courses page
|
2013-03-31 15:51:14 +00:00 |
|
Carlos Andrés Rocha
|
29efa84205
|
Enable dev env support for sass source maps
Change the parameters of the sass compiler to output source
maps. Google Chrome uses the maps in the debugger to show the sass or
scss file that originated the style for a particular element.
More information here:
http://fonicmonkey.net/2013/03/25/native-sass-scss-source-map-support-in-chrome-and-rails/
|
2013-03-29 18:34:02 -04:00 |
|
chrisndodge
|
1c47573bd7
|
Merge pull request #1669 from MITx/fix/vik/add-oe-tab
Fix/vik/add oe tab
|
2013-03-29 13:55:58 -07:00 |
|
Chris Dodge
|
02f97858f6
|
move the provisioning seeding from LMS into Common. Add provisioning seeding calling from create new course view.
|
2013-03-29 16:32:53 -04:00 |
|
Vik Paruchuri
|
033f5ce73c
|
Make process to add open ended tab to studio reversible
|
2013-03-29 15:53:28 -04:00 |
|
Don Mitchell
|
c655c814e8
|
Merge pull request #1721 from MITx/feature/cdodge/add-no-inheritable-metadata-on-verticals-to-xlint
add checking for metadata that we can't support editing for in Studio. T...
|
2013-03-29 12:38:42 -07:00 |
|
Don Mitchell
|
80f57db7c3
|
Merge pull request #1762 from MITx/feature/cdodge/course-overview-perf
Feature/cdodge/course overview perf
|
2013-03-29 12:35:41 -07:00 |
|
Chris Dodge
|
60e295895e
|
remove unused parameter
|
2013-03-29 15:26:21 -04:00 |
|
Vik Paruchuri
|
b8e6c94dd6
|
Add in a comment
|
2013-03-29 13:57:16 -04:00 |
|
Jay Zoldak
|
a5b1428bba
|
Merge pull request #1760 from MITx/feature/will/speed_up_unit_tests
Feature/will/speed up unit tests
|
2013-03-29 10:53:10 -07:00 |
|
Vik Paruchuri
|
5aa357938d
|
Minor fixes for things that broke in the merge
|
2013-03-29 13:48:20 -04:00 |
|
Vik Paruchuri
|
65c2fd5f0c
|
Fix some post-merge errors
|
2013-03-29 13:22:13 -04:00 |
|
Vik Paruchuri
|
20bbf75fba
|
Merge remote-tracking branch 'origin/master' into fix/vik/add-oe-tab
Conflicts:
cms/djangoapps/contentstore/utils.py
cms/djangoapps/contentstore/views.py
cms/djangoapps/models/settings/course_metadata.py
|
2013-03-29 13:10:47 -04:00 |
|
Jay Zoldak
|
b63aae221e
|
small pep8 pylint and superclass fixes
|
2013-03-29 10:41:27 -04:00 |
|
Brian Talbot
|
f85e18ed3b
|
studio - resolving local merge
|
2013-03-29 10:20:08 -04:00 |
|
Chris Dodge
|
bbb53a17f8
|
add some depth optimziations for edit subsection and unit pages as well
|
2013-03-29 09:58:03 -04:00 |
|
Will Daly
|
d92533bb51
|
Test case now drops the mongo collection
|
2013-03-28 16:41:55 -04:00 |
|
Will Daly
|
86bc70c3c2
|
Reverted cms changes back
|
2013-03-28 15:00:19 -04:00 |
|
Chris Dodge
|
ee5076bda9
|
fix incorrect comment
|
2013-03-28 14:48:12 -04:00 |
|
Chris Dodge
|
cdc353b61c
|
add back dropped import
|
2013-03-28 14:07:13 -04:00 |
|
Chris Dodge
|
8fdeee06ed
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements
Conflicts:
cms/one_time_startup.py
common/lib/xmodule/xmodule/modulestore/mongo.py
|
2013-03-28 13:27:29 -04:00 |
|
Brian Talbot
|
2cd8f448f7
|
studio - resolving merge with tender widget branch
|
2013-03-28 12:48:42 -04:00 |
|
Brian Talbot
|
bc248a1d4a
|
studio - tender widget: revised styling with spam protection back in place
|
2013-03-28 12:47:08 -04:00 |
|
Brian Talbot
|
653369e3cf
|
resolving local stash merge
|
2013-03-28 12:37:58 -04:00 |
|
Will Daly
|
6f8c9b4a9f
|
Optimized ModuleStoreTestCase to reload templates only once
over all test runs.
|
2013-03-28 12:31:46 -04:00 |
|