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
Brian Talbot
dfbcd76885 Studio: resolves layout issues with icons in system feedback UI 2014-09-04 11:07:54 -04:00
Jesse Zoldak
814f6b9144 Fix capitilization on verified flow 2014-09-04 11:05:47 -04:00
Nimisha Asthagiri
272dd2aa52 Merge pull request #5071 from edx/split/re-import-issue 
LMS-11342 Fix Split reimport issue.
 2014-09-04 10:58:12 -04:00
Alexander Kryklia
f591f3819b Merge pull request #5074 from edx/alex/fix_lti_description 
Fix description for LTI passports field.
 2014-09-04 17:36:22 +03:00
Daniel Friedman
15c0531945 Merge pull request #5026 from edx/dan-f/test-lms-passes-group-id 
Test passing `group_id` in thread creation
 2014-09-04 10:34:10 -04:00
Nimisha Asthagiri
01fb81b82e Merge pull request #4975 from edx/reruns/analytics_i4x 
Remove client side parsing of module_id
 2014-09-04 10:18:38 -04:00
Julia Hansbrough
23d3a9187c Merge pull request #5073 from edx/ecom/fix-user-id 
Analytics should use user.id not anon id
 2014-09-04 10:00:28 -04:00
Alexander Kryklia
62afe9c3a5 Fix description for LTI passports field. 2014-09-04 16:17:27 +03:00
Julia Hansbrough
0dea82e43e Analytics should use user.id not anon id 2014-09-04 09:03:55 -04:00
muhammad-ammar
da9a01a6c3 Tooltip Acceptance Test 2014-09-04 10:24:55 +00:00
Waheed Ahmed
90fbbe14c3 Merge pull request #5005 from edx/waheed/lms11302-fix-external-link-alignment 
Minor styling tweaks for external resource button in LTI component.
 2014-09-04 14:55:26 +05:00
Waheed Ahmed
4993e22384 Minor styling tweaks. 
LMS-11302
 2014-09-04 14:10:37 +05:00
Nimisha Asthagiri
b6590228a3 LMS-11342 Fix Split reimport issue. 2014-09-03 23:03:00 -04:00
Don Mitchell
afa57f505b Remove client side parsing of module_id 
in analytics dashboard.
LMS-11209
 2014-09-03 21:59:29 -04:00
Daniel Friedman
25cbda6638 Test passing group_id in thread creation 2014-09-03 18:14:37 -04:00
Greg Price
a8d07780fc Merge pull request #5067 from edx/gprice/forum-nav-header-width 
Cosmetic fixes for forums
 2014-09-03 16:59:18 -04:00
Jim Abramson
2cba87d0e7 Merge pull request #5051 from edx/jsa/fix-thing 
remove use of ngettext in discussion jasmine test
 2014-09-03 16:53:53 -04:00
Sarina Canelake
7acab41f86 Merge pull request #5058 from edx/sarina/fix-activation-email-link 
Fix link in account activation email
 2014-09-03 16:36:08 -04:00
Greg Price
d303041c55 Fix size of endorser username in forum responses 2014-09-03 16:13:33 -04:00
Greg Price
a703cc8fa8 Fix forum nav header width 2014-09-03 15:51:12 -04:00
jsa
50741304dc remove use of ngettext in discussion jasmine test 2014-09-03 15:09:44 -04:00
Jason Bau
4d5a2380f1 external_auth: handle request.META values as str, not unicode 2014-09-03 12:07:35 -07:00
Renzo Lucioni
6a151f0dc8 Merge pull request #5056 from edx/renzo/third-party-auth-copy 
Fix 3rd party auth copy string interpolation, address design feedback
 2014-09-03 12:16:13 -04:00
Sarina Canelake
046b9b156c Fix link in account activation email 2014-09-03 12:10:24 -04:00
Calen Pennington
48bdeeeae8 Merge pull request #5052 from edx/split/bulk-rerun-LMS-11332 
Enable bulk operations on split
 2014-09-03 11:18:23 -04:00
Dave St.Germain
6261d9c828 Merge pull request #5014 from edx/dcs/BLD-1189 
Removed spacebar event handler, because it did more harm than good.
 2014-09-03 11:14:15 -04:00
Renzo Lucioni
9219cbdca8 Fix 3rd party auth string interpolation, address design feedback 2014-09-03 10:51:34 -04:00
Christina Roberts
bda16e2f00 Merge pull request #5043 from edx/christina/cohort-selector 
Move tests into appropriate directory structure.
 2014-09-03 10:35:19 -04:00
Renzo Lucioni
a81ff98455 Merge pull request #5047 from edx/renzo/third-party-auth-copy 
Correct 3rd party auth login page message and styling
 2014-09-03 10:02:49 -04:00
Renzo Lucioni
93a263b92f Correct 3rd party auth login page message and styling 2014-09-03 09:50:45 -04:00
Calen Pennington
f70e702503 Add specific bulk-operation test for LMS-11332, and a fix 2014-09-03 09:50:41 -04:00
Nimisha Asthagiri
bd54cd8c57 LMS-11332 Unit test 2014-09-03 09:15:01 -04:00
Don Mitchell
96bc5cc83a Merge pull request #5001 from edx/split/edit_info 
Split/edit info
 2014-09-03 08:28:31 -04:00
Don Mitchell
a65771df93 Implement edit info as mixin on base mongo 
LMS-11183, LMS-11184
 2014-09-02 17:15:08 -04:00
cahrens
a96b2bd734 Move tests into appropriate directory structure. 2014-09-02 16:36:08 -04:00
chrisndodge
c5fc9b2fc8 Merge pull request #4771 from edx/cdodge/ecommerce-invoicing 
Cdodge/ecommerce invoicing
 2014-09-02 15:32:41 -04:00
Calen Pennington
1e2d5ffe03 Merge pull request #5031 from edx/andya/merge-hotfix-2014-08-29 
Merge hotfix-2014-08-29 to master
 2014-09-02 15:32:05 -04:00
Don Mitchell
85fa712fdf Change published_date to published_on 
to make consistent with other edit info timestamps
LMS-11184
 2014-09-02 13:20:23 -04:00
Muhammad Shoaib
2cc0433833 Implement mediated bulk purchase epic 
Updating EX-60 logic
 2014-09-02 13:03:24 -04:00
Ben Patterson
27c83d51df Merge pull request #5040 from edx/revert-5039-pmitros/aws-djpyfs 
Revert "AWS settings for XBlocks to have filesystem-like storage"
 2014-09-02 11:36:37 -04:00
Ben Patterson
fe85223f73 Revert "AWS settings for XBlocks to have filesystem-like storage" 2014-09-02 11:29:59 -04:00
Ben Patterson
1abb8de2ba Merge pull request #5037 from edx/ammar-ben/bok-choy-shard-3 
Split bok-choy tests into 3 shards (merge)
 2014-09-02 11:01:49 -04:00
Piotr Mitros
e5286a14cc Merge pull request #5039 from edx/pmitros/aws-djpyfs 
AWS settings for XBlocks to have filesystem-like storage
 2014-09-02 10:58:58 -04:00
Ben Patterson
91cbc19279 Merge pull request #4988 from edx/benp/all-tests-update 
jenkins scripts: provide 'all' shard for bok-choy, use as default.
 2014-09-02 10:53:49 -04:00
Stephen Sanchez
8eeb091de8 Merge pull request #5036 from edx/sanchez/fix_django_header_tests 
Sanchez/fix django header tests
 2014-09-02 10:44:16 -04:00
Piotr Mitros
ce2e51384f AWS settings for XBlocks to have filesystem-like storage 2014-09-02 10:39:01 -04:00
Calen Pennington
fb56588090 Tweak mongo count numbers 2014-09-02 10:29:23 -04:00
Alexander Kryklia
9a0d9f70c4 Merge pull request #4501 from htareque/lti_revision_3 
username and email request for lti module
 2014-09-02 17:11:24 +03:00
Don Mitchell
4878f6e83c Implement edit info as mixin for split 
LMS-11183, LMS-11184
 2014-09-02 10:10:57 -04:00
Waqas Khalid
d11aaec3a1 Handle the indexerror exception on create_order 
LMS-2646
 2014-09-02 19:08:53 +05:00