Arthur Barrett
|
be98b5fa3e
|
merged master. resolved conflict in cms/djangoapps/contentstore/views.py (added word_cloud to advanced_modules list)
|
2013-05-13 13:26:55 -04:00 |
|
Chris Dodge
|
0ef2944d43
|
Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting
|
2013-05-13 11:13:43 -04:00 |
|
Mark L. Chang
|
85ae7b9744
|
Merge pull request #2012 from edx/feature/markchang/500-copy-change
copy change
|
2013-05-13 08:12:02 -07:00 |
|
Chris Dodge
|
4d197e10ec
|
fix some violations. Build up karma
|
2013-05-13 11:10:11 -04:00 |
|
Chris Dodge
|
d32e7a5b61
|
Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting
|
2013-05-13 11:06:49 -04:00 |
|
Chris Dodge
|
3cf865a88f
|
added another unit test check point for export/import of classic textbooks
|
2013-05-13 10:16:18 -04:00 |
|
Chris Dodge
|
d98e726a8e
|
Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting
|
2013-05-13 09:51:05 -04:00 |
|
Alexander Kryklia
|
bdc62e7d2e
|
word cloud studio integration
|
2013-05-13 14:44:09 +03:00 |
|
Mark L. Chang
|
f864a6c00c
|
more copy tweaks
|
2013-05-11 16:16:30 -04:00 |
|
Mark L. Chang
|
317831a813
|
copy change
|
2013-05-11 16:16:30 -04:00 |
|
Arthur Barrett
|
beabdf1434
|
Merge branch 'master' into feature/abarrett/lms-notes-app
|
2013-05-11 14:52:39 -04:00 |
|
Jason Bau
|
408e26a0c1
|
parameterizes CMS email settings
|
2013-05-10 13:42:28 -07:00 |
|
Chris Dodge
|
1db66957af
|
Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting
|
2013-05-10 15:44:55 -04:00 |
|
Chris Dodge
|
1b0eff52ed
|
create test cases to simulate error exporting/importing textbooks
|
2013-05-10 10:01:10 -04:00 |
|
Calen Pennington
|
ea859bd6c7
|
Filter out the template course from the mongo modulestore get_courses function
|
2013-05-09 16:22:23 -04:00 |
|
Arthur Barrett
|
dd583ce4f9
|
Merge branch 'master' into feature/abarrett/lms-notes-app
|
2013-05-09 14:32:05 -04:00 |
|
David Baumgold
|
d09e93142f
|
Merge pull request #1980 from edx/backbone-1.0.0
Upgrade to Backbone 1.0.0
|
2013-05-09 09:34:35 -07:00 |
|
Arthur Barrett
|
c7197cd567
|
Merge branch 'master' into feature/abarrett/lms-notes-app
|
2013-05-08 18:04:24 -04:00 |
|
Brian Talbot
|
25dd2c7d67
|
studio - alerts: synced up example HTML to show advanced settings live notification, aria roles, and action classes; integrated typography mixins
|
2013-05-08 15:30:17 -04:00 |
|
David Baumgold
|
7f69e45b9e
|
whitespace changes
|
2013-05-08 09:29:20 -04:00 |
|
Arthur Barrett
|
eca155f99a
|
Merge branch 'master' into feature/abarrett/lms-notes-app
|
2013-05-07 17:27:40 -04:00 |
|
Arthur Barrett
|
0ed07779c8
|
kludged in the note tab panel so it can be turned on and off using the policy editor by adding "notes" to "advanced_modules."
|
2013-05-07 17:27:06 -04:00 |
|
Christina Roberts
|
729ca900e6
|
Merge pull request #1920 from edx/feature/christina/fields
Pass additional field information from editable_metadata_fields, remove system_metadata_fields variable.
|
2013-05-07 09:38:34 -07:00 |
|
cahrens
|
594d28a653
|
Pass default value through.
|
2013-05-06 16:03:41 -04:00 |
|
cahrens
|
84ff2a0941
|
Merge branch 'master' into feature/christina/fields
|
2013-05-06 12:42:18 -04:00 |
|
David Baumgold
|
b344976fe7
|
Making linters happier
|
2013-05-03 15:08:28 -04:00 |
|
Steve Strassmann
|
dea1198d75
|
Merge pull request #1925 from edx/bug/straz/date
Bug/straz/date - fix date interpolation
|
2013-05-03 09:32:00 -07:00 |
|
cahrens
|
0a1902e7da
|
Merge branch 'master' into feature/christina/fields
|
2013-05-02 16:29:03 -04:00 |
|
cahrens
|
e0ebe6dacb
|
Remove TODO.
|
2013-05-02 13:53:17 -04:00 |
|
cahrens
|
c01410626f
|
Jasmine test for changedMetadata method.
|
2013-05-02 13:39:20 -04:00 |
|
Jay Zoldak
|
fc1a22de55
|
Merge pull request #1921 from edx/fix/zoldak/cms-jasmine-tests
Remove localization middleware from jasmine test execution
|
2013-05-02 09:45:58 -07:00 |
|
cahrens
|
c7713b6211
|
Merge branch 'master' into feature/christina/fields
|
2013-05-02 12:32:56 -04:00 |
|
cahrens
|
46100fd258
|
Cleanup.
|
2013-05-02 12:32:32 -04:00 |
|
cahrens
|
93f10ae8a0
|
Only save changed metadata fields.
|
2013-05-02 11:41:38 -04:00 |
|
Steve Strassmann
|
c9a80ded25
|
formatted using sublime/formatjs
|
2013-05-02 10:59:02 -04:00 |
|
cahrens
|
01ede40b03
|
Switching branches
|
2013-05-02 09:43:03 -04:00 |
|
Steve Strassmann
|
485d07a722
|
tabbing
|
2013-05-02 09:31:53 -04:00 |
|
Steve Strassmann
|
7c972ebf6e
|
fix date interpolation
|
2013-05-02 09:29:27 -04:00 |
|
brianhw
|
3650316ff5
|
Merge pull request #1922 from MITx/fix/cdodge/jsi18n-include
add leading slash to the jsi18n include
|
2013-05-01 13:06:38 -07:00 |
|
Chris Dodge
|
d807b955f7
|
add leading slash to the jsi18n include
|
2013-05-01 15:27:36 -04:00 |
|
Jay Zoldak
|
bdfe1cff39
|
Remove localization middleware from jasmine test execution
|
2013-05-01 11:34:28 -04:00 |
|
Jay Zoldak
|
f2fd90bc61
|
Merge pull request #1917 from MITx/fix/cale/lms-jasmine-tests
Fix/cale/lms jasmine tests
|
2013-05-01 08:23:41 -07:00 |
|
cahrens
|
13fe9c11cb
|
Merged with master.
|
2013-05-01 09:33:35 -04:00 |
|
Christina Roberts
|
a537bd7f05
|
Merge pull request #1908 from MITx/fix/btalbot/studio-courseinfo
Fix/btalbot/studio courseinfo
|
2013-04-30 13:34:52 -07:00 |
|
Jay Zoldak
|
aa4e29d2f1
|
Add leanModal vendor src to files.json for cms jasmine tests. Also .gitignore compiled js from coffee specs
|
2013-04-30 15:22:08 -04:00 |
|
Calen Pennington
|
dfd369b9e9
|
Make ordering of js bundles during jasmine tests consistant
|
2013-04-30 14:09:17 -04:00 |
|
Steve Strassmann
|
cdfd7c807f
|
fix bad url for jsi18n
|
2013-04-29 17:13:24 -04:00 |
|
cahrens
|
8705ff8805
|
Remove system_metadata_fields.
|
2013-04-29 16:41:07 -04:00 |
|
Christina Roberts
|
72dfd4995e
|
Merge pull request #1903 from MITx/fix/cdodge/dangling-verticals-on-delete
Fix/cdodge/dangling verticals on delete
|
2013-04-29 11:58:22 -07:00 |
|
Chris Dodge
|
d7693d96b7
|
unit test should just use direct store. Also remove unused import and logging.
|
2013-04-29 09:18:49 -04:00 |
|