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

12266 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diana Huang
b1716dc2fa Make requested updates to the jobs page 2013-04-08 13:10:04 -04:00
Don Mitchell
c6bec6bcad Merge pull request #1812 from MITx/feature/christina/gmt 
Display UTC on the end of dates (that are in UTC).
 2013-04-08 07:00:08 -07:00
Don Mitchell
6e45db65c2 Merge pull request #1820 from MITx/fix/cdodge/draft-metadata-inheritance 
Fix/cdodge/draft metadata inheritance
 2013-04-08 06:51:54 -07:00
cahrens
c4befa136f pep8 2013-04-08 09:15:07 -04:00
cahrens
f0d2ff7ba4 Change display_timezone to show_timezone. 2013-04-08 09:11:10 -04:00
Chris Dodge
93e27c5f0c remove unsed import 2013-04-08 09:09:51 -04:00
Chris Dodge
9e2409743f remove unsed import 2013-04-08 09:09:35 -04:00
Chris Dodge
052fc5ad11 revert changes to editable_metadata_fields(), so that we can't leave behavior 'as-is' for Christina's work 2013-04-08 09:08:51 -04:00
cahrens
2631452b9c Add display_timezone so course authors can choose not to display timezones in LMS. 2013-04-08 08:46:07 -04:00
cahrens
e4dac6e310 Add display_timezone so course authors can choose not to display timezones in LMS. 2013-04-08 08:38:52 -04:00
Chris Dodge
288620592a get metadata inheritance to work with draft stores. Fix bug on .publish() method whereby inherited metadata got written to the DB as 'own-metadata'. Change filter in mako_module.py to return list of own-metadata and inherited-metadata as 'editable-metadata'. Also, add unit test for draft metadata-inheritance and publish 2013-04-07 19:33:04 -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
d41f5042a5 studio - resolving margin-top issue with views that don't have a masthead 2013-04-05 16:30:51 -04:00
Brian Talbot
1a68d516fb resolving local merge with master 2013-04-05 15:27:08 -04:00
Diana Huang
f7094803c1 Merge pull request #1811 from MITx/fix/diana/press-page 
Remove duplicate entries from the press page.
 2013-04-05 11:52:26 -07: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
Sarina
aca6cdbade Merge pull request #1813 from MITx/fix/vik/pg-progress 
Fix pg progress
 2013-04-05 09:51:13 -07:00
vik
6aada791d8 Fix pg progress 2013-04-05 11:58:16 -04: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
Brian Talbot
4e8f01b88c studio - adjusted abbr cursor displays 2013-04-05 11:18:16 -04:00
Diana Huang
6937f24cbb Remove duplicate entries from the press page. 2013-04-05 11:10:08 -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
chrisndodge
aba17a54a3 Merge pull request #1802 from MITx/feature/markchang/studio-analytics 
Instrument studio for analytics
 2013-04-05 06:50:46 -07:00
Chris Dodge
8e36197cc2 tweeks per Cale's feedback 2013-04-05 09:30:49 -04:00
Calen Pennington
262050e4ff Merge pull request #1778 from MITx/feature/ichuang/add-dump-grades-config-to-instructor-dashboard 
add dump of description of grading configuration to instructor dashboard
 2013-04-05 06:30:43 -07:00
Calen Pennington
1ce362de7d Merge pull request #1807 from MITx/hotfix/gprice/marketing-changes-20120404 
Hotfix/gprice/marketing changes 20120404
 2013-04-05 06:27:52 -07:00
cahrens
2ad3fce27a Show UTC at end of string. 2013-04-05 09:13:17 -04:00
Mark L. Chang
32bc462038 Merge remote-tracking branch 'origin/master' into feature/markchang/studio-analytics 2013-04-04 23:45:06 -04:00
Mark L. Chang
2852256898 added dummy analytics object 2013-04-04 23:44:40 -04:00
ichuang
3b371c17e1 fix syntax error in lms/djangoapps/instructor/views.py 2013-04-05 02:59:24 +00:00
ichuang
8d770c1c04 use isinstance for grader check in lms/djangoapps/instructor/views.py 2013-04-05 02:54:05 +00: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
Greg Price
0c31cac3de Remove Project Manager job listing 
Requested by Conrad via email
 2013-04-04 16:58:48 -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
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
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
Brian Talbot
9ab5710a2a studio - removing unused footer-height variable 2013-04-04 15:32:42 -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
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