Vik Paruchuri
|
aca73d2123
|
Start to document and sanitize error messages
|
2013-02-13 16:13:34 -05:00 |
|
Vik Paruchuri
|
48a5c9f0b2
|
Remove score display from status bar
|
2013-02-13 16:05:12 -05:00 |
|
Arthur Barrett
|
010593be6f
|
Merge branch 'master' into feature/abarrett/annotatable_xmodule
|
2013-02-13 15:39:41 -05:00 |
|
Vik Paruchuri
|
02b0bc2923
|
Add in answer unknown container/checkbox to pass back to controller
|
2013-02-13 15:37:42 -05:00 |
|
Vik Paruchuri
|
7a3a56d4bc
|
Fixing tests
|
2013-02-13 15:20:59 -05:00 |
|
John Hess
|
d48efa8592
|
Merge pull request #1498 from MITx/jth/protex
Jth/protex
|
2013-02-13 12:18:21 -08:00 |
|
Vik Paruchuri
|
5f29e0e1a6
|
Fix OE tests
|
2013-02-13 15:11:37 -05:00 |
|
John Hess
|
259bd8817f
|
Moved onclick to 'fold' button instead of to courseware's button
|
2013-02-13 15:10:32 -05:00 |
|
Brian Talbot
|
e23c99961d
|
studio - page headers: completed basic styling and simple page set-ups
|
2013-02-13 15:03:26 -05:00 |
|
Calen Pennington
|
f0f7e0dc1c
|
Fix more tests
|
2013-02-13 14:22:08 -05:00 |
|
Calen Pennington
|
bd822b9d2f
|
Fix tests post-merge
|
2013-02-13 14:13:22 -05:00 |
|
Calen Pennington
|
793bbfd351
|
Set up dev environment for testing xml vs mongo vs split_mongo modulestores
|
2013-02-13 14:04:21 -05:00 |
|
Brian Talbot
|
8ec4c09615
|
local merge conflict resolution
|
2013-02-13 13:41:35 -05:00 |
|
Brian Talbot
|
0af6b991f0
|
studio - nav: generalizing is-selected styling
|
2013-02-13 13:40:46 -05:00 |
|
Calen Pennington
|
9b6cbd6d11
|
Merge pull request #1495 from MITx/feature/ned/remove-dogfood
Remove dogfood and quickedit.
|
2013-02-13 10:27:52 -08:00 |
|
Brian Talbot
|
e13db29efc
|
resolving merge from feature/btalbot/studio-softlanding
|
2013-02-13 12:42:15 -05:00 |
|
Ned Batchelder
|
857edaf6f3
|
Remove dogfood and quickedit.
|
2013-02-13 12:23:08 -05:00 |
|
Brian Talbot
|
03e7d2e77b
|
studio - soft landing: changing 'sign into' to 'sign in to' copy
|
2013-02-13 12:18:27 -05:00 |
|
Brian Talbot
|
b09c3b6aff
|
studio - resolving local merge due to editor alias
|
2013-02-13 12:06:54 -05:00 |
|
Brian Talbot
|
d3e67be766
|
studio: nav - clicking anywhere but nav's dropdowns will close them, fixed link outline and is-selected styling
|
2013-02-13 12:03:30 -05:00 |
|
Don Mitchell
|
7f7fb60b7d
|
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
|
2013-02-13 11:53:42 -05:00 |
|
Don Mitchell
|
6e5968e2cd
|
html changed; so, removed mostly meaningless comparison and fixed one.
|
2013-02-13 11:53:26 -05:00 |
|
Vik Paruchuri
|
e397575732
|
Remove import statements
|
2013-02-13 11:46:53 -05:00 |
|
Vik Paruchuri
|
8447eb5460
|
Remove extraneous debug messages
|
2013-02-13 11:40:07 -05:00 |
|
Vik Paruchuri
|
833aa01bd4
|
Add in documentation on tuple matching
|
2013-02-13 11:38:43 -05:00 |
|
Brian Talbot
|
3088e60d79
|
resolving local merge issues
|
2013-02-13 11:38:12 -05:00 |
|
Brian Talbot
|
fdd809409f
|
studio - nav: resolved Firefox browser chrome page-shifting bug
|
2013-02-13 11:37:47 -05:00 |
|
Vik Paruchuri
|
382d4d70ea
|
Minor parsing fix, remove b tag from selectors
|
2013-02-13 11:35:43 -05:00 |
|
Vik Paruchuri
|
9e5eca1417
|
Swap b tag for span
|
2013-02-13 11:29:18 -05:00 |
|
Vik Paruchuri
|
b0e55df13e
|
Alter max attempts
|
2013-02-13 11:24:21 -05:00 |
|
Don Mitchell
|
f7e635a7cd
|
fix npe w/ prev commit
|
2013-02-13 11:22:35 -05:00 |
|
Don Mitchell
|
4e3e2ec707
|
If user was trying to get to a specific page but had to log in, let them
get to that page once they've logged in.
|
2013-02-13 11:20:08 -05:00 |
|
Valera Rozuvan
|
26094a0421
|
YouTube HTML5 mode is used by default. Fix typo in video alpha template.
|
2013-02-13 16:47:06 +02:00 |
|
Vik Paruchuri
|
8f7c145957
|
Remove old import statements
|
2013-02-13 09:45:29 -05:00 |
|
Don Mitchell
|
3450c72833
|
Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding
|
2013-02-13 09:31:09 -05:00 |
|
Don Mitchell
|
6f3a954d7b
|
howitworks is default home page if not logged in. Otherwise course
index. NOTE: didn't fix old wrong behavior of going to index if not
logged in and tried to navigate to a specific page. Will work on that
next.
|
2013-02-13 09:30:54 -05:00 |
|
Christina Roberts
|
0b91c1c346
|
Merge pull request #1487 from MITx/fix/cdodge/cleanup-deleted-templates
clean up templates that were removed from disk - we need to remove from ...
|
2013-02-13 06:29:35 -08:00 |
|
Chris Dodge
|
fbe3d29f19
|
added tests
|
2013-02-13 09:25:09 -05:00 |
|
Brian Talbot
|
f1ad05059c
|
studio - correcting an image-replacement Sass mixin
|
2013-02-13 09:18:23 -05:00 |
|
Brian Talbot
|
714f69a57e
|
studio - resolving merge conflicts in settings from a recent rebase
|
2013-02-13 09:07:53 -05:00 |
|
Valera Rozuvan
|
a7b0dd67b7
|
Merge branch 'feature/valera/video_alpha' of github.com:MITx/mitx into feature/valera/video_alpha
|
2013-02-13 14:09:44 +02:00 |
|
Valera Rozuvan
|
6d5e230733
|
Fixes and additions. Addressing comments by Carlos for pull request 1409.
|
2013-02-13 14:09:35 +02:00 |
|
Vasyl Nakvasiuk
|
d0ac56ca56
|
some small fix
|
2013-02-13 13:35:34 +02:00 |
|
Vasyl Nakvasiuk
|
1f79877a9b
|
add xml exmaple for videoalpja module in docstring
|
2013-02-13 13:35:10 +02:00 |
|
Vasyl Nakvasiuk
|
e6f1687362
|
rm videoalpha_list method
|
2013-02-13 13:28:09 +02:00 |
|
Vasyl Nakvasiuk
|
42b332abb4
|
remove unnecessary code
|
2013-02-13 13:11:59 +02:00 |
|
Vasyl Nakvasiuk
|
2a05fdd4d9
|
use one general dictionary self.sources for videoalpha_module
|
2013-02-13 11:48:06 +02:00 |
|
jmclaus
|
9dbe911907
|
Back to last version of Protex
|
2013-02-13 09:45:44 +01:00 |
|
Valera Rozuvan
|
df31b3114b
|
Fixed bug when switching speeds in YouTube HTML5 player.
|
2013-02-13 10:27:57 +02:00 |
|
Valera Rozuvan
|
baf6bbe34a
|
Finalized HTML5 YouTube player inbrowser speed changes.
|
2013-02-13 10:27:57 +02:00 |
|