Victor Shnayder
aae40b4378
Press updates
...
LH: 381, 382, 383
2013-05-03 08:55:40 -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
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
Calen Pennington
771937b3da
Remove duplicate libraries used while jasmine testing the LMS (as they are also defined in vendor)
2013-04-30 14:09:42 -04:00
Brian Talbot
c28647be2d
lms - cleared document flow for .teacher elements within a course's about view to coincide with Studio's default HTML for the course overview settings field
2013-04-29 14:47:57 -04:00
Calen Pennington
8dc0df3e6b
Don't ignore the old directories for xmodule sass and coffeescript
2013-04-29 07:32:16 -04:00
Diana Huang
2df3fe9344
Revert "fix merge conflict"
...
This reverts commit acfd0d9fd6e4194c99d8
2013-04-26 12:40:35 -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
Your Name
acfd0d9fd6
fix merge conflict
2013-04-23 10:30:51 -04:00
Kevin Chugh
d6bc426ecd
Merge pull request #1731 from MITx/feature/kevin/pinning_inline
...
Feature/kevin/pinning inline
2013-04-23 07:24:22 -07:00
Kevin Chugh
e8c646142f
Merge branch 'master' into feature/kevin/flagging
2013-04-21 06:15:55 -04:00
Calen Pennington
729daf5cbf
Move xmodule asset gathering out of server startup
...
This allows us to a) compile the coffeescript and sass from xmodules
using the new out-of-band method and b) reload xmodule static content
whenever it changes, which should make devs much happier.
2013-04-18 15:19:19 -04:00
Carlos Andrés Rocha
a947f620a0
Merge pull request #1861 from MITx/fix/btalbot/stanford-logo
...
fixing the visual display of the stanford logo
2013-04-16 11:50:43 -07:00
Brian Talbot
b417651cf1
fixing the visual display of the stanford logo used in press releases on the homepage and dashboard (proportions were off)
2013-04-16 14:47:26 -04:00
Vik Paruchuri
d82ac2b747
Merge remote-tracking branch 'origin/master' into fix/vik/sa-and-coe
2013-04-16 13:45:46 -04:00
Vik Paruchuri
9acc592279
Comments for hotkeys
2013-04-16 10:23:08 -04:00
Vik Paruchuri
d0ecbbb4cf
Fix hotkeys in peer and staff grading to use ctrl prefix
2013-04-10 15:10:48 -04:00
Kevin Chugh
8358e5162a
Merge branch 'master' into feature/kevin/flagging
2013-04-09 09:23:05 -04:00
Kevin Chugh
2b2621e20c
Merge branch 'master' into feature/kevin/pinning_inline
2013-04-08 17:19:19 -04:00
Calen Pennington
8288202008
Marketing request: Lighthouse [ #338 , fixed]
2013-04-08 14:42:15 -04:00
Greg Price
ffc1259496
Apply text and image changes reqeusted by UTAustinX
...
Lighthouse LMS tickets:
[#307 state:resolved]
[#310 state:resolved]
[#319 state:resolved]
[#322 state:resolved]
2013-04-04 13:52:33 -04:00
John Jarvis
ea6174af28
fixing image resolution for the stanford-university image
2013-04-04 11:40:44 -04:00
John Jarvis
d2313d851a
renaming image
2013-04-03 16:02:41 -04:00
John Jarvis
b2e8780f9b
adding a smaller stanford image
2013-04-03 16:01:15 -04:00
John Jarvis
e8ee6616c4
removing old logo
2013-04-03 15:39:46 -04:00
John Jarvis
6d78425a82
dding stanford-univ logo
2013-04-03 15:39:22 -04:00
John Jarvis
7b226c34f8
Adding new logo for stanford
2013-04-03 15:34:54 -04:00
Kevin Chugh
5534d8bdce
fix mega merge conflicts
2013-03-29 07:33:52 -04:00
Carlos Andrés Rocha
a15baa97c5
Add UTAustinX landing page
2013-03-28 13:23:58 -04:00
marco
f8eacff683
styled textbook css to look closer to the discussion forum navigation
2013-03-22 11:04:44 -04:00
marco
9fdac385e1
Merge branch 'master' into ux/marco/textbook
2013-03-22 10:29:05 -04:00
marco
7ecf0e5bc1
small positioning adjustments to inline pins;
2013-03-21 14:27:10 -04:00
marco
f45cc6fb35
changes to textbook styling
2013-03-20 21:30:05 -04:00
Carlos Andrés Rocha
c5385ff42c
Update Berkeley logos
...
LMS Lighthouse [#260 ]
2013-03-20 14:46:08 -04:00
Your Name
32f75bfe9e
added pinning UI to inline
2013-03-20 11:58:47 -04:00
Jay Zoldak
b6e82afb0e
Merge pull request #1681 from MITx/fix/will/fix_broken_jasmine_lms_tests
...
Fix/will/fix broken jasmine lms tests
2013-03-18 11:53:22 -07:00
Calen Pennington
029d8c8085
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
2013-03-15 09:46:47 -04:00
Carlos Andrés Rocha
b4d83a5f44
Add 2.01x announcement to news feed
...
LMS Lighthouse [#259 ]
2013-03-14 06:49:07 -07:00
Kevin Chugh
8d766c4b51
fix conflict
2013-03-13 21:01:37 -04:00
Your Name
6ee14ec34a
candidate without inline
2013-03-13 18:51:40 -04:00
Your Name
8280c55992
pinning .1
2013-03-12 17:40:26 -04:00
Kevin Chugh
a2be6dd420
first cut of UI
2013-03-12 10:31:05 -04:00
Calen Pennington
2113541632
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
.ruby-version
cms/djangoapps/contentstore/tests/test_contentstore.py
cms/djangoapps/models/settings/course_metadata.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/modulestore/tests/factories.py
2013-03-12 07:23:28 -04:00
Will Daly
9d8c023acb
Removed calls to Navigation.bind() and Calculator.bind()
...
that were causing phantomjs interpreter to fail
with undefined method error.
2013-03-11 15:58:31 -04:00
David Ormsbee
0605c94113
Merge pull request #1636 from MITx/feature/brian/htmlbook
...
Initial implementation of htmlbook.
2013-03-11 11:38:46 -07:00
Brian Wilson
cd95872b52
htmlbook-specific styling to make Heroes text presentable.
2013-03-11 11:56:48 -04:00
Will Daly
a777a9e6e3
Updated broken tabs.js Jasmine tests.
2013-03-11 11:27:49 -04:00
Will Daly
618de5df25
Fixed import error for histogram.coffee
2013-03-11 11:27:49 -04:00
Will Daly
20b04c9bf2
Fixed broken calculator test in lms coffee scripts
2013-03-11 11:27:49 -04:00
Calen Pennington
95f8f811c5
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
common/lib/xmodule/xmodule/course_module.py
2013-03-11 10:49:29 -04:00
