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

27986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Stupak
ce4fb60ba0 Merge pull request #5598 from edx/anton/maintenance-fonts 
Maintenance page: Serving Fonts through Platform Assets
 2014-10-22 17:19:22 +03:00
AlasdairSwan
5671392a5d Merge pull request #5681 from edx/alasdair/logistration-styling 
Alasdair/logistration styling - merge approved by Will
 2014-10-22 10:16:05 -04:00
AlasdairSwan
3a0304724d ECOM-531 tweaking margins 2014-10-22 09:52:40 -04:00
chrisndodge
228c513dd3 Merge pull request #5678 from edx/cdodge/shoppingcart-rewrite-hotfix1 
css fix of remove icon and Fixed a bug where the discount coupon applied...
 2014-10-22 09:47:08 -04:00
Don Mitchell
00ca7cbde5 Merge pull request #5649 from edx/dhm/update_ok 
Update opaque_keys to new release
 2014-10-22 09:42:29 -04:00
Don Mitchell
2ac069a6ae Merge pull request #5653 from edx/dhm/PLAT-189 
Add command line command to create course in either split or mongo
 2014-10-22 09:41:55 -04:00
Oleg Marshev
21056b950e Use DATE_TIME format for course start or end time in student dashboard. 2014-10-22 16:23:32 +03:00
lduarte1991
976c3cb11f Annotation Tool: Fix Share Plugin style and spacing 
- fixed parseInt issue

 - PR fixes
 2014-10-22 09:22:10 -04:00
lduarte1991
deefe9b13e Annotation Tools: Updated Share plugin from version 1.0 to v1.1 2014-10-22 09:21:39 -04:00
clytwynec
def3467e45 Merge pull request #5672 from benpatterson/testeng/rebase-upstream 
Testeng/rebase upstream
 2014-10-22 09:19:03 -04:00
Muhammad Shoaib
b0802aafc8 css fix of remove icon and Fixed a bug where the discount coupon applied ‘disappeared’ 
when changing the quantity between enrollment vs reg code cart types.
 2014-10-22 09:12:32 -04:00
polesye
7e6483f7b5 TNL-633: Remove leftover Google Font reference. 2014-10-22 16:11:49 +03:00
AlasdairSwan
ab035a0ebb ECOM-531 updating grid column counts in media queries and added some more classes to style against instead of elements 2014-10-22 09:06:28 -04:00
chrisndodge
7dc13508cb Merge pull request #5674 from edx/cdodge/single-seat-order-receipt-email-is-not-html 
only multi-seat emails is html
 2014-10-22 08:59:25 -04:00
Adam
2bb44a001a Merge pull request #5641 from edx/adam/update-latex-data 
update latex problem data (TNL-264)
 2014-10-22 08:52:52 -04:00
Chris Dodge
cb6f96603b only multi-seat emails is html 2014-10-22 00:37:46 -04:00
Muhammad Ammar
03b9ed744f Publish datadog stats for build 
TE-453
 2014-10-22 00:05:03 +00:00
Ben Patterson
3a6a519bac Upgrade to mongo 2.6.4 2014-10-22 00:05:03 +00:00
Muhammad Ammar
ff0e8c3805 Merge Coverage Reports 
TE-465
 2014-10-22 00:05:03 +00:00
Ben Patterson
5524e0bdee Add quality report capability. 2014-10-22 00:05:03 +00:00
Ben Patterson
a90ba504f7 re-shard lms to fix a failing test. 2014-10-22 00:05:03 +00:00
Ben Patterson
eb0ada02d4 introduce bok-choy shards, new firefox version 2014-10-22 00:05:03 +00:00
Minh Tue Vo
07a723c08e fixing file log error 2014-10-22 00:05:03 +00:00
Minh Tue Vo
bef4e9c584 adding post worker script 2014-10-22 00:05:03 +00:00
Minh Tue Vo
d6434676ca fixed capturing screenshots 2014-10-22 00:05:03 +00:00
Ben Patterson
2b40e26283 Merge PR#3. Solano: Add post worker hook for copying artifacts. 2014-10-22 00:05:03 +00:00
Ben Patterson
7b5e5794b0 add Solano CI. 2014-10-22 00:05:03 +00:00
Adam Palay
becd4c1b9a update latex problem data (TNL-264) 2014-10-21 16:58:30 -04:00
Don Mitchell
0d36dd7264 Merge pull request #5646 from edx/dhm/migrate_bug 
Fix command line migrator
 2014-10-21 16:55:59 -04:00
AlasdairSwan
24a01ae37e ECOM-531 Styling the buttons 2014-10-21 16:40:58 -04:00
Don Mitchell
a4d13dc42c Add command line command to create course in either split or mongo 
PLAT-189
 2014-10-21 16:34:36 -04:00
AlasdairSwan
00ff10820a ECOM-531 Styling the forms 2014-10-21 16:03:58 -04:00
Stephen Sanchez
342472e4a3 Merge pull request #5666 from edx/bug/runtime_resource_fs 
Temporary fix for runtime.resources_fs error
 2014-10-21 15:40:38 -04:00
chrisndodge
1e82c5426c Merge pull request #5670 from edx/cdodge/WL-98 
WL-98
 2014-10-21 15:35:23 -04:00
Ben Patterson
bf0378f39f Merge pull request #5669 from edx/benp/solano2-flaky-couse-export 
Add wait to fix flaky tests.
 2014-10-21 15:31:01 -04:00
Carol Tong
47e7dfc135 Merge pull request #5644 from edx/carol/docs/DOC-990 
Update screenshots to show updated text under Advanced Settings discussion blackout period
 2014-10-21 14:43:41 -04:00
David Baumgold
332dc53ee7 Merge pull request #5661 from edx/openedx-confluence-release-pages 
Make release script suggest a release page on openedx.atlassian.net
 2014-10-21 14:40:22 -04:00
chrisndodge
b60830268d Merge pull request #5665 from edx/cdodge/better-encoding-for-csv-downloads 
Fix unicode problem and also make display links a bit shorter
 2014-10-21 14:36:26 -04:00
David Baumgold
08dbf9f351 Make release script suggest a release page on openedx.atlassian.net 2014-10-21 14:26:53 -04:00
asadiqbal08
1035d67a25 WL-98 
fix typo and add more security on API

fix some bugs and typos

address PR feedback

be sure to send emails when accounts already exist

PR feedback

fix multiple uploads

pep8 fixes

pep8 fix

pylint fixes

fix url mapping

WL-98
- Complete code coverage
- Update code for error and warning messages.
- improve code as per some suggestions

updated the UI of the auto_enroll feature

fixed the errors

PR feedback

add test

add back file filtering

add some more error handling of input

remove unneeded coffeescript code

pylint fixes

add pep8 space

WL-98
- Updated and added test cases.
- Updated membership coffee file for errors display handling.
- fixed minor text issues.

allow for blank lines and add a test

add blank line (pep8)
 2014-10-21 14:23:46 -04:00
Ben Patterson
f3facddee6 Add wait to fix flaky tests. 2014-10-21 14:21:42 -04:00
Don Mitchell
f95ecea9a9 Temporary fix for runtime.resources_fs error 2014-10-21 13:55:29 -04:00
Chris Dodge
19ab2b93b4 Fix unicode problem and also make display links a bit shorter 
wip

remove unused kwarg
 2014-10-21 13:35:25 -04:00
Don Mitchell
f89a6944de Re-enable the unit tests and fix 2014-10-21 13:14:21 -04:00
Mark Hoeber
c213f64d4f Merge pull request #5642 from edx/markhoeber-doc1123 
Updated max attempts advanced settings help string
 2014-10-21 11:09:34 -04:00
srpearce
8e0d5bd96b Merge pull request #5354 from edx/sylvia/docs/mobile 
Sylvia/docs/mobile
 2014-10-21 10:46:32 -04:00
AlasdairSwan
b69035f3af Merge pull request #5659 from edx/alasdair/combine-reg-login-form 
ECOM-408 Added grid-settings to override the default global box-sizing s...
 2014-10-21 10:19:41 -04:00
AlasdairSwan
a5da61b4ab ECOM-408 Added breakpoint variables to _grid-settings.scss 2014-10-21 09:39:32 -04:00
Don Mitchell
98f962274c Update opaque_keys to new release 2014-10-21 09:30:33 -04:00
AlasdairSwan
93246db656 ECOM-408 Added grid-settings to override the default global box-sizing style 2014-10-21 09:11:59 -04:00