Chris Dodge
|
7a23893557
|
wip
|
2013-03-26 16:40:28 -04:00 |
|
Brian Talbot
|
4f7e09e936
|
Merge branch 'master' into feature/btalbot/studio-tenderwidget
|
2013-03-26 14:49:14 -04:00 |
|
Brian Talbot
|
7e56e98c58
|
firming up behavior/styling for tender widget - including errors
|
2013-03-26 14:46:38 -04:00 |
|
Will Daly
|
6298a4ceab
|
Fixed lettuce tests in cms that were broken in the last rebase
|
2013-03-26 13:05:09 -04:00 |
|
Brian Talbot
|
8a4047d5dd
|
studio - added smoothscroll to top of view and wired footer tender widget link
|
2013-03-26 12:48:51 -04:00 |
|
Brian Talbot
|
7c68508b85
|
studio - finalized tender widget styling
|
2013-03-26 12:42:30 -04:00 |
|
Will Daly
|
0500ba4dd5
|
Disabled pylint warnings for lettuce steps:
* Missing docstring
* Redefining name from outer scope
|
2013-03-26 11:46:31 -04:00 |
|
Will Daly
|
27d5ebf027
|
pep8 fixes
|
2013-03-26 11:44:57 -04:00 |
|
Will Daly
|
00d25b684c
|
Moved modulestore flush code into terrain/course_helpers
|
2013-03-26 11:44:57 -04:00 |
|
Will Daly
|
a58ae9b62d
|
Refactored studio lettuce test section.py to use more of ui helpers
|
2013-03-26 11:44:57 -04:00 |
|
Will Daly
|
e69931ec5a
|
Refactored studio lettuce tests to use terrain/ui_helpers for ui
manipulation
|
2013-03-26 11:44:56 -04:00 |
|
Brian Talbot
|
87f545329a
|
studio - adding in tender-widget sass file
|
2013-03-26 11:05:33 -04:00 |
|
cahrens
|
f681d4300d
|
More cleanup in base.js.
|
2013-03-26 10:42:44 -04:00 |
|
cahrens
|
83eda6ac93
|
Merge branch 'master' into bug/christina/studio
|
2013-03-26 10:34:37 -04:00 |
|
cahrens
|
69c95ca785
|
Newline cleanup.
|
2013-03-26 09:51:24 -04:00 |
|
Brian Talbot
|
175e1b46e9
|
studio - in progress styling of tender help widget
|
2013-03-26 08:32:49 -04:00 |
|
Calen Pennington
|
83c0feb84c
|
Merge pull request #1738 from MITx/fix/cdodge/too-many-depth-levels
it appears we are taking one too many round trips to do when pre-fetchin...
|
2013-03-26 03:42:19 -07:00 |
|
Chris Dodge
|
269152c4f2
|
add a test scenario to count RT to database when prefetching children. This uses a shim function on pymongo's collection.find to do the counting
|
2013-03-25 23:15:35 -04:00 |
|
Chris Dodge
|
d8f1c2b41a
|
add unit test for proper depth build out
|
2013-03-25 22:49:39 -04:00 |
|
cahrens
|
ce884c44ee
|
Newline cleanup.
|
2013-03-25 17:26:59 -04:00 |
|
cahrens
|
fa63bcce94
|
Allow clearing of dates (except for course start date).
https://edx.lighthouseapp.com/projects/102637/tickets/231
|
2013-03-25 17:25:49 -04:00 |
|
cahrens
|
ccd4db9ac3
|
Writing test.
|
2013-03-25 15:24:53 -04:00 |
|
Brian Talbot
|
66ba0f9b81
|
studio - resolving local merge with master
|
2013-03-25 15:21:25 -04:00 |
|
cahrens
|
c39ff353ea
|
Don't assume input fields will be within a div.
https://edx.lighthouseapp.com/projects/102637/tickets/232
|
2013-03-25 11:09:33 -04:00 |
|
chrisndodge
|
71712ef05d
|
Merge pull request #1729 from MITx/bug/dhm/date-parse
Bug/dhm/date parse
|
2013-03-25 07:15:04 -07:00 |
|
Don Mitchell
|
884019b14c
|
Merge branch 'bug/dhm/date-parse' of github.com:MITx/mitx into bug/dhm/date-parse
Conflicts:
cms/djangoapps/models/settings/course_metadata.py
cms/urls.py
|
2013-03-22 16:56:31 -04:00 |
|
Don Mitchell
|
056b7d3427
|
More unit tests which found another timezone assumption :-)
|
2013-03-22 16:45:21 -04:00 |
|
Don Mitchell
|
862a7d13e9
|
pep8: line length
|
2013-03-22 16:17:37 -04:00 |
|
Don Mitchell
|
8370124e2b
|
Make to and from json for dates use iso format esp for timezone.
|
2013-03-22 16:16:32 -04:00 |
|
cahrens
|
dfdc2cb7d8
|
Remove console.log.
|
2013-03-22 16:11:43 -04:00 |
|
cahrens
|
39714a17d9
|
Merge branch 'master' into bug/christina/cursor-move
Conflicts:
cms/static/js/base.js
|
2013-03-22 16:03:52 -04:00 |
|
Don Mitchell
|
2dcfd1eba1
|
Merge pull request #1719 from MITx/feature/btalbot/studio-checklists
Add course checklists to Studio
|
2013-03-22 12:49:30 -07:00 |
|
cahrens
|
eebef1e647
|
Don't save subsection and unit names until the change event. Fixes bugs #18 and #228.
|
2013-03-22 15:32:13 -04:00 |
|
Christina Roberts
|
1069c2c40a
|
Merge pull request #1722 from MITx/bug/btalbot/studio-pagetitles
Synced up Studio View <titles> with UI headings
|
2013-03-22 11:02:16 -07:00 |
|
cahrens
|
505a382421
|
Re-enable all the tests!
|
2013-03-22 14:00:20 -04:00 |
|
Brian Talbot
|
b4e6b792cf
|
studio - changed the label of view published/live version of unit presented to a user while editing a draft of the same unit
|
2013-03-22 12:01:58 -04:00 |
|
Brian Talbot
|
420c8216aa
|
demo change to resolve push error
|
2013-03-22 11:31:47 -04:00 |
|
Brian Talbot
|
22fd8432c3
|
demo change to resolve push error
|
2013-03-22 11:31:43 -04:00 |
|
Brian Talbot
|
f11e54ddc7
|
studio - syncing up page <title> values with UI titles/headings
|
2013-03-22 11:27:16 -04:00 |
|
Chris Dodge
|
dc983cb9a5
|
add checking for metadata that we can't support editing for in Studio. This is now an error and will have to be addressed by course authors
|
2013-03-22 11:15:14 -04:00 |
|
Christina Roberts
|
14e0387b20
|
Merge pull request #1716 from MITx/bug/orphan
Bug/orphan
|
2013-03-22 07:33:52 -07:00 |
|
cahrens
|
d631509afa
|
Re-enable all the tests!
|
2013-03-22 10:28:36 -04:00 |
|
cahrens
|
a2a1478d92
|
Fix caching bug on back button.
|
2013-03-22 09:51:45 -04:00 |
|
cahrens
|
be4045cb86
|
Reduce pep8 warnings, move Checklistst to top of menu.
|
2013-03-21 22:17:46 -04:00 |
|
cahrens
|
8385db8518
|
Clean up comments.
|
2013-03-21 21:40:38 -04:00 |
|
cahrens
|
016fe196ae
|
Add Python unit tests, don't convert URLs every time.
|
2013-03-21 21:21:24 -04:00 |
|
Brian Talbot
|
7051a94e7b
|
resolved local master merge conflicts with studio sass
|
2013-03-21 16:15:19 -04:00 |
|
cahrens
|
6b3b7fe277
|
Some cleanup.
|
2013-03-21 15:19:45 -04:00 |
|
Jay Zoldak
|
25ceea175c
|
Merge pull request #1710 from MITx/feature/will/speed_up_lettuce_tests
Feature/will/speed up lettuce tests
|
2013-03-21 12:17:07 -07:00 |
|
cahrens
|
0a063342cf
|
Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists
|
2013-03-21 13:56:32 -04:00 |
|