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

8800 Commits

Author SHA1 Message Date
Adam
0c47a74b45 Merge pull request #4784 from edx/adam/track-bulk-email-memory 
Adam/track bulk email memory
 2014-08-27 12:53:13 -04:00
jmclaus
21c4cc73a9 Merge pull request #4919 from edx/jmclaus/serving_fonts_through_platform 
Serving Fonts through Platform Assets
 2014-08-27 11:38:54 -04:00
Will Daly
a03baee25c Merge pull request #4976 from edx/will/ecom-128 
Embargo based on country code in the user's profile.
 2014-08-27 11:24:26 -04:00
Adam Palay
22a8ce39e2 add tracking for memory usage in creating subtasks (LMS-6488) 2014-08-27 11:12:52 -04:00
jmclaus
037abb6d50 Replace reference to Google OpenSans with edX-hosted OpenSans 2014-08-27 10:34:53 -04:00
Will Daly
31a6566110 Embargo based on country code in the user's profile. 2014-08-27 08:51:45 -04:00
Waheed Ahmed
57bc5c9314 Modified request method for change enrollment and bulk beta modify access on instructor dashboard. 
LMS-11266
 2014-08-27 13:20:04 +05:00
Don Mitchell
9c946f2245 djpyfs is installed app not middleware 2014-08-26 14:38:55 -04:00
Don Mitchell
4465b26a43 Use opaque_keys w/ model vars not parsing of url 
to generate url.
LMS-11209
 2014-08-25 18:07:37 -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
Sarina Canelake
eb84832849 Merge pull request #4325 from edx/victor/update-activation-email-text 
Update activation email text
 2014-08-25 13:43:18 -04:00
Don Mitchell
0976f8031f Merge pull request #4931 from edx/reruns/check_answer 
Fix check and show answer for split
 2014-08-25 13:10:28 -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
Victor Shnayder
26d975c2f4 Update activation email text 
Make it more active.  Adds a separate section for edX.org-specific copy,
because it's hard to make it generic.

LMS-11084
 2014-08-25 12:09:47 -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
Don Mitchell
4d701bebef Fix check and show answer for split 
LMS-11237
 2014-08-25 10:29:50 -04: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
Alexander Kryklia
095b07275e Unflag Group Configurations, Render only existing children in staff view of split_test. 2014-08-22 16:43:54 -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
frances botsford
7260094ef3 Merge pull request #4145 from IONISx/tusbar/rewrite-password-reset-templates 
Make use of django_main for password_reset templates
 2014-08-22 08:06:29 -04:00
Waheed Ahmed
b98fe5bf1e Fixed analytics counts on instructor dashboard. 
LMS-11228
 2014-08-22 12:22:29 +05:00
Don Mitchell
d1ffecf31f Fix lms wiki url parsing 
LMS-11240
 2014-08-21 12:11:27 -04:00
Don Mitchell
24cdd7a481 Assume any non-xml modulestore is r/w 
LMS-11235
 2014-08-21 12:11:27 -04:00
Don Mitchell
78879ebc18 Asset urls must start w/ slash 
LMS-11233
 2014-08-21 12:11:27 -04:00
Bertrand Marron
bd1e25baff Fix 'change my password' button font size 2014-08-21 15:19:04 +02:00
Braden MacDonald
c3abf326ff Friendly error if invalid student identifier is entered for due date extension 2014-08-20 17:09:57 -07: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
Sarina Canelake
874355652b Merge pull request #4911 from edx/sarina/a11y-extensions 
Add placeholders for text input on Extensions dash feature
 2014-08-20 16:00:40 -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
Sarina Canelake
06001abc60 Merge pull request #4905 from bradenmacdonald/fix-idde-ui 
Fix: inadvertent scroll when loading the instructor's extensions tab
 2014-08-20 13:15:39 -04:00
Sarina Canelake
fadade48d4 Add placeholders for text input on Extensions dash feature 2014-08-20 12:03:08 -04:00
Sarina Canelake
665479a811 Merge pull request #4868 from bradenmacdonald/fix-idde-bugs 
Fixed: Can set earlier due date as an individual due date extension and related bugs
 2014-08-20 11:47:31 -04:00
Will Daly
be1523f280 Merge pull request #4880 from edx/will/use-new-cybersource-api 
CyberSource API Update
 2014-08-20 11:22:13 -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
Waheed Ahmed
e26efea26f Fixed 500 error on views with incomplete course id in url. 
LMS-11217
 2014-08-20 18:30:58 +05:00
Bertrand Marron
70f698267a Update password reset views style 
Reuse the style from login and register views.
Remove all the specific style.
 2014-08-20 14:17:55 +02:00
Bertrand Marron
879232af46 Make use of django_main for password_reset templates 
Remove duplicated code and make sure those views use the same visual
identity.
 2014-08-20 14:17:55 +02:00
Waqas Khalid
01aa38fb82 Truncated markup can be displayed in forums user profile view 
FOR-581
 2014-08-20 14:33:23 +05:00
Braden MacDonald
9c93cd8dd6 Fix: Display error when attempting to reset nonexistent due date extension 2014-08-19 23:29:36 -07:00
Braden MacDonald
f4e021093a Fix: 500 response if indiv. due date deleted after normal due date was deleted 2014-08-19 23:23:07 -07:00
Braden MacDonald
3ab8779190 Fix: API allowed an individual due date extension on units with no due date 2014-08-19 23:23:06 -07:00
Braden MacDonald
a08ab9ff11 Fix: an individual extended due date must not precede the normal due date LMS-6563 2014-08-19 23:23:06 -07:00
Braden MacDonald
42eaa4b005 Unit tests for bugs in IDDE API, including LMS-6563 2014-08-19 23:23:06 -07:00
Braden MacDonald
dbbbe8f2cb Fix: inadvertent scroll when loading the instructor's extensions tab 
(The div with id "view-extensions" conflicts with the tab JS which sets location.hash to "view-x" in order to track the current tab)
 2014-08-19 23:18:31 -07:00
jhelbert
92fa79dbd0 Merge pull request #4871 from edx/jhelbert/api-upgrade-check 
This confirms the data api upgrade
 2014-08-19 16:36:29 -04:00
Justin Helbert
dd7f09d36a This confirms the data api upgrade 2014-08-19 19:03:58 +00:00
Will Daly
43368b29b0 Merge pull request #4886 from edx/will/ecom-122 
Fix messaging for professional ed under auto-registration
 2014-08-19 14:58:18 -04:00
Sarina Canelake
46051ef212 Merge pull request #3495 from eduNEXT/feature/fmo/theme-microsite-support 
Microsites alongside Theme
 2014-08-19 12:39:21 -04:00
Renzo Lucioni
3aee8a2923 Merge pull request #4876 from edx/web-analytics/noninteraction-events 
Mark calls to track() on pageload as noninteraction events
 2014-08-19 11:24:44 -04:00