Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,700 Commits 1 Branch 0 Tags
2eae368136aa9db7ff34d4d1aad4cbbeaf1c03ed
Commit Graph

3110 Commits

Author SHA1 Message Date
Brian Talbot
b75f900b22 Merge pull request #8266 from edx/talbs/fix-font-face-calls 
LMS/Studio: Reduce font-face file calls
 2015-07-22 14:48:44 -04:00
Andy Armstrong
c0eaeb7efc Merge pull request #9000 from edx/andya/fix-discovery-Jasmine-tests 
Fix broken Jasmine tests for course discovery
 2015-07-22 14:02:26 -04:00
Andy Armstrong
a328770c86 Fix broken Jasmine tests for course discovery 2015-07-22 12:17:51 -04:00
Daniel Friedman
21b39ca467 Add teams-for-topic list view to Teams page. 
TNL-1898

Also adds a generic paginated list view and Teams list view. The
common PaginatedView takes a collection and a view class for its items
and creates a header and footer with correct pagination. The topics
list view is refactored to use this generic view.

Authors:
  - Peter Fogg <pfogg@edx.org>
  - Daniel Friedman <dfriedman58@gmail.com>
 2015-07-22 12:02:40 -04:00
Frances Botsford
6d6bfa7f35 added incontext option to system message styles for teams 2015-07-22 12:02:40 -04:00
cahrens
497d76fa54 Optimize edxnotes files. 2015-07-21 10:54:02 -04:00
cahrens
ad16f9f968 Optimize search usages. 2015-07-20 14:24:30 -04:00
Diana Huang
eff80baed2 Convert cohort JS to use RequireJS. 2015-07-20 13:59:55 -04:00
Peter Fogg
1ceb8a0d66 Optimize finish_auth_factory. 
TNL-2602
 2015-07-20 13:59:55 -04:00
cahrens
4f0ab6f9c8 Optimize account settings and learner profile. 
Also remove RequireJS dependency on mustache, and delete extra copy.
 2015-07-20 13:59:55 -04:00
Andy Armstrong
7b5f9b8009 Implement RequireJS Optimizer in the LMS 
TNL-2487
 2015-07-20 13:59:54 -04:00
Max Rothman
c97314413b Merge branch 'release' into release-merge-test 
Conflicts:
	lms/djangoapps/commerce/urls.py
	lms/djangoapps/commerce/views.py
 2015-07-17 17:42:03 -04:00
Adam
2735b2b5bb Revert "Decorated instructor dashboard with sudo_required." 2015-07-17 12:11:38 -04:00
Jesse Zoldak
da68af5c04 Disable potentially flaky jasmine tests SOL-1065 2015-07-17 10:40:08 -04:00
Vedran Karačić
c0de94295a Merge pull request #8953 from edx/vkaracic/TNL-394-additional-testing 
TNL-394: Additional testing
 2015-07-17 16:20:46 +02:00
vkaracic
f5234b1a9b TNL-394: Additional testing 
This is an additional test for:
https://openedx.atlassian.net/browse/TNL-394
to test if the get_user function escapes values correctly.
 2015-07-17 07:28:25 +00:00
Awais Jibran
2d19eafa7c Merge pull request #7404 from edx/waheed/plat407-decorate-instructor-dashboard-with-sudo-required 
Decorated instructor dashboard with sudo_required.
 2015-07-16 21:12:43 +05:00
aamir-khan
d5dda6470e ECOM-1816: added the provider detail on the receipt page. 2015-07-16 18:25:03 +05:00
Waheed Ahmed
bc052db1ee Added DjangoSudo functionality for instructor dashboard and course team page 2015-07-16 11:14:11 +05:00
Renzo Lucioni
d4a5ad4818 Mark basket creation and order retrieval endpoints as v0 
These endpoints are currently for internal use only, but should be versioned nonetheless; Drupal will begin using the basket creation endpoint soon. No functionality has been changed. XCOM-494.
 2015-07-15 16:22:29 -04:00
Sarina Canelake
376fe0a57c Remove outdated Analytics scripts, code, and css 2015-07-15 11:11:10 -04:00
Marco Morales
a930fec852 Merge pull request #8812 from edx/marco/UX-384/reminder-icon-change 
UX-384: Improved visual indicator for graded subsections in LMS sidebar
 2015-07-14 14:26:31 -04:00
frances botsford
2e7da1985a Merge pull request #8321 from edx/frances/lms/user-menu-cleanup 
LMS User menu cleanup
 2015-07-14 09:23:36 -04:00
Marco Morales
493200734e Merge pull request #8296 from edx/marco/find-courses-page/styling-changes 
Styling improvements to openedX search through Find Courses page
 2015-07-14 08:14:35 -04:00
vkaracic
3ec3cf64cc Added sanitization of id names 
This is a fix for
https://openedx.atlassian.net/browse/TNL-394
escaped all escapable characters in id name strings.
 2015-07-14 08:31:19 +00:00
Marco Morales
b30c2f3bd0 updated graded icon indicator to use data-tooltip, font-awesome, plus hides it from screenreaders 2015-07-13 22:31:20 -04:00
Sven Marnach
3d7246ecc8 Allow masquerading as a specific user different from the logged in user. 2015-07-13 18:55:45 -07:00
Renzo Lucioni
609e6ca277 Mark basket creation and order retrieval endpoints as v0 
These endpoints are currently for internal use only, but should be versioned nonetheless; Drupal will begin using the basket creation endpoint soon. No functionality has been changed. XCOM-494.
 2015-07-13 16:27:58 -04:00
AlasdairSwan
51deec380e ECOM-1661 removed nav links for logged out states 
Add context for navigation states
added find course to dashboard sidebar and included check for context that Will adds in PR
removed nav_course_search context due to design change so replaced with nav_hidden
Removed rwd_header.js and all references as no longer being used.

Wrapped Find Courses in dashboard sidebar in if statement
 2015-07-13 15:33:00 -04:00
Frances Botsford
32df8db753 user menu cleanup 2015-07-10 14:13:45 -04:00
Chris
e51a54a93b Merge pull request #8797 from edx/clrux/ux-2323-ora-focus 
ORA2: Focus and outline styles
 2015-07-09 11:44:22 -04:00
Chris Rodriguez
5d086dab62 ORA2: Focus and outline styles 2015-07-09 19:59:28 +05:00
Ahsan Ulhaq
c94f043c2b Credit Payment - Dashboard States 
ECOM-1578
 2015-07-09 13:33:31 +05:00
Alison Hodges
747c6b7413 Merge pull request #8716 from edx/ahodges/staff_labeling 
Ahodges/staff labeling
 2015-07-08 17:34:29 -04:00
Braden MacDonald
d07a2798a1 Merge pull request #8815 from open-craft/hinted-login-fix 
Fix hinted login view to be compatible with secondary providers.
 2015-07-08 10:57:08 -07:00
Aamir
9f0b5ed2cd Merge pull request #8720 from edx/ECOM-1601-credit-help-link 
ECOM-1601: Added the help link of credit info
 2015-07-08 11:55:11 +05:00
Braden MacDonald
f4c8d8fa86 Fix hinted login view to be compatible with secondary providers. 2015-07-07 16:42:12 -07:00
Chris
bd817bb41e Merge pull request #8784 from edx/clrux/ux-2337-a11y-calculator-contrast 
Fixing aria values and contrast for accessibility
 2015-07-07 16:07:14 -04:00
Chris Rodriguez
3309581a36 Adding uniqueness to some elements 2015-07-07 13:54:49 -04:00
aamir-khan
935da3a12c ECOM-1601: Added the help link of credit info 2015-07-07 09:58:48 +00:00
Chris Rodriguez
45c1f28d5f Fixing aria values and contrast for accessibility 2015-07-06 14:02:18 -04:00
Giulio Gratta
84f7aef917 Default "Course About" image 
Templates that display the image now check if courses specifies an image, if they don't the default image is displayed

Path set in both common.py and aws.py to allow for easy overriding in one place.

Addresses SOL-926

Some code provided by Davorin Sego
 2015-07-06 10:29:12 -07:00
Davorin Šego
e7f7bdaed9 Merge pull request #8738 from edx/dsego/SOL-734-addendum 
Fixes header styling issue introduced in SOL-734 (#8389) by reverting…
 2015-07-06 16:18:00 +02:00
Frances Botsford
b45b122c18 fixed pagination styles in teams and studio 2015-07-06 08:45:03 -04:00
Daniel Friedman
3b55d88283 Implement paginated Team Topics UI 
Authors:
  - Dan Friedman
  - Ben McMorran
  - Peter Fogg

TNL-1892
 2015-07-06 08:45:03 -04:00
Ben McMorran
351e491c82 Add generic paging framework 
Authors:
  - Daniel Friedman
  - Ben McMorran
  - Peter Fogg

TNL-1892
 2015-07-06 08:45:03 -04:00
Usman Khalid
fe54b085c6 Added ability to disable xblock types in LMS. 
TNL-2305
 2015-07-03 20:58:40 +05:00
zubair-arbi
8934818381 Merge pull request #8753 from edx/zub/bugfix/ecom-1734-change-login-redirect-url 
change redirect url from '/accounts/login' to '/login'
 2015-07-03 16:19:24 +05:00
asadiqbal
57d5de5d14 asadiqbal08/SOL-766: Add Facebook sharing to certificate view 
* updated the flags for social media sharing
* added facebook feed ui to share public url
* update the condition logic
* update the code as per suggestion and added pick new style for share buttons
* update the css class reference
* update the bok-choy test
* updated description and some text touch-ups
* moved the JS related to facebook into separate location
* js formatting
* Add trailing comma per chrisndodge
* Add wait to fix flaky test...maybe
 2015-07-02 18:52:15 -04:00
Matt Drayer
1ca37737e9 Merge pull request #8566 from edx/ziafazal/SOL-980 
ziafazal/SOL-980: Generate certificates from instructor dashboard
 2015-07-02 16:07:33 -04:00