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

1043 Commits

Author SHA1 Message Date
Ben Patterson
b71c20c031 Revert "Add Cosmetic Display Price field to studio & logic to show it" 2015-02-03 09:41:54 -05:00
Sarina Canelake
db3d6fd9ab Merge pull request #6182 from Stanford-Online/giulio/course-price-upstream 
Add Cosmetic Display Price field to studio & logic to show it
 2015-02-02 20:07:58 -05:00
Renzo Lucioni
a8bed5ce98 Make logistration generally available if feature flag is active 
Makes logistration available at /login and /register as well as /accounts/login/ and /accounts/register/. In addition:

- Adds support for redirect URLs in third party auth for combined login/registration page
- Adds support for external auth on the combined login/registration page
- Removes old login and registration acceptance tests
- Adds deprecation warnings to old login and register views
- Moves third party auth util to student_account
- Adds exception for microsites (theming)
 2015-01-30 13:28:30 -05:00
Davorin Sego
e09d47b122 Courseware Search integration 2015-01-28 21:34:58 -05:00
Zia Fazal
ba5fd98aaf make course requirement as link 2015-01-28 14:26:27 +05:00
Giulio Gratta
c18ee8cc09 Add cosmetic price field to studio & logic 
- Price field added to Advanced Settings
- Function that decides which price to display
- Test added to check that the function outputs correct price
- Added feature flag and conditional to decide whether to display course price or not
- Feature Flag to show or hide course price on Course About page sidebar when not using shopping cart
 2015-01-27 15:15:43 -08:00
David Baumgold
a72e129da5 Merge pull request #6532 from edx/course-about-i18n 
Improve i18n on course about page
 2015-01-21 10:23:59 -05:00
polesye
1d9b5a9736 TNL-1220: Fix Harvard Text Annotation UI. 2015-01-16 22:45:07 +02:00
Matt Drayer
3c669e3838 New feature contribution: Entrance Exams 2015-01-15 20:35:24 -05:00
Zia Fazal
ca3d84a5d4 New pre-requisite course feature via milestones app 2015-01-15 15:17:38 -05:00
David Baumgold
b390e18d34 Improve i18n on course about page 2015-01-15 14:38:17 -05:00
Andy Armstrong
bca6274eb5 Miscellaneous text updates 2015-01-15 10:33:48 -05:00
Andy Armstrong
ac58ebf7da Rename 'cohort groups' to just 'cohorts' 2015-01-15 10:33:48 -05:00
Andy Armstrong
22d65acdbf Add back missing 'New Post" button 
TNL-1097
 2015-01-15 10:33:47 -05:00
Andy Armstrong
561c57dbe9 Extend preview to support cohorted courseware 
TNL-651
 2015-01-15 10:33:44 -05:00
Marco Morales
c4e8673db0 creation of a courseware preview menu to contain staff view toggle. 2015-01-15 10:33:44 -05:00
Bertrand Marron
c4a7d770cc Remove all ellipses 
It's a problem for accessibility
 2015-01-15 09:03:12 -05:00
polesye
c7153be040 TNL-213: Let Students Add Personal Notes to Course Content. 
Co-Authored-By: Jean-Michel Claus <jmc@edx.org>
Co-Authored-By: Brian Talbot <btalbot@edx.org>
Co-Authored-By: Tim Babych <tim@edx.org>
Co-Authored-By: Oleg Marshev <oleg@edx.org>
Co-Authored-By: Chris Rodriguez <crodriguez@edx.org>
 2015-01-14 23:34:11 +02:00
Brian Talbot
c93817962e Merge pull request #6515 from edx/talbs/fix-update-font-awesome 
FIX: Upgrade Font Awesome - Part III: Revenge of the Glyph
 2015-01-09 12:50:14 -05:00
Brian Talbot
f128629f48 fixing styling and class syntax (to new FA-based classes) for missing UI elements 2015-01-09 12:01:26 -05:00
Sarina Canelake
cae70d9966 Move default Open edX branding into default-theme directory 
OPEN-307
 2015-01-09 10:49:17 -05:00
Sarina Canelake
6f5134f711 Move edx branding into edx-theme directory 
OPEN-307
 2015-01-09 10:48:20 -05:00
Sarina Canelake
314c935369 Remove edX branding from default Open edX LMS 
OPEN-307
 2015-01-09 10:48:20 -05:00
Sarina Canelake
8af54943e1 Merge pull request #6243 from edx/sarina/default-edx-UI 
Clean up front page UI and video elements, remove cruft [OPEN-407, OPEN-358]
 2015-01-06 21:58:56 -05:00
Sarina Canelake
682d3d0eae Organize logic on Find Courses view. 2015-01-06 18:26:19 -05:00
Chris
c5d2dd7536 Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0 
* updating vendor files
* updating class syntax (to new FA-based classes) for all UI elements
* correcting broken tests
 2015-01-06 15:24:12 -05:00
Syed Hassan Raza
1e11baede4 Add aria-disabled attribute 
TNL-997
 2015-01-06 17:21:49 +05:00
David Baumgold
dff919efb2 Improve i18n for courseware page 2014-12-24 14:56:28 -05:00
Muhammad Shoaib
914ecac9ac added the course price in the course about page 2014-12-15 12:53:37 -05:00
Clinton Blackburn
fc242ea23e Merge branch 'release' 
Release 2014-12-10
 2014-12-09 17:39:17 -05:00
Sarina Canelake
a1c8f8c468 Style cleanups: legacy instructor dashboard 2014-12-09 13:57:21 -05:00
Brian Talbot
a5913a4836 LMS: adding in basic is-deprecated visual styling 2014-12-09 13:57:20 -05:00
Sarina Canelake
919e411fd9 Only show "Course Statistics at a Glance" in the Admin tab 2014-12-09 13:57:20 -05:00
Sarina Canelake
bfa8349ec4 Clean up Datadump section on legacy dashboard 2014-12-09 13:57:20 -05:00
Sarina Canelake
5aeb412bbe Remove deprecated cohorts management on legacy dashboard 2014-12-09 13:57:20 -05:00
Sarina Canelake
762b0d9b6b Clean up Manage Groups section on legacy dashboard 2014-12-09 13:57:20 -05:00
Sarina Canelake
3474601321 Add CSS rules for legacy dash deprecation warnings 2014-12-09 13:57:20 -05:00
Sarina Canelake
e3179c37cd Clean up Email section of legacy dashboard 2014-12-09 13:57:20 -05:00
Sarina Canelake
d4a06794d0 Clean up Forum Admin section of legacy dashboard 2014-12-09 13:57:19 -05:00
Sarina Canelake
5d7f820d93 Clean up Admin section of legacy dashboard 2014-12-09 13:57:19 -05:00
Sarina Canelake
d8904d9091 Clean up Grade Downloads section of legacy dash 2014-12-09 13:57:19 -05:00
Sarina Canelake
a15110f01c Remove Grade Adjustment code from legacy dash 2014-12-09 13:57:19 -05:00
Sarina Canelake
0a5af2a385 Rename legacy dash template 2014-12-09 13:57:19 -05:00
Will Daly
0fd6dddbae Fix reference error with emailOptIn variable 2014-12-09 08:31:03 -05:00
Waheed Ahmed
222b05a158 Added IMG tag instead of css background property for important visual indicator. 
TNL-892
 2014-12-09 12:38:54 +05:00
Clinton Blackburn
71bc536c6d Merge pull request #6183 from edx/renzo/email-opt-in-copy 
Improved support for multiple organization names
 2014-12-08 14:55:06 -05:00
Renzo Lucioni
1d1baa5009 Improved support for multiple organization names 
Updates copy used in the checkbox label, constructs strings within the view instead of passing through a separate context variable, and alleviates unipain
 2014-12-08 14:10:09 -05:00
Will Daly
1c6d197bd0 Merge pull request #6156 from edx/will/revert-logistration-enablement 
Revert enable login/registration
 2014-12-05 13:06:44 -05:00
Will Daly
8580620b52 Revert "If feature flag is enabled, replace the old login/registration pages with the new combined login/registration page." 
This reverts commit f40447b3c8.

Conflicts:
	lms/urls.py

Revert "Add support for external auth on the combined login/registration page"

This reverts commit 988753395f.

Conflicts:
	lms/templates/courseware/mktg_course_about.html
	lms/urls.py
 2014-12-05 10:41:42 -05:00
Chris
c45e34bf2e Merge pull request #5842 from Stanford-Online/giulio/prerequisites-style-fixes 
Remove extra prerequisites style and class
 2014-12-05 09:03:14 -05:00