Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,725 Commits 1 Branch 0 Tags
2745398dc0bb418f2c6e4fe5a8a2c7aba74706ae
Commit Graph

29725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam
2745398dc0 Merge pull request #7729 from edx/adam/different-queue-small-emails 
Adam/different queue small emails
 2015-04-17 16:02:11 -04:00
Jesse Zoldak
200aaf427b Merge pull request #7743 from edx/revert-7708-will/ecom-1411 
Revert "Expose course start/end date in the enrollment API"
 2015-04-17 15:54:25 -04:00
Jesse Zoldak
b5305147b3 Revert "Expose course start/end date in the enrollment API" 2015-04-17 15:46:55 -04:00
Will Daly
53f4a13f3b Merge pull request #7708 from edx/will/ecom-1411 
Expose course start/end date in the enrollment API
 2015-04-17 14:23:00 -04:00
Chris
3cf73d55ea Merge pull request #7721 from edx/clrux/UX-1953-dropdown-fix 
Fixed caret position for LTR and RTL (SOL-693)
 2015-04-17 14:20:42 -04:00
Calen Pennington
f67cb76fb4 Merge pull request #7686 from cpennington/xmodule-metrics-sample-rate 
Sample xblock metrics at 10%
 2015-04-17 13:52:05 -04:00
Chris Rodriguez
e3dba5fb32 Fixed z-index for social action dropdown (TNL-1806) 2015-04-17 12:55:59 -04:00
Chris Rodriguez
766f700b48 Fixed caret position for LTR and RTL (SOL-693) 2015-04-17 12:55:58 -04:00
Chris
4a27e8b6cc Merge pull request #7711 from edx/clrux/UX-1946-div-focus-fix 
Adding outline styles (none) to the sr focus div
 2015-04-17 12:44:27 -04:00
Will Daly
e777260712 Merge pull request #7687 from edx/will/ecom-1408-take-two 
Credit message on track selection page.
 2015-04-17 11:53:36 -04:00
Eugeny Kolpakov
b1765d0a69 Merge pull request #7641 from open-craft/eugeny/problem-type-search 
Capa problem type filtering using edx-search
 2015-04-17 18:43:04 +03:00
Marco Morales
25b0264a48 Merge pull request #7730 from edx/marco/fix/course-refund-via-unenroll 
Still show dropdown actions even if course isn't accessible.
 2015-04-17 11:21:48 -04:00
Sarina Canelake
4027ca1f48 Merge pull request #7738 from jazkarta/cewing-add-contributor 
Add Cris Ewing and Carlos de La Guardia to the authors list
 2015-04-17 11:13:48 -04:00
cewing
c8b56b6f49 Add Cris Ewing and Carlos de La Guardia to the authors list 
Both contributed to the MIT CCX pull request
 2015-04-17 08:04:59 -07:00
Will Daly
3b160eefcb Credit message on track selection page. 
* Adds a credit course mode to indicate that a course
has a credit option.

* Hides the credit option from the track selection and
pay-and-verify pages.

* Shows different messaging for the verified track if
it's possible to upgrade from verified to credit at the end
of the course.
 2015-04-17 10:59:37 -04:00
Chris Rodriguez
2637ac897d Changing id to class 2015-04-17 08:55:30 -04:00
Chris Rodriguez
cb1bfa53de Adding outline styles (none) to the sr focus div 2015-04-17 08:55:29 -04:00
E. Kolpakov
d4f85d876b Removed unnecessary comments 2015-04-17 12:24:37 +03:00
E. Kolpakov
3b348b7d3f Tests for reindex library management command 2015-04-17 12:20:31 +03:00
Awais Qureshi
0b5d0b2949 Merge pull request #7698 from edx/awais786/ECOM-1421-modify-course-access-api 
ECOM-1421 implementing the functionality
 2015-04-17 12:07:07 +05:00
Braden MacDonald
00db27b63e Merge pull request #7638 from open-craft/problem-builder-version-bump 
Bump version of Problem Builder
 2015-04-16 16:38:57 -07:00
Marco Morales
a43f411297 Merge pull request #7608 from indagation/close-modal 
Fix modal close button
 2015-04-16 17:27:50 -04:00
Marco Morales
c67e8b9ef4 moved the dropdown actions outside of the if show_courseware_link in attempt to still show the dropdown actions 2015-04-16 16:40:46 -04:00
Adam Palay
f37c7934f0 reset queue reference in aws.py, use low priority queue (TNL-1591) (TNL-2003) 2015-04-16 15:41:16 -04:00
Chris
c5ce007a93 Merge pull request #7712 from edx/clrux/UX-2001-summary-table-contrast 
Chaning table th td color to meet AA guidelines
 2015-04-16 15:40:37 -04:00
Braden MacDonald
513591f409 Bump problem builder version to latest edx-release build 2015-04-16 11:56:50 -07:00
Sarina Canelake
cb333c414a Merge pull request #7670 from louyihua/lms_i18n_1 
Better i18n (cont.)
 2015-04-16 14:05:53 -04:00
Adam
9a35c51e6e Merge pull request #7724 from edx/release 
Release
 2015-04-16 13:40:41 -04:00
louyihua
b7c6b4ad55 Better i18n (cont.) 
1. Fix sentence breaks inside `photo_reverification.html` and `midcourse_photo_reverification.html`.
2. Combine three setences inside `choose.html`.
3. Adding some punctuation marks to reduce duplicated strings with only different Punctuation marks in translation.
4. Move the colons inside the strings to be translated. This may be not necessary for now, but I think this may help translation by removing potential word meaning conflict.
5. Sorry for
 2015-04-17 01:05:46 +08:00
Awais
2cd265292f ECOM-1421 implementing the functionality 2015-04-16 21:46:47 +05:00
Adam
38811f218b Merge pull request #7716 from edx/hotfix/2015-04-16 
Hotfix/2015 04 16
 2015-04-16 12:14:26 -04:00
Adam Palay
987ea8551e fix quality violation 2015-04-16 10:13:36 -04:00
Marco Morales
9e525d6b5c added images to the bulk email directory to include Youtube as a social icon option 2015-04-16 10:03:22 -04:00
Feanil Patel
fd99d55218 Merge pull request #7715 from edx/feanil/sassy_certs 
Be more specific about where we compile sass from.
 2015-04-16 09:07:32 -04:00
Waheed Ahmed
ec16bc3710 Merge pull request #7701 from edx/waheed/tnl2000-ora-release-tag 
Added new release tag for ORA2.
 2015-04-16 16:00:47 +05:00
Chris Rodriguez
b6b7acbd53 Chaning table th td color to meet AA guidelines 2015-04-16 06:57:42 -04:00
Chris
c641155cb2 Merge pull request #7467 from edx/clrux/UX-1810-a11y-color-fix--blue 
Accessibility: Updating the color blue on LMS
 2015-04-16 06:55:32 -04:00
Aamir
a5bacc3461 Merge pull request #7682 from edx/aamir-khan/ECOM-1287-reverification-xblock-in-github 
ECOM-1396: added the xblock setup in github.txt of edx-platform
 2015-04-16 14:55:02 +05:00
Ahsan Ulhaq
eba02da233 Merge pull request #7544 from edx/ahsan/tnl-1675-iframe-elements-require-meaningful-title 
iframe elements require a meaningful title attribute
 2015-04-16 13:54:15 +05:00
Waheed Ahmed
5fec96aefc Added new release tag for ORA2. 
TNL-2000
 2015-04-16 12:39:00 +05:00
Awais Jibran
efc1d5d3ef Merge pull request #7649 from edx/aj/tnl1902-fix-long-latex-post-discussion 
Fixed Long discussion post not rendering Latex expressions
 2015-04-16 10:49:58 +05:00
Marco Morales
031edf6abf Merge pull request #7221 from edx/marco/discussions-related-to 
Updated Styling for course references in discussion forum posts
 2015-04-15 19:47:54 -04:00
Adam Palay
9196817abb Revert "Decrease the number of inserts and updates needed by DjangoKeyValueStore" 
This reverts commit 88b9187476.
 2015-04-15 17:41:11 -04:00
Carson Gee
deefce0194 Merge pull request #7700 from mitocw/feature/cg/ccx_urls 
Put CCX URLs behind their feature flag
 2015-04-15 17:39:52 -04:00
Feanil Patel
b0dbe2f2da Be more specific about where we compile sass from. 
There are now folders under static that have sass that should not be compiled
as a part of our asset pipeline,  they were getting pulled in because the wildcard
for `SASS_UPDATE_DIRS` was too broad.  This update makes it more specific for most
folders but leaves it broad for the common folder where the xmodule has its own sass
that needs compiling from a non-standard location.
 2015-04-15 17:27:17 -04:00
David Baumgold
1c910023aa Merge pull request #7111 from ataki/ataki/upstream-pr-video-start-stop 
hard start/stop times to video player
 2015-04-15 16:42:24 -04:00
Carson Gee
b6970d9aa3 Put CCX URLs behind their feature flag 
- Moved the CCX URLS into their django app.
 2015-04-15 16:38:10 -04:00
Will Daly
da8103d2ea Expose course start/end date in the enrollment API 2015-04-15 16:14:30 -04:00
Will Daly
a91d90cbd8 Merge branch 'release' 2015-04-15 16:12:00 -04:00
David Baumgold
9018088c5c Merge pull request #7693 from edx/remove-nested-form-elements 
Remove nested form elements
 2015-04-15 15:33:15 -04:00