Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

5315 Commits

Author SHA1 Message Date
Giulio Gratta
87362aa887 Merge branch 'master' of github.com:edx/mitx into feature/giulio/accessibility 2013-05-07 11:21:44 -07:00
Giulio Gratta
2dde742f38 made login form labels and close modal button accessible friendly 2013-05-07 10:25:08 -07:00
Arthur Barrett
cd4bec8750 merged master branch into feature/abarrett/lms-notes-app 2013-05-07 12:32:22 -04:00
Brian Talbot
126c9f9f37 edx.org - further revision to iframe register button states: coming soon styling 2013-05-07 11:00:21 -04:00
Brian Talbot
3b84d77131 edx.org - resolved (in a dirty way) iframed buttons picking up style in IE and added in coming soon style treatment 2013-05-07 10:25:41 -04:00
Arthur Barrett
ade6d4085d turn off notes js debugging 2013-05-06 19:35:41 -04:00
Greg Price
ec3c8458e7 Merge pull request #1911 from edx/feature/gprice/feedback-button 2013-05-06 11:03:41 -07:00
Arthur Barrett
04e75485ba merged master branch into feature/abarrett/lms-notes-app. resolved conflicts in lms/envs/common.py and lms/templates/static_htmlbook.html. 2013-05-06 13:40:38 -04:00
Greg Price
203a958e68 Outline textareas in red on a form submission error 
This was previously done for input but not textarea.
 2013-05-06 13:35:52 -04:00
Greg Price
00729a8c13 Add an omnipresent help tab to the LMS 
The help tab opens a modal dialog that directs the user at various resources
(e.g. the site FAQ and course forums) and allows the user to submit feedback
to the feedback endpoint (which will ultimately create a ticket for the
student support team).
 2013-05-06 13:35:52 -04:00
jarv
f18321cda2 Merge pull request #1919 from edx/feature/gprice/drupal-auto-enroll-on-registration 
Update course registration flow for non-modal registration and login
 2013-05-06 10:31:29 -07:00
Victor Shnayder
06846d9187 update EPFL profile. LH # 374 2013-05-06 11:06:05 -04:00
jarv
bf5ac6c263 Merge pull request #1950 from edx/jarv/drupal-new/iframe 
Jarv/drupal new/iframe
 2013-05-06 07:46:28 -07:00
Brian Talbot
7dd763212e edx.org - fixes to the iframe-based register button's styling 2013-05-03 11:55:14 -04:00
Greg Price
e5846e64bd Modify course registration flow for new login and registration pages 
Now that we are using separate pages for login and registration rather than
modals, clicking the registration button for a course should direct an
unauthenticated user to the registration page, and the user should be enrolled
in the course upon successful registration. Likewise, an unauthenticated user
attempting to unenroll from a course should be directed to the login page and
subsequently unenrolled from the course upon successful login. The enrollment
change service also now uses HTTP status codes rather than JSON to communicate
status to the front end.
 2013-05-03 10:01:11 -04:00
Victor Shnayder
aae40b4378 Press updates 
LH: 381, 382, 383
 2013-05-03 08:55:40 -04:00
Diana Huang
45baf013fe Merge branch 'master' into drupal-new 2013-05-02 17:04:39 -04:00
Brian Talbot
7705941a65 edx.org - added in isolated register button styling/states for <iframe>-based registration fix 2013-05-02 11:54:16 -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 acfd0d9fd6, reversing
changes made to e4194c99d8.
 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
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