Arthur Barrett
|
610e210cc8
|
Merge branch 'feature/victor/annotation-input' into feature/abarrett/annotatable_xmodule
|
2013-02-20 11:32:46 -05:00 |
|
Arthur Barrett
|
33c12647cb
|
Merge branch 'master' into feature/abarrett/annotatable_xmodule
|
2013-02-20 11:31:53 -05:00 |
|
Arthur Barrett
|
2f68cba24d
|
merged from master
|
2013-02-20 11:07:46 -05:00 |
|
Diana Huang
|
03a4deb847
|
Merge pull request #1489 from MITx/feature/vik/settings-to-xmodule
Feature/vik/settings to xmodule
|
2013-02-20 08:06:20 -08:00 |
|
Christina Roberts
|
52caae2fee
|
Merge pull request #1515 from MITx/feature/btalbot/studio-pagechrome
Adding in Studio Page headers and actions + help text
|
2013-02-20 06:44:16 -08:00 |
|
Jay Zoldak
|
7dd1515f5d
|
Merge pull request #1517 from MITx/feature/zoldak/refactor-terrain
Refactor lettuce tests to move common stuff out of lms and cms and into common
|
2013-02-20 06:43:09 -08:00 |
|
Jay Zoldak
|
30edc380e1
|
Change coverage report config to reflect refactoring of terrain files
|
2013-02-20 09:31:50 -05:00 |
|
Victor Shnayder
|
c1c050a6b6
|
WIP on an inputtype for heroesX annotation
- has a text area for saved but (currently) ungraded comments
- has a set of tags with weights
|
2013-02-19 17:35:40 -05:00 |
|
Brian Talbot
|
266e8951a4
|
made necessary code revisions per https://github.com/MITx/mitx/pull/1515/files#r3069750
|
2013-02-19 17:18:09 -05:00 |
|
Jay Zoldak
|
db6fa9a3aa
|
Pep8fix lettuce test code
|
2013-02-19 16:46:32 -05:00 |
|
Jay Zoldak
|
040f840c9d
|
Remove portal (fake) app, move tests to courseware.
Comment out tests that don't run correctly without prerequisites.
|
2013-02-19 16:46:32 -05:00 |
|
Jay Zoldak
|
9096914782
|
Move terrain module from lms to common.
|
2013-02-19 16:46:32 -05:00 |
|
Vik Paruchuri
|
2b01ecc1af
|
Merge remote-tracking branch 'origin/master' into feature/vik/settings-to-xmodule
|
2013-02-19 15:21:47 -05:00 |
|
Arthur Barrett
|
34cc112cfb
|
Saving work in progress on annotations v2 with classification problems.
|
2013-02-19 14:18:56 -05:00 |
|
David Ormsbee
|
821e2d06e9
|
Merge pull request #1466 from MITx/feature/ichuang/fix-idashboard-error-message
Fix error message provided by Instructor dashboard datadump - make it more useful
|
2013-02-19 11:08:21 -08:00 |
|
Jay Zoldak
|
8c423da6db
|
Updated test to reflect new class name for course titles.
|
2013-02-19 13:50:40 -05:00 |
|
Jay Zoldak
|
301d58d648
|
Update lettuce test with new button name for add new section.
|
2013-02-19 13:31:11 -05:00 |
|
Brian Talbot
|
585dff521a
|
Merge branch 'master' into feature/btalbot/studio-pagechrome
|
2013-02-19 12:27:49 -05:00 |
|
Brian Talbot
|
fca98c19a5
|
studio - adding in info icon to page intro help and making icon classes consistent in all new references
|
2013-02-19 12:13:08 -05:00 |
|
Christina Roberts
|
94a28f600b
|
Merge pull request #1510 from MITx/bug/btalbot/html-strongspan
xmodule scss - resolved studio bug #191
|
2013-02-19 09:09:47 -08:00 |
|
cahrens
|
596de8ab2c
|
Hook up "View Live" buttons and get "New Static Tab" working again.
|
2013-02-19 11:34:41 -05:00 |
|
VikParuchuri
|
0db6247d96
|
Merge pull request #1513 from MITx/feature/vik/improve-oe-ui
Skip self assessment test (fails due to need for querydict for getlist t...
|
2013-02-19 08:15:42 -08:00 |
|
Vik Paruchuri
|
9ee956a397
|
Skip self assessment test (fails due to need for querydict for getlist to work, but mocking querydict is painful)
|
2013-02-19 11:05:43 -05:00 |
|
Calen Pennington
|
956789e510
|
Merge pull request #1512 from MITx/fix/zoldak/coveragerc
Omit migrations from code coverage reports.
|
2013-02-19 07:57:09 -08:00 |
|
Jay Zoldak
|
2e85ba1a27
|
Omit migrations from code coverage reports.
Also omit portal and terrain, which are used for the lettuce testing framework.
|
2013-02-19 10:54:02 -05:00 |
|
Vik Paruchuri
|
4d57f1b9ee
|
Merge remote-tracking branch 'origin/master' into feature/vik/settings-to-xmodule
|
2013-02-19 10:43:55 -05:00 |
|
Diana Huang
|
f4addddf42
|
Merge pull request #1484 from MITx/feature/vik/improve-oe-ui
Feature/vik/improve oe ui
|
2013-02-19 07:27:29 -08:00 |
|
Brian Talbot
|
6d2ada5084
|
xmodule scss - resolved some general span styling that would override basic em or strong type styling
|
2013-02-19 09:59:36 -05:00 |
|
Christina Roberts
|
a62a575a33
|
Merge pull request #1506 from MITx/feature/btalbot/studio-softlanding
Soft Landing UI, Studio Nav Revamp, Sign In/Up Revisions
|
2013-02-19 06:34:32 -08:00 |
|
Arthur Barrett
|
72d9c1d7d2
|
Saving work-in-progress of guided classification exercise.
|
2013-02-18 19:02:54 -05:00 |
|
Don Mitchell
|
cfa13922f5
|
Change url for login from login to signin.
|
2013-02-15 17:30:24 -05:00 |
|
Brian Talbot
|
9eb02a8a26
|
studio - resolving base.js spacing/conflicts
|
2013-02-15 16:57:42 -05:00 |
|
Diana Huang
|
3e23b9e1f2
|
Merge pull request #1480 from MITx/diana/staff-grading-flagging
Flag submissions from staff grading view
|
2013-02-15 13:08:16 -08:00 |
|
cahrens
|
5acf9cb3d2
|
Reformat to 4 spaces.
|
2013-02-15 14:46:41 -05:00 |
|
cahrens
|
2486ebc22a
|
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
|
2013-02-15 14:45:20 -05:00 |
|
Brian Talbot
|
3c6caa611c
|
resolving local merge
|
2013-02-15 14:24:42 -05:00 |
|
Brian Talbot
|
86d9f0b65c
|
resolving local merge
|
2013-02-15 14:15:51 -05:00 |
|
cahrens
|
37e4cd81b1
|
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
|
2013-02-15 14:15:03 -05:00 |
|
Brian Talbot
|
93949ab342
|
resolving local merge problem
|
2013-02-15 14:12:46 -05:00 |
|
Brian Talbot
|
a5e2b5c53a
|
resolving merge conflict and missing Sass mixin
|
2013-02-15 14:10:52 -05:00 |
|
Jay Zoldak
|
34a4b35e66
|
Fix lettuce acceptance tests to reflect the new soft landing page changes.
|
2013-02-15 14:07:46 -05:00 |
|
Arthur Barrett
|
9fb80ec3df
|
Removed console.log.
|
2013-02-15 13:50:57 -05:00 |
|
Arthur Barrett
|
24f519e32f
|
Moved the return link above the inline discussion and updated the header styling so the hide annotations button is right-aligned with the help icon.
|
2013-02-15 13:46:38 -05:00 |
|
cahrens
|
b49325009a
|
Merge branch 'master' into feature/btalbot/studio-softlanding
|
2013-02-15 13:14:46 -05:00 |
|
Christina Roberts
|
dceb8fee5e
|
Merge pull request #1494 from MITx/feature/marco/addcomponent
Feature/marco/addcomponent
|
2013-02-15 10:13:24 -08:00 |
|
Don Mitchell
|
c4586edb2e
|
Change hardcoded template names to the newer hardcoded template names
:-(
|
2013-02-15 12:03:04 -05:00 |
|
Brian Talbot
|
cb127d473d
|
studio - page headers: revised where new course form fields are placed in dashboard
|
2013-02-15 11:40:06 -05:00 |
|
Brian Talbot
|
c5d041a7a3
|
resolved local merge
|
2013-02-15 11:29:56 -05:00 |
|
Brian Talbot
|
995ec8db62
|
resolved local merge
|
2013-02-15 11:28:54 -05:00 |
|
Carlos Andrés Rocha
|
86865a6823
|
Merge pull request #1507 from MITx/bugfix/valera/video_alpha
Bugfix/valera/video alpha
|
2013-02-15 08:22:25 -08:00 |
|