marco
370df65d89
Merge branch 'master' into ux/marco/studio-componentsettings
2013-05-03 09:04:03 -07:00
marco
b9da0ffb0a
reverting all variables in attempt to properly load unit pages
2013-05-03 09:02:32 -07:00
marco
110a51b74e
removing variable names to get it to run again
2013-05-03 08:40:35 -07:00
marco
036991dce8
moved bad variable name
2013-05-03 08:10:37 -07:00
marco
c842a5fc7c
plugged in more pseudo code for various css class states necessary as well as examples for dropdown case and extra logic required there
2013-05-03 00:33:58 -07:00
marco
fbaed2e28b
added shell of css and html organization
2013-05-03 00:00:10 -07:00
Diana Huang
182d69e36c
Add cookie name to the cms settings so we don't error out
...
while looking for it
2013-05-02 17:21:49 -04: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
marco
d55527b693
changes with aria
2013-05-01 17:22:09 -04:00
marco
e697e495ca
Merge branch 'master' into ux/marco/studio-componentsettings
2013-05-01 17:21:16 -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
marco
30240ff01a
non revision
2013-04-29 19:53:16 -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
marco
94390e4314
aria tabs v1
2013-04-29 14:20:37 -04:00
marco
80d46401bf
Merge branch 'master' into ux/marco/studio-componentsettings
2013-04-29 10:19:22 -04:00
marco
45a665c7c7
added mode bar up top
2013-04-29 10:18:56 -04: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
Calen Pennington
8dc0df3e6b
Don't ignore the old directories for xmodule sass and coffeescript
2013-04-29 07:32:16 -04:00
Chris Dodge
7d206e020d
remove comment which is no longer valid as well as debug log messages
2013-04-26 16:13:26 -04:00
Chris Dodge
bbea8eb9f3
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/dangling-verticals-on-delete
2013-04-26 15:25:47 -04:00
Chris Dodge
55266f6e96
add a overview.yaml template and also clone that template into a newly created course
2013-04-26 13:39:22 -04:00
Chris Dodge
2e64bc33ff
make sure delete_item always uses the draft store
2013-04-26 12:37:37 -04:00
Calen Pennington
8c54d5d610
Fix accidental force push that reset master
...
Master went from 5d912b88616f05c5ec10e89b336bd1088042bba0 to
e43c2bd410
2013-04-26 10:50:53 -04:00
Chris Dodge
ead18f9fbb
undo the unit test, as per Jeh, the tests really aren't supposed to run the CMS with 'draft
...
awareness'
2013-04-26 10:30:39 -04:00
Chris Dodge
f6417b4f71
add a delete-all-versions flag to the delete_item method in the modulestores. Extend tests to verify. Still wip
2013-04-25 15:24:31 -04:00
Mark L. Chang
05c5a9401a
changed class to course
2013-04-25 13:44:14 -04:00
Calen Pennington
9d94adbd1f
Merge pull request #1871 from MITx/feature/cale/fast-dev-server
...
Speed up local development
2013-04-24 12:12:05 -07:00
cahrens
cc2d06975e
Remove duplicated StringyX definitions.
2013-04-24 14:59:32 -04:00
Brian Talbot
5681f94a96
studio - commented in the static HTML boilerplate for the course overview field - needs wiring to CodeMirror with a setVal() method
2013-04-24 14:55:04 -04:00
Steve Strassmann
dd71ae818a
ModuleStoreTestCase moved to new location
2013-04-24 11:33:47 -04:00
Steve Strassmann
111ec62bb6
merged from master
2013-04-24 10:42:35 -04:00
