Brian Talbot
|
aaf95ddbba
|
studio - course link: roughed in new markup/location of course link to share
|
2013-04-08 14:09:18 -04:00 |
|
Chris Dodge
|
472e657692
|
mark stumble on case where he had a None course
|
2013-04-08 14:07:37 -04:00 |
|
Brian Talbot
|
bcf4775610
|
studio - alerts: removed banners as a design pattern (not using them) and corrected advanced setting links and smoothscrolling
|
2013-04-08 13:47:01 -04:00 |
|
cahrens
|
7f1c89b492
|
Merge branch 'master' into feature/btalbot/studio-alerts
|
2013-04-08 10:28:52 -04:00 |
|
Brian Talbot
|
a6c35fb2ce
|
studio - addressing pull request to merge to master feedback
|
2013-04-08 09:30:09 -04:00 |
|
Chris Dodge
|
5b7d882e3e
|
Merge branch 'feature/cdodge/auto-forum-provision' into fix/cdodge/studio-forum-improvements
|
2013-04-06 11:02:21 -04:00 |
|
Brian Talbot
|
f31588c81b
|
studio - resolving section release date form issues (labels, saving, updating)
|
2013-04-05 16:44:09 -04:00 |
|
Brian Talbot
|
1a68d516fb
|
resolving local merge with master
|
2013-04-05 15:27:08 -04:00 |
|
Brian Talbot
|
512e4fe3bd
|
resolving local merge with master and sprucing style and templates for merge with master
|
2013-04-05 15:13:21 -04:00 |
|
Christina Roberts
|
33d39a85a9
|
Merge pull request #1809 from MITx/feature/btalbot/studio-helpsock
Studio Help Sock
|
2013-04-05 11:37:57 -07:00 |
|
Chris Dodge
|
f84eaf01b8
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements
|
2013-04-05 13:20:02 -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 |
|
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 |
|
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
|
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 |
|
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
|
1c7e13e1e8
|
copy change
|
2013-04-04 11:54:37 -04:00 |
|
Mark L. Chang
|
8fb6ce2eca
|
added tracking to unit page and components
|
2013-04-04 01:51:15 -04:00 |
|
Mark L. Chang
|
64b7603d37
|
outline page event tracking
|
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
|
d87c4e3866
|
resolving local merge with master
|
2013-04-03 15:01:55 -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 |
|
Don Mitchell
|
9a7324ebfa
|
Merge pull request #1798 from MITx/bug/christina/studio
Fix due date bug.
|
2013-04-03 10:26:40 -07:00 |
|
Brian Talbot
|
65768e813b
|
resolving local merge conflict
|
2013-04-03 10:00:38 -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
|
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
|
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 |
|
cahrens
|
42b4ffdcf9
|
Cleanup.
|
2013-04-01 13:40:32 -04:00 |
|
cahrens
|
16f4a3f9c1
|
Convert due date to a Date (vs. a string with no year).
|
2013-04-01 11:37:05 -04: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 |
|
Brian Talbot
|
f85e18ed3b
|
studio - resolving local merge
|
2013-03-29 10:20:08 -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
|
653369e3cf
|
resolving local stash merge
|
2013-03-28 12:37:58 -04:00 |
|
cahrens
|
7279f9c460
|
Bug fix for grading type not showing on course outline (#258).
|
2013-03-28 10:54:10 -04:00 |
|
cahrens
|
2d677a834c
|
Test for due dates.
|
2013-03-28 10:24:31 -04:00 |
|
Brian Talbot
|
c8ab45cc57
|
studio - footer help ui revamp - animation, structure, styling - WIP
|
2013-03-27 17:40:24 -04:00 |
|
Brian Talbot
|
756f75951d
|
studio - in progress work on help UI
|
2013-03-27 16:28:49 -04:00 |
|