Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,674 Commits 1 Branch 0 Tags
bb699f482dd67e31328e8729a68f59e2ec2626d5
Commit Graph

1635 Commits

Author SHA1 Message Date
Greg Price
de5b4d7d27 Merge branch 'master' into drupal-new 2013-05-17 16:10:56 -04:00
Greg Price
db3189d5ad Disable marketing registration button for courses that user cannot enroll in 2013-05-17 14:10:04 -04:00
Kevin Chugh
ef3204da69 Merge pull request #2059 from edx/feature/zoldak/forum-testing 
Feature/zoldak/forum testing
 2013-05-17 10:10:55 -07:00
Diana Huang
1c2175304e Merge branch 'master' into drupal-new 2013-05-16 16:27:36 -04:00
Greg Price
b8d2276de7 Remove dashboard links for unstarted courses 
If a course is not started, the course image and title on the dashboard link
to the course about page. Because the LMS course about pages do not exist
(i.e. 404) with the marketing site enabled, we simply do not use a link if
the course has not started.
 2013-05-16 15:06:48 -04:00
Greg Price
ff2ba68d79 Tweak behavior of registration button for marketing site 
If a user is already registered for a course but the course has not started
yet, display a grey button that says "you are registered" and goes nowhere
instead of the blue "access courseware" button, which goes to the LMS course
about page (which 404s).
 2013-05-16 15:06:48 -04:00
Arthur Barrett
adcd1dd886 update annotator.min.css with change to fix adder button and serve the minified one. 2013-05-16 14:48:06 -04:00
Arthur Barrett
52e5fe223c update annotator.js library and fix the annotator-adder button hover state in courseware. 2013-05-16 14:27:21 -04:00
marco
71be3debc4 updated flagging icons to not use other libraries 2013-05-16 10:56:58 -04:00
marco
33e8621af6 cursor state for discussions (not inline) span text needed to be set to pointer 2013-05-16 10:29:34 -04:00
marco
495cd305d4 adjusted cursor for span label on pins to be default 2013-05-16 10:29:34 -04:00
Your Name
e2d3aee768 styling inline flaggin 2013-05-16 10:29:34 -04:00
marco
65dbd3cf73 padding around icons for flags and pins 2013-05-16 10:29:34 -04:00
marco
0a43c0ff59 minor css tweaks to flag and pin icons 2013-05-16 10:29:34 -04:00
Your Name
78097c7ee1 update css for better cursor on pinning and flagging 2013-05-16 10:29:33 -04:00
Jay Zoldak
ed5ad46192 Revert "Revert "fix merge conflict"" 
This reverts commit 2df3fe9344.

Conflicts:
	common/static/coffee/src/discussion/utils.coffee
 2013-05-16 10:29:33 -04:00
Brian Talbot
e4b5d21ba6 edx.org - adds in text-decoration nullification and revised padding for course registration buttons 2013-05-10 17:24:48 -04:00
Brian Talbot
17affb0ac7 edx.org - reduces padding on course listing register buttons (all states) and resets box-sizing to border box to make a proper box model for element 2013-05-10 17:00:25 -04:00
Greg Price
c00b903757 Make course number in registration button not transformed to lowercase 2013-05-10 10:58:12 -04:00
Greg Price
a0fb4d6c85 Merge branch 'master' into drupal-new 
Conflicts:
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/base/_base.scss
	lms/templates/forgot_password_modal.html
 2013-05-10 10:30:10 -04:00
Arthur Barrett
eca155f99a Merge branch 'master' into feature/abarrett/lms-notes-app 2013-05-07 17:27:40 -04:00
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