Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

9424 Commits

Author SHA1 Message Date
Brian Talbot
4e8f01b88c studio - adjusted abbr cursor displays 2013-04-05 11:18:16 -04:00
Brian Talbot
7ff975e0b6 studio - removing default styling for abbreviation elements, fixing typo in title attribute for timepickers 2013-04-05 11:06:34 -04:00
Chris Dodge
02dfa09c70 pylint/pep8 fixes 2013-04-05 10:53:18 -04:00
cahrens
fa31953924 Update tests for GMT, get Advanced Settings test to pass reliably. 2013-04-05 10:47:58 -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
cahrens
2ad3fce27a Show UTC at end of string. 2013-04-05 09:13:17 -04:00
Mark L. Chang
2852256898 added dummy analytics object 2013-04-04 23:44:40 -04:00
Brian Talbot
c26593df5b studio - added in labels and UTC reference for subsection release date UI 2013-04-04 18:27:19 -04:00
Brian Talbot
da6ac54d1a studio - added in labels and UTC reference for section release date modal forms 2013-04-04 18:00:08 -04:00
Brian Talbot
52a2fc7114 changing timeFormat for settings views 2013-04-04 17:45:40 -04:00
cahrens
cc6baf9dd4 Show GMT time, 24-hour. 2013-04-04 17:12:09 -04:00
cahrens
49e0753ef5 Show GMT time, 24-hour. 2013-04-04 16:56:10 -04:00
Brian Talbot
5f316b58ec Merge branch 'master' into feature/btalbot/studio-alerts 2013-04-04 16:55:57 -04:00
Brian Talbot
530f9a87bb studio - minor design tweaks to alert/notification chrome 2013-04-04 16:53:16 -04:00
Brian Talbot
3c3a6e7503 studio - adding in view-based banners UI tweaks and removing global banner UI for now 2013-04-04 16:46:38 -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
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