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

3531 Commits

Author SHA1 Message Date
Piotr Mitros
ce2e51384f AWS settings for XBlocks to have filesystem-like storage 2014-09-02 10:39:01 -04:00
Stephen Sanchez
75d6f99fed The main django template needs header and footer feature flags. 2014-09-02 12:08:22 +00:00
Julia Hansbrough
c7d4183310 Merge pull request #4915 from edx/flowerhack/redo-third-party 
Facebook auth support.
 2014-08-30 02:50:57 -04:00
Jesse Zoldak
96153ceed0 Revert "The main django template needs header and footer feature flags." 2014-08-29 16:43:30 -04:00
Will Daly
5cc6455fe3 Merge pull request #5006 from edx/will/ecom-199 
ECOM-199: Auto-registration bugfix
 2014-08-29 16:33:20 -04:00
Julia Hansbrough
fd925e8970 Add server-side analytics logging for login 
Also, removed the client-side analytics for logging in.
Ensures that analytics are collected for third-party-auth logins.
Fixed failing tests related to third-party-auth.
 2014-08-29 19:49:42 +00:00
Stephen Sanchez
20a66ee2ef The main django template needs header and footer feature flags. 2014-08-29 15:38:28 +00:00
Will Daly
9d4bf89058 Exclude courses from the auto-registration A/B test 2014-08-29 08:24:04 -04:00
Will Daly
83bfb17807 Use new-style course locators consistently when setting the donation amount in the session 
Update devstack settings to use new CyberSource API
 2014-08-28 13:55:31 -04:00
Stephen Sanchez
9186f39eb6 Adding social media link overrides for AWS. 2014-08-27 15:23:12 +00:00
Don Mitchell
9c946f2245 djpyfs is installed app not middleware 2014-08-26 14:38:55 -04:00
Piotr Mitros
b166503749 Merge pull request #4889 from edx/danielli/pyfs 
Adds pyfilesystem service from XBlocks to edx-platform
 2014-08-25 16:37:46 -04:00
swdanielli
8378422f3d code clean 2014-08-25 12:25:03 -04:00
swdanielli
504a7a21ba add pyfs service 2014-08-25 12:25:03 -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
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
Minh-Tue Vo
5b1befa92b Merge pull request #4902 from edx/mvo/adding_tests_for_country_list 
adding tests for country list in different languages
 2014-08-20 16:28:50 -04:00
Minh Tue Vo
4e1c4c46e6 adding tests for country list in different languages 
updating the version for django_countries
 2014-08-20 15:30:17 -04:00
Will Daly
1ad8d4f2d4 Add verification for CyberSource2 implementation. 
Clean up shopping cart processor API.
Fix UUID JSON serialization bug in CyberSource2 implementation.
Update test suite to use new CyberSource2 implementation.
Fix i18n messages in CyberSource2
Enable CyberSource2 implementation by default.
 2014-08-20 10:39:48 -04:00
Don Mitchell
8d070e6422 Rewrite course url matcher to not be greedy 
LMS-11181
 2014-08-18 16:18:22 -04:00
clytwynec
310778dfa7 Merge pull request #4838 from edx/clytwynec/remove_warnings_from_lettuce_test_logs 
set root logging level for acceptance tests to ERROR
 2014-08-15 13:08:56 -04: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
Jesse Zoldak
4d5b948928 Merge pull request #4748 from Stanford-Online/jbau/parallel-unit-tests 
make unit tests respect mongo port/host settings (with default)
 2014-08-15 10:56:52 -04:00
marco
6f810836db Template changes for course track AB-test 2014-08-15 10:26:29 -04:00
Christine Lytwynec
bdc4fd4d86 set root logging level for acceptance tests to ERROR 2014-08-14 14:18:51 -04:00
Sarina Canelake
6dd9d9ec3f Merge pull request #4586 from jazkarta/edx-jsme-1.0 
Release edx-jsme 1.0
 2014-08-14 10:02:55 -04:00
Sarina Canelake
c285bda69f Merge pull request #4625 from fmyzjs/ipv6 
Support ipv6 in geoinfo and Embargo
 2014-08-14 09:26:57 -04:00
Jason Zhu
13846e074d Support ipv6 in geoinfo and Embargo 2014-08-14 16:13:35 +08:00
lduarte1991
8cfdb8f14c Annotation Tools: Adding comments and adding CSS groups 2014-08-13 21:35:37 -04:00
Will Daly
680d5031d7 Merge pull request #4802 from edx/will/unit-test-staticfiles 
Unit tests don't need assets
 2014-08-12 16:42:19 -04:00
Will Daly
a827df27fe Remove update assets from unit test suite 
Update settings so unit tests pass
 2014-08-12 15:08:39 -04: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
Jason Bau
b55362b925 make unit tests respect mongo port/host settings (with default) 
settings are read in from environment variable
 2014-08-11 14:17:29 -07:00
Chris Rossi
88af00904f Release edx-jsme 1.0 2014-08-11 09:04:27 -04:00
Renzo Lucioni
2380235fd7 Add Optimizely widget 2014-08-08 14:58:18 -04:00
Nimisha Asthagiri
abbfa95e4c LMS-11168 Support for removing versions and branch in Split, Mixed, and SQL. 
Make default_store thread-safe.
 2014-08-07 18:07:41 -04:00
Nimisha Asthagiri
a55b406c53 LMS-11177 Add Split to configuration settings. 2014-08-07 17:59:37 -04:00
Clinton Blackburn
1a4e067712 Added link from instructor dashboard to analytics dashboard 2014-08-07 12:13:34 -04:00
Xavier Antoviaque
e8259b8234 secure-cookies: Allow to use secure HTTPS cookies (Django setting) 
Cf https://docs.djangoproject.com/en/1.4/ref/settings/#std:setting-SESSION_COOKIE_SECURE
 2014-08-07 09:30:51 +02:00
lduarte1991
0ca9bfa7e4 Annotation Tools: Added Grouping Plug-In 
- adding comments

 - spacing issues and indentation
 2014-08-06 14:49:40 -04:00
clytwynec
22582f4931 Merge pull request #4634 from edx/clytwynec/removing_remaining_rake_references 
removing rake and  outdated references to it
 2014-08-06 10:20:30 -04:00
Muhammad Shoaib
4333e53997 added registration-codes generation functionality 
rebased and resolve conficts with cdoge/registration_codes

feature enhancement request: added transaction group name text field to the download buttons as an extra optional query paramerter
 2014-08-05 10:00:11 -04:00
Christine Lytwynec
eb3c1ab9a8 removing rake and outdated references to it 2014-08-05 09:54:29 -04:00
Sarina Canelake
ecba41e865 Add Eng (GB) and Albanian lang codes 2014-08-04 11:13:06 -04:00
Renzo Lucioni
3599e2eec7 Revert "Revert "Merge pull request #4545 from edx/renzo/bi-analytics-overhaul"" 
This reverts commit 079808ee47.
 2014-07-30 17:01:52 -04:00
Julia Hansbrough
14dc3ce853 Merge branch 'release' 2014-07-30 19:35:51 +00:00
Ben Patterson
2848f7ab58 Merge pull request #4597 from edx/benp/fix-bok-choy-solano 
Simplify bok choy environments to inherit pipeline settings from common.
 2014-07-30 12:16:45 -04:00
Nimisha Asthagiri
538bec92a7 LMS-11137 Course Action State Django models. 2014-07-29 15:03:36 -04:00