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

25491 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Waqas Khalid
ac2436f520 User can flag the post whether thread is closed or open 
When the thread is closed user can't able to report
the thread and it gives the error. User can now report
thread even it is closed.

TNL-151
 2014-09-05 20:58:10 +05:00
Nimisha Asthagiri
08a0c6392e Merge pull request #5070 from edx/reruns/error-handling 
Course Rerun: include stack trace in errors and Log errors.
 2014-09-04 16:25:43 -04:00
Alison Hodges
97527266c2 Merge pull request #5081 from edx/ahodges/doc/help_fixes 
Fixes to improve help experience& correct HTML build errors
 2014-09-04 16:22:00 -04:00
Alison Hodges
5263f15e96 Fixes to improve help experience& correct HTML build errors 2014-09-04 15:51:36 -04:00
Han Su Kim
578be6cc70 Merge branch 'release' 2014-09-04 15:50:33 -04:00
Jason Bau
07b814467c Merge pull request #5062 from Stanford-Online/jbau/shib-unicode 
external_auth: handle request.META values as str, not unicode
 2014-09-04 12:47:50 -07:00
Andy Armstrong
e1c7bb833f Merge pull request #5046 from edx/andya/cohort-visibility-labels-2 
Implement forum cohort visibility labels correctly
 2014-09-04 15:39:40 -04:00
srpearce
c98ffa7714 Merge pull request #5041 from edx/sylvia/docs/relnotes_9-3 
Release notes draft
 2014-09-04 15:21:04 -04:00
Sylvia Pearce
2a0c352035 Course staff release notes 9/4/14 2014-09-04 15:20:20 -04:00
Nimisha Asthagiri
bdd91daeb6 Include stack trace in Course Rerun errors; Log errors. 2014-09-04 14:31:07 -04:00
Andy Armstrong
8349dbfa42 Implement forum cohort visibility labels correctly 
TNL-25
 2014-09-04 13:47:48 -04:00
Jesse Zoldak
7eb3a22d11 Merge pull request #5075 from edx/zoldak/fix-typo 
Fix capitilization on verified flow
 2014-09-04 12:32:34 -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
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