Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,134 Commits 1 Branch 0 Tags
fb14bedfdf3ce8aaa183cbb7794e9c4e1b51fb56
Commit Graph

1818 Commits

Author SHA1 Message Date
Brian Talbot
b0021e7346 studio - resolved z-index issue with release date modal and JQUI timepicker + conslidated all vendor styling overrides/extensions 2013-04-03 15:35:22 -04:00
Brian Talbot
eb6f2d8c09 studio - revising outline layout per date changes and gradable status UI issue 2013-04-03 15:22:27 -04:00
Don Mitchell
9a7324ebfa Merge pull request #1798 from MITx/bug/christina/studio 
Fix due date bug.
 2013-04-03 10:26:40 -07:00
cahrens
52fdf5c7a0 Make sure due date year is always in the past. 2013-04-03 11:30:14 -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
Brian Talbot
899714a3c2 studio - resolving broken nav width 2013-04-02 10:19:17 -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
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
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
Brian Talbot
bc248a1d4a studio - tender widget: revised styling with spam protection back in place 2013-03-28 12:47:08 -04:00
Will Daly
6f8c9b4a9f Optimized ModuleStoreTestCase to reload templates only once 
over all test runs.
 2013-03-28 12:31:46 -04:00
Chris Dodge
1c2a8a97cd remove unnecessary debug log message 2013-03-28 11:38:22 -04:00
Chris Dodge
197f52539f add some unit tests 2013-03-28 11:37:53 -04:00
cahrens
b2bda10435 Merge branch 'master' into bug/christina/studio 
Conflicts:
	cms/djangoapps/contentstore/features/common.py
	cms/djangoapps/contentstore/features/section.py
	cms/djangoapps/contentstore/features/subsection.feature
 2013-03-28 11:17:47 -04:00
cahrens
7279f9c460 Bug fix for grading type not showing on course outline (#258). 2013-03-28 10:54:10 -04:00
Jay Zoldak
c9a7be6b9b Merge pull request #1727 from MITx/feature/will/lettuce_test_helpers 
Feature/will/lettuce test helpers
 2013-03-28 07:26:14 -07:00
cahrens
2d677a834c Test for due dates. 2013-03-28 10:24:31 -04:00
Don Mitchell
fece937669 Merge pull request #1758 from MITx/fix/cdodge/use-request-scroped-cache-for-metadata 
Fix/cdodge/use request scoped cache for metadata inheritance
 2013-03-28 06:51:20 -07:00
Chris Dodge
3cdd973af4 get _cache_children to queyr both non-draft and draft versions of the children, then overwrite all non-drafts with the draft version, if available. This conforms with the semantics of the DraftMongoModuleStore 2013-03-28 09:28:19 -04:00
Chris Dodge
6c67ed1f57 Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/course-overview-perf 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo.py
 2013-03-28 09:28:12 -04:00
Chris Dodge
b609a96902 ummm. forgot to commit stuff 2013-03-27 22:51:52 -04:00
Will Daly
9c671163fd Added exc_info=True to log.warning 
Changed log.exception to log.warning
 2013-03-27 17:11:02 -04:00
Will Daly
f038237ee9 Changed log.exception to log.warning 2013-03-27 16:34:08 -04:00
Jay Zoldak
6564cc57e6 Fix typo with hyphen in cms lettuce feature files 2013-03-27 16:29:55 -04:00
Will Daly
df1be87739 * Changed 404 errors to 400 errors 
* Removed duplicate traceback log message
* Now provide string, not Exception, as second tuple item to raise
 2013-03-27 15:20:40 -04:00
cahrens
5c78218b13 Don't need to convert to milliseconds. 2013-03-27 14:52:27 -04:00