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 |
|
marco
|
15de4120ac
|
blankslate edited, header bar now with home button
|
2013-04-11 23:20:49 -04:00 |
|
Vik Paruchuri
|
d0ecbbb4cf
|
Fix hotkeys in peer and staff grading to use ctrl prefix
|
2013-04-10 15:10:48 -04:00 |
|
Brian Talbot
|
22a56fddb4
|
edx.org - adding in an intermediate disabled state for login/register submit buttons when the form is first processed
|
2013-04-10 13:38:25 -04:00 |
|
John Jarvis
|
2c0b2e4d27
|
Merge branch 'master' into drupal-new
|
2013-04-09 13:27:13 -04:00 |
|
Kevin Chugh
|
8358e5162a
|
Merge branch 'master' into feature/kevin/flagging
|
2013-04-09 09:23:05 -04:00 |
|
Brian Talbot
|
78079d1ca7
|
Merge branch 'master' into drupal-new
|
2013-04-08 22:35:29 -04:00 |
|
Brian Talbot
|
d8368447fd
|
edx.org - adjusted input height and padding to handle previously uneditable fieldsin firefox
|
2013-04-08 22:35:06 -04:00 |
|
Brian Talbot
|
13b741750a
|
edx.org - basic styling of password reset form
|
2013-04-08 22:16:32 -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 |
|
Brian Talbot
|
f501000825
|
edx.org - hiding the login nav element when on the login view
|
2013-04-03 09:46:36 -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 |
|
Arthur Barrett
|
d636f4fab0
|
Merge branch 'master' into feature/abarrett/lms-notes-app
|
2013-03-25 19:04:58 -04:00 |
|
Arthur Barrett
|
63349dab9c
|
fixed update/delete responses
|
2013-03-25 19:04:23 -04:00 |
|
Arthur Barrett
|
131c63b697
|
refactored model and api to search/filter by page uri
|
2013-03-25 18:47:28 -04:00 |
|
Brian Talbot
|
f5aaf309e8
|
edx.org - added in visual spacing for confirmed state of password recovery modal
|
2013-03-25 15:16:50 -04:00 |
|
Brian Talbot
|
e716530692
|
edx.org - added necessary JS and Sass to disabled login/register button when form is submitting
|
2013-03-25 14:52:13 -04:00 |
|
Brian Talbot
|
dc1a7f5d6a
|
edx.org - changed status message UI to be hidden by default (rather than with JS) for the time being for page load/render's sake
|
2013-03-25 13:59:30 -04:00 |
|
Arthur Barrett
|
0574eb49ad
|
initialize annotator on any element by note:init event
|
2013-03-25 13:36:38 -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 |
|
Arthur Barrett
|
7120998938
|
refactoring notes js
|
2013-03-21 17:18:45 -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 |
|
Brian Talbot
|
fe59ca5b89
|
edx.org - replacing visual banners with updated marketing ones
|
2013-03-19 17:14:57 -04:00 |
|
John Jarvis
|
78987cc400
|
resolving merge conflicts
|
2013-03-19 16:16:32 -04:00 |
|
Brian Talbot
|
a455c6b1e4
|
edx.org - added in error state revisions and modal window tweaks
|
2013-03-19 13:57:14 -04:00 |
|
Arthur Barrett
|
0710bbd70c
|
Merge branch 'master' into feature/abarrett/lms-notes-app
|
2013-03-19 13:43:45 -04:00 |
|
Brian Talbot
|
dc60d107e9
|
edx.org - added in new login and registration visual banners per marketing request
|
2013-03-19 09:53:52 -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 |
|
Arthur Barrett
|
20767d5cc7
|
create notes djangoapp for annotator.js
|
2013-03-15 12:41:52 -04: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 |
|