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

3591 Commits

Author SHA1 Message Date
Will Daly
31a6566110 Embargo based on country code in the user's profile. 2014-08-27 08:51:45 -04:00
Don Mitchell
4465b26a43 Use opaque_keys w/ model vars not parsing of url 
to generate url.
LMS-11209
 2014-08-25 18:07:37 -04:00
Sarina Canelake
eb84832849 Merge pull request #4325 from edx/victor/update-activation-email-text 
Update activation email text
 2014-08-25 13:43:18 -04:00
Victor Shnayder
26d975c2f4 Update activation email text 
Make it more active.  Adds a separate section for edX.org-specific copy,
because it's hard to make it generic.

LMS-11084
 2014-08-25 12:09:47 -04:00
Stephen Sanchez
9ee15bf007 Updating the footer for edx.org and open edx. 
Move the open edx logo inside the div

Adding a bunch of placeholder views.

indenting.

Making some styles work against LMS sass.

Adding back the old edx footer and associated icons, with a feature flag.
 2014-08-25 15:33:43 +00:00
Stephen Sanchez
b3f4ce2312 Merge pull request #4879 from edx/sanchez/update-platform-header 
Updating the platform header styles to match new site styles.
 2014-08-25 09:57:14 -04:00
Alexander Kryklia
095b07275e Unflag Group Configurations, Render only existing children in staff view of split_test. 2014-08-22 16:43:54 -04:00
Stephen Sanchez
033551416b Updating the platform header styles to match new site styles. 
Putting the new edx header behind a feature flag.
 2014-08-22 18:25:45 +00:00
frances botsford
7260094ef3 Merge pull request #4145 from IONISx/tusbar/rewrite-password-reset-templates 
Make use of django_main for password_reset templates
 2014-08-22 08:06:29 -04:00
Sarina Canelake
874355652b Merge pull request #4911 from edx/sarina/a11y-extensions 
Add placeholders for text input on Extensions dash feature
 2014-08-20 16:00:40 -04:00
Sarina Canelake
06001abc60 Merge pull request #4905 from bradenmacdonald/fix-idde-ui 
Fix: inadvertent scroll when loading the instructor's extensions tab
 2014-08-20 13:15:39 -04:00
Sarina Canelake
fadade48d4 Add placeholders for text input on Extensions dash feature 2014-08-20 12:03:08 -04:00
Bertrand Marron
879232af46 Make use of django_main for password_reset templates 
Remove duplicated code and make sure those views use the same visual
identity.
 2014-08-20 14:17:55 +02:00
Waqas Khalid
01aa38fb82 Truncated markup can be displayed in forums user profile view 
FOR-581
 2014-08-20 14:33:23 +05:00
Braden MacDonald
dbbbe8f2cb Fix: inadvertent scroll when loading the instructor's extensions tab 
(The div with id "view-extensions" conflicts with the tab JS which sets location.hash to "view-x" in order to track the current tab)
 2014-08-19 23:18:31 -07:00
Will Daly
43368b29b0 Merge pull request #4886 from edx/will/ecom-122 
Fix messaging for professional ed under auto-registration
 2014-08-19 14:58:18 -04:00
Sarina Canelake
46051ef212 Merge pull request #3495 from eduNEXT/feature/fmo/theme-microsite-support 
Microsites alongside Theme
 2014-08-19 12:39:21 -04:00
Will Daly
f26e88bdd9 Fix messaging for professional ed under auto-registration 2014-08-19 07:53:26 -04:00
Renzo Lucioni
326deb37c2 Mark calls to track() on pageload as noninteraction events 2014-08-18 14:51:16 -04:00
njdup
93d088505f Instructor Dash: Display message when there are no tasks running 
This commit adds a message to the instructor dashboard that is displayed when
no instructor tasks are currently running. This message is displayed where the
instructor pending tasks table would normally be placed, and is replaced
with the table when there are running tasks.
 2014-08-15 10:35:01 -07:00
Will Daly
3cd4610b5a Merge pull request #4824 from edx/will/auto-register 
Auto enroll students even if there are multiple course modes
 2014-08-15 11:11:19 -04:00
marco
6f810836db Template changes for course track AB-test 2014-08-15 10:26:29 -04:00
Sarina Canelake
f3a0327541 Merge pull request #4841 from edx/sarina/minor-i18n-fixes 
Minor i18n fixes prompted by translators
 2014-08-14 18:03:54 -04:00
Sarina Canelake
19ca6c845c Minor i18n fixes prompted by translators 2014-08-14 14:58:26 -04:00
Oleg Marshev
a94e942480 BLD-1125: Validation of content experiments after managing a group. 2014-08-14 16:34:21 +02:00
lduarte1991
76b8891b69 Annotation Tools: Adding try-catch in case Annotator is missing from LMS 2014-08-13 22:05:42 -04:00
lduarte1991
8cfdb8f14c Annotation Tools: Adding comments and adding CSS groups 2014-08-13 21:35:37 -04:00
lduarte1991
5c859c7128 Annotation Tools: Adding Annotator to CMS 2014-08-13 21:35:37 -04:00
Julia Hansbrough
2204eb7390 Fixed merge conflict between release and master. 2014-08-13 18:11:30 +00:00
Brian Talbot
5caaec7b82 LMS: adding rendering/styling support for initial professional ed course types on student dashboard 2014-08-12 18:45:10 +00:00
Diana Huang
9aa095dd21 Adapt flow for new 'professional' mode. 
ECOM-41
 2014-08-12 18:44:46 +00:00
Julia Hansbrough
805c325653 Update redirect and wording for prof ed 
- Changes registraiton button text for professional ed courses
- Professional ed courses do not see "choose your track" page; go straight to verification flow
 2014-08-12 18:44:40 +00:00
Renzo Lucioni
2ad9557403 Factor out Optimizely project ID 2014-08-12 14:20:30 -04:00
cahrens
ee836d4c40 Merge branch 'release' from 2014-08-12 release. 2014-08-12 13:51:58 -04:00
Sarina Canelake
9885b106af Remove banner from instructor dashboard 2014-08-10 00:46:10 -04:00
Julia Hansbrough
91e90b3673 Update redirect and wording for prof ed 
- Changes registraiton button text for professional ed courses
- Professional ed courses do not see "choose your track" page; go straight to verification flow
 2014-08-08 21:02:16 +00:00
Renzo Lucioni
2380235fd7 Add Optimizely widget 2014-08-08 14:58:18 -04:00
polesye
37c3a50ffa Add tooltip manager in Studio. 2014-08-08 16:31:14 +03:00
jsa
d96de4249d Merge branch 'release' 2014-08-07 16:22:39 -04:00
Andy Armstrong
d65e887d1a New Publishing controls on Unit page. 
STUD-1707
 2014-08-07 12:16:17 -04:00
Clinton Blackburn
3796f8c689 Merge pull request #4639 from edx/clintonb/link-to-analytics-dashboard 
Added link from instructor dashboard to analytics dashboard
 2014-08-07 12:15:11 -04:00
Clinton Blackburn
1a4e067712 Added link from instructor dashboard to analytics dashboard 2014-08-07 12:13:34 -04:00
Waqas Khalid
3d5dde8195 Fix inconsistent ui issues on discussion during blackout period 
FOR-108
 2014-08-07 19:33:40 +05:00
lduarte1991
0ca9bfa7e4 Annotation Tools: Added Grouping Plug-In 
- adding comments

 - spacing issues and indentation
 2014-08-06 14:49:40 -04:00
Christina Roberts
540d67a670 Merge pull request #4687 from lduarte1991/lduarte-harvardx-pr16 
TinyMCE Plugin: Added media plugin to TinyMCE for the Annotation tool
 2014-08-06 12:26:46 -04:00
Chris Dodge
ed06700afb add space to table header 2014-08-06 09:50:32 -04:00
lduarte1991
fe009f5989 TinyMCE Plugin: Added media plugin to TinyMCE for the Annotation tool 
- fixed missing media and link buttons on image

 - fixed a CSS issue with the sharing button
 2014-08-05 15:05:56 -04:00
jmclaus
459c241e3b BLD 1020: Easy access to Group Configurations page from Content Experiment component. 2014-08-05 19:44:21 +02:00
chrisndodge
246a431760 Merge pull request #4590 from edx/cdodge/fix-reg-codes 
eCommerce enhancements (pt. 2)
 2014-08-05 13:12:52 -04:00
asadiqbal08
fc8ec1cc43 e-commerce UI suggested changes 2014-08-05 10:00:17 -04:00