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

1863 Commits

Author SHA1 Message Date
Christina Roberts
33d39a85a9 Merge pull request #1809 from MITx/feature/btalbot/studio-helpsock 
Studio Help Sock
 2013-04-05 11:37:57 -07:00
chrisndodge
4c95294ba7 Merge pull request #1810 from MITx/feature/cdodge/integrity-check-mongo-course 
pylint/pep8 fixes
 2013-04-05 08:45:12 -07:00
Brian Talbot
275826d4ff studio - resolving help sock PR comments 2013-04-05 11:29:46 -04:00
Chris Dodge
02dfa09c70 pylint/pep8 fixes 2013-04-05 10:53:18 -04:00
chrisndodge
f467d93f97 Merge pull request #1806 from MITx/feature/cdodge/integrity-check-mongo-course 
Feature/cdodge/integrity check mongo course
 2013-04-05 06:52:42 -07:00
Chris Dodge
8e36197cc2 tweeks per Cale's feedback 2013-04-05 09:30:49 -04:00
Mark L. Chang
2852256898 added dummy analytics object 2013-04-04 23:44:40 -04:00
Mark L. Chang
2e9bf4ac0e Merge remote-tracking branch 'origin/master' into feature/markchang/studio-analytics 
Conflicts:
	cms/envs/common.py
 2013-04-04 16:11:22 -04:00
Mark L. Chang
10377bc41c added a dummy key for segment.io so it doesn't ever fail 2013-04-04 16:08:10 -04:00
Brian Talbot
9ab5710a2a studio - removing unused footer-height variable 2013-04-04 15:32:42 -04:00
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
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
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
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
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
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