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

12186 Commits

This Branch
This Branch
All Branches
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
cahrens
fa31953924 Update tests for GMT, get Advanced Settings test to pass reliably. 2013-04-05 10:47:58 -04:00
cahrens
2ad3fce27a Show UTC at end of string. 2013-04-05 09:13:17 -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
Brian Talbot
ceb4c719f7 changing default timeFormat within datepair.js for instances where the plugin is called by default HTML classes 2013-04-04 17:38:14 -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
Calen Pennington
9075e84430 Merge pull request #1774 from MITx/feature/ichuang/conditional-def-msg 
add default message to conditional
 2013-04-04 13:39:19 -07:00
Christina Roberts
de44813732 Merge pull request #1808 from MITx/bug/christina/studio 
Show course end date on course about page
 2013-04-04 13:34:00 -07:00
cahrens
57343c7d9e On course about page, display course end date if no about page HTML blog (end_date.html) exists. 
#224
 2013-04-04 15:35:07 -04:00
cahrens
bd055ddc22 On course about page, display course end date if no about page HTML blog (end_date.html) exists. 
#224
 2013-04-04 15:30:34 -04:00
cahrens
d02dc37d9f On course about page, display course end date if no about page HTML blog (end_date.html) exists. 
#224
 2013-04-04 15:22:56 -04:00
Calen Pennington
5873721e1b Merge pull request #1800 from MITx/hotfix/stanford-press-release 
Stanford press release
 2013-04-04 11:59:05 -07:00
Calen Pennington
99424a9716 Merge pull request #1792 from MITx/fix/ichuang/duplicate-entry-error 
fix IntegrityError duplicate entry issue with module_data Scope.student_state update
 2013-04-04 11:57:59 -07:00
Calen Pennington
e97e8ce5b6 Merge pull request #1781 from MITx/feature/ichuang/xqueue-callback-url-cleanup 
clean up xqueue callback url generation; allow override from settings
 2013-04-04 11:54:13 -07:00
Diana Huang
d9d151b35e Merge pull request #1768 from MITx/fix/diana/input-state-tests 
Tests to make sure that input_states have the correct keys
 2013-04-04 11:39:34 -07:00
Calen Pennington
ff8dca943c Merge pull request #1775 from MITx/feature/ichuang/gitreload-fix 
fix lms migration to be compatible with xblock
 2013-04-04 11:17:38 -07:00
Diana Huang
42614c69b4 Add space after comma. 2013-04-04 14:16:38 -04:00
Diana Huang
02b7ab4fa0 Tests to make sure that input_states have the correct keys 
and are not cross-pollinating
 2013-04-04 13:47:55 -04:00
chrisndodge
79677e92ca Merge pull request #1780 from MITx/feature/ichuang/staff-email-for-course-creation 
email link for course creation request (in Studio)
 2013-04-04 10:40:51 -07: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
Calen Pennington
72ce1af982 Merge pull request #1424 from MITx/feature/ichuang/fix-forum-management-commands 
fix forum management commands (assign_default_role was moved)
 2013-04-04 10:14:31 -07:00
Calen Pennington
7f19d48985 Merge pull request #1795 from MITx/feature/cale/use-open-source-xblock 
Migrate to the open source XBlock repo
 2013-04-04 10:12:00 -07:00
brianhw
b7c8a6977e Merge pull request #1805 from MITx/fix/brian/user-on-progress 
add user name and email to progress page
 2013-04-04 10:09:52 -07: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
Brian Wilson
d3e7739b3b add user name and email to progress page 2013-04-04 12:03:08 -04:00
Will Daly
1b7e552d5d Merge pull request #1804 from MITx/fix/brian/remove-input-state-logging 
add progress logging while running remove_input_state management command
 2013-04-04 08:32:45 -07:00
Brian Wilson
4c511c3c66 add progress logging 2013-04-04 11:14:52 -04:00
Calen Pennington
039ccb83cc Migrate to the open source XBlock repo 2013-04-04 10:55:31 -04:00
Diana Huang
8304e9031c Merge pull request #1797 from MITx/diana/fix-matlab-queueing-message 
Matlab Unit Tests and Minor Bugfix
 2013-04-04 07:39:05 -07:00
Will Daly
fb14bedfdf Merge pull request #1803 from MITx/fix/zoldak/pep8-psychometrics 
pep8 fixes for psychoanalyze and capa module
 2013-04-04 07:26:13 -07:00
Jay Zoldak
22017ac24c pep8 fixes for psychoanalyze and capa module 2013-04-04 09:57:19 -04:00
Piotr Mitros
1717782c5b Merge pull request #1776 from MITx/feature/ichuang/psychometrics-fix 
fix psychometrics to be compatible with new xblocks
 2013-04-04 05:50:59 -07:00
John Jarvis
d2313d851a renaming image 2013-04-03 16:02:41 -04:00
John Jarvis
b2e8780f9b adding a smaller stanford image 2013-04-03 16:01:15 -04:00
John Jarvis
e8ee6616c4 removing old logo 2013-04-03 15:39:46 -04:00
John Jarvis
6d78425a82 dding stanford-univ logo 2013-04-03 15:39:22 -04:00
John Jarvis
1c581835f2 changing stanford logo 2013-04-03 15:39:11 -04:00
Christina Roberts
56d5f13b5e Merge pull request #1801 from MITx/fix/btalbot/studio-outlinedates 
Resolving display issues around outline release dates
 2013-04-03 12:38:51 -07:00
John Jarvis
71cfc4441b university->logo 2013-04-03 15:37:12 -04:00
John Jarvis
0c81329fa5 updating image link 2013-04-03 15:35:50 -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
John Jarvis
7b226c34f8 Adding new logo for stanford 2013-04-03 15:34:54 -04:00
cahrens
f77aaec392 Need to mock datetime.datetime.utcnow. 2013-04-03 15:33:51 -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
Diana Huang
2230fe3c23 Set the queue_len more consistently. 2013-04-03 15:08:33 -04:00
Victor Shnayder
9f9748b9fa Stanford press release 2013-04-03 14:26:06 -04:00