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

4005 Commits

Author SHA1 Message Date
Brian Talbot
6d4966745e Merge branch 'feature/btalbot/studio-helpsock' of github.com:MITx/mitx into feature/btalbot/studio-helpsock 2013-04-04 15:27:53 -04:00
Brian Talbot
8e67f63eb6 studio - syncing up hover color of sock control with other buttons 2013-04-04 15:27:02 -04:00
Chris Dodge
73113eddc7 fix xml_attributes inspection 2013-04-04 13:38:30 -04:00
ichuang
2e852d16ac Merge remote-tracking branch 'edx-mitx/master' into feature/ichuang/staff-email-for-course-creation 
Conflicts:
	cms/envs/common.py
 2013-04-04 17:34:52 +00:00
chrisndodge
0ff31adf74 Merge pull request #1779 from MITx/feature/ichuang/studio-sort-my-courses 
sort course index in studio my courses page
 2013-04-04 09:30:16 -07:00
Mark L. Chang
db1c0bf081 added dev key so tests run 2013-04-04 12:14:34 -04:00
Mark L. Chang
1c7e13e1e8 copy change 2013-04-04 11:54:37 -04:00
Chris Dodge
c0fc029b03 switch over the variable 'ms' to be 'store' 2013-04-04 10:33:30 -04:00
Chris Dodge
c7061a0262 add a command line utility to walk through the course and find common errors 2013-04-04 10:20:31 -04:00
Chris Dodge
ac01079502 add a command line utility to walk through the course and find common errors 2013-04-04 09:35:35 -04:00
Mark L. Chang
8fb6ce2eca added tracking to unit page and components 2013-04-04 01:51:15 -04:00
Mark L. Chang
4ce34fa298 instrumented checklists 2013-04-04 01:51:15 -04:00
Mark L. Chang
7b5ec1bc41 instrumented advanced settings 2013-04-04 01:51:14 -04:00
Mark L. Chang
22bd8da1f2 added event tracking to static pages 2013-04-04 01:51:14 -04:00
Mark L. Chang
64b7603d37 outline page event tracking 2013-04-04 01:51:14 -04:00
Mark L. Chang
d9bbed305e newline 2013-04-04 01:51:14 -04:00
Mark L. Chang
8439013f64 studio: added segment.io tracking 2013-04-04 01:51:14 -04:00
Brian Talbot
ea1387a5f9 Merge branch 'master' into feature/btalbot/studio-alerts 2013-04-03 15:50:00 -04:00
Brian Talbot
e3d35afb7a studio - changing visual padding around alerts 2013-04-03 15:49:26 -04:00
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
Brian Talbot
d87c4e3866 resolving local merge with master 2013-04-03 15:01:55 -04:00
Chris Dodge
5f9d7db94d actually we need to start the draft content export from the sequentials. This is because we need the child pointers to the draft verticals. For private items, if we don't do this, then we'll loose those pointers 2013-04-03 14:43:01 -04:00
Chris Dodge
a023cfa8d9 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules 2013-04-03 14:14:13 -04:00
Chris Dodge
b640866748 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements 
Conflicts:
	common/lib/xmodule/xmodule/x_module.py
 2013-04-03 14:05:59 -04:00
Chris Dodge
f7a83cdc74 wip: add test case for exporting/importing a private module 2013-04-03 14:03:14 -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
Chris Dodge
1a1635d402 Fix tests and extend export/import unit test with draft testing. 2013-04-03 11:28:25 -04:00
Chris Dodge
b61d7b2c3c Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules 2013-04-03 10:39:06 -04:00
Brian Talbot
65768e813b resolving local merge conflict 2013-04-03 10:00:38 -04:00
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