Steve Strassmann
|
e76419093d
|
uncommit unneeded files
|
2013-04-17 12:25:23 -04:00 |
|
Steve Strassmann
|
6e34c668bb
|
introduce i18n
|
2013-04-17 11:30:29 -04:00 |
|
Diana Huang
|
e981226d8d
|
Merge pull request #1823 from MITx/diana/job-page-update
Make requested updates to the jobs page
|
2013-04-08 11:45:35 -07:00 |
|
Mark L. Chang
|
1500586f70
|
Merge pull request #1827 from MITx/fix/btalbot/studio-socktypo
studio - corrected a typo and adjusted copy on the help sock
|
2013-04-08 11:23:16 -07:00 |
|
chrisndodge
|
9a405ff44c
|
Merge pull request #1822 from MITx/fix/cdodge/add-more-container-types-to-inherit-through
extend the list of container module names to our comuputation of inherit...
|
2013-04-08 11:11:14 -07:00 |
|
Brian Talbot
|
e3a1279c8f
|
studio - corrected a typo and adjusted copy on the help sock
|
2013-04-08 14:10:38 -04:00 |
|
Mark L. Chang
|
caa2539893
|
Merge pull request #1826 from MITx/fix/cdodge/dont-blowup-index-if-no-course-is-None
mark stumble on case where he had a None course
|
2013-04-08 11:10:15 -07:00 |
|
Chris Dodge
|
472e657692
|
mark stumble on case where he had a None course
|
2013-04-08 14:07:37 -04:00 |
|
Don Mitchell
|
c14d046d2f
|
Merge pull request #1824 from MITx/feature/cdodge/improve-cms-test-coverage
add a simple Studio walkthough to check page loads
|
2013-04-08 10:58:47 -07:00 |
|
Chris Dodge
|
5137119f2b
|
add a simple Studio walkthough to check page loads
|
2013-04-08 13:55:38 -04:00 |
|
Diana Huang
|
b1716dc2fa
|
Make requested updates to the jobs page
|
2013-04-08 13:10:04 -04:00 |
|
Chris Dodge
|
7cd4310c32
|
extend the list of container module names to our comuputation of inherited metadata
|
2013-04-08 12:12:23 -04:00 |
|
chrisndodge
|
146f09b788
|
Merge pull request #1821 from MITx/fix/cdodge/student-to-user-name-change
xblock changed attribute names from 'student' to 'user'. Need to update ...
|
2013-04-08 08:20:19 -07:00 |
|
chrisndodge
|
a57e0fa2c5
|
Merge pull request #1819 from MITx/feature/ichuang/fix-edit-links-and-giturl
make "edit" links work - fixes giturl (was broken by xblocks migration)
|
2013-04-08 08:17:31 -07:00 |
|
Chris Dodge
|
0949754cd4
|
xblock changed attribute names from 'student' to 'user'. Need to update consumers
|
2013-04-08 10:56:40 -04:00 |
|
chrisndodge
|
4b925520b8
|
Merge pull request #1818 from MITx/feature/ichuang/dump-grading-config-fix
fix typo in instructor dashboard dump grading config
|
2013-04-08 07:28:22 -07: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 |
|
ichuang
|
f88b5794e4
|
fix default giturl link
|
2013-04-07 00:51:07 +00:00 |
|
ichuang
|
d2768c644e
|
not all modules have xml_attributes ; be careful about this in xmodule_modifier
|
2013-04-07 00:20:46 +00:00 |
|
ichuang
|
8cafadc03b
|
make "edit" links work - fixes giturl (was broken by xblocks migration)
Conflicts:
lms/templates/staff_problem_info.html
lms/xmodule_namespace.py
|
2013-04-07 00:03:36 +00:00 |
|
ichuang
|
51d882b7b0
|
fix typo in instructor dashboard dump grading config
|
2013-04-06 18:32:23 +00: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 |
|