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 |
|
Chris Dodge
|
5b7d882e3e
|
Merge branch 'feature/cdodge/auto-forum-provision' into fix/cdodge/studio-forum-improvements
|
2013-04-06 11:02:21 -04:00 |
|
Chris Dodge
|
b78eed3c22
|
Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/auto-forum-provision
|
2013-04-06 10:58:26 -04:00 |
|
Chris Dodge
|
7c48f9a5ed
|
add unit test to verify that the store updated signal actually fired. Also fix bug where cloning item doesn't update the inherited metadata caches
|
2013-04-06 10:43:40 -04:00 |
|
Kevin Chugh
|
24095679a6
|
add back comment response flagging
|
2013-04-05 19:04:18 -04:00 |
|
Brian Talbot
|
f31588c81b
|
studio - resolving section release date form issues (labels, saving, updating)
|
2013-04-05 16:44:09 -04:00 |
|
Kevin Chugh
|
de7c511328
|
flagging working again
|
2013-04-05 16:39:22 -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 |
|
Chris Dodge
|
a3de4ff625
|
add unit test to confirm 'id' generation
|
2013-04-05 15:59:01 -04:00 |
|
Chris Dodge
|
0781f3e166
|
add new file
|
2013-04-05 15:28:19 -04:00 |
|
Chris Dodge
|
e717244611
|
remove discussion cache, which isn't used
|
2013-04-05 15:27:50 -04:00 |
|
Brian Talbot
|
1a68d516fb
|
resolving local merge with master
|
2013-04-05 15:27:08 -04:00 |
|
Brian Talbot
|
386f57ea6e
|
Merge branch 'master' into feature/btalbot/studio-alerts
|
2013-04-05 15:18:05 -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 |
|
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 |
|
Chris Dodge
|
7a334c6789
|
go back to exporting draft/private verticals, but also set additional xml attributes so that we can re-tie in the draft stuff into the sequence's children
|
2013-04-05 14:34:44 -04:00 |
|
Kevin Chugh
|
0e8ef28347
|
flagging almost done
|
2013-04-05 13:23:09 -04: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 |
|
Chris Dodge
|
3d7f893259
|
Merge branch 'master' of github.com:MITx/mitx into feature/cdodge/auto-forum-provision
|
2013-04-05 13:19:10 -04:00 |
|
Chris Dodge
|
5bbfe87005
|
fix various pop8/pylint violations. switch hasattr() to getattr()
|
2013-04-05 13:18:48 -04:00 |
|
Chris Dodge
|
dbf58c0d54
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules
|
2013-04-05 12:53:24 -04: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 |
|