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

8888 Commits

Author SHA1 Message Date
Adam
58e6dcf79c Merge pull request #5107 from edx/adam/resolve-merge-conflicts 
Adam/resolve merge conflicts
 2014-09-05 14:55:24 -04:00
Brian Talbot
a6f2dd67e4 Merge pull request #5105 from edx/talbs/os-ggg-a11y 
LMS: Accessibility Tweaks
 2014-09-05 13:57:57 -04:00
Waqas Khalid
14d0ac014e Merge pull request #5038 from mlkwaqas/waqas/tnl151-closed-thread-flag-post-error 
Flagging posts in closed thread causes an error
 2014-09-05 22:29:44 +05:00
Adam Palay
cfeb76e67f Merge remote-tracking branch 'origin/release' into adam/resolve-merge-conflicts 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
 2014-09-05 13:20:15 -04:00
Brian Talbot
f11b44c49e LMS: revising more pronounced focus state of onboarding buttons 2014-09-05 12:50:15 -04:00
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
Adam
08f851aa7e Merge pull request #5095 from edx/cdodge/white-label-small-hotfixes 
Cdodge/white label small hotfixes
 2014-09-05 11:06:59 -04:00
Han Su Kim
b1ada02819 Merge pull request #5084 from edx/hotfix/2014-09-04b 
Tmporarily disable bulk operations b/c old mongo
 2014-09-05 11:00:02 -04:00
Renzo Lucioni
aa28fba9ad Revert "Revert "Merge pull request #4976 from edx/will/ecom-128"" 
This reverts commit 371dfd6187.
 2014-09-05 10:51:51 -04:00
Adam
385b3ff48a Merge pull request #5087 from edx/release 
Release
 2014-09-05 09:31:40 -04:00
Waqas Khalid
32d9234b39 Merge pull request #3880 from mlkwaqas/waqas/lms2646-create-order-list-index-error 
Handle the indexerror exception on create_order
 2014-09-05 17:07:46 +05:00
Chris Dodge
405baab82a don't hard code the shoppingcart order confirmation page to use settings.xxx, allow for microsites to override 2014-09-04 22:18:16 -04:00
Chris Dodge
568ef4184a remove course-id visual column from the list of coupons as it's useless information here and prevents overflows from happening 2014-09-04 22:17:50 -04:00
Nimisha Asthagiri
041d72ccc6 Update mongo counts. 2014-09-04 18:14:13 -04:00
Giulio Gratta
e0b7e8cfbb increase contrast of submission_feedback text 2014-09-04 17:45:47 -04:00
Giulio Gratta
e0262bd7a9 Make primary button focus state more pronounced 2014-09-04 17:45:47 -04:00
Don Mitchell
b28af4fdaa Temporarily disable bulk operations b/c old mongo 
does too much work on exit and doesn't handle nesting
 2014-09-04 17:28:17 -04:00
Diana Huang
371dfd6187 Revert "Merge pull request #4976 from edx/will/ecom-128" 
This reverts commit a03baee25c, reversing
changes made to 12e2d442e9.
 2014-09-04 16:01:28 -04:00
Han Su Kim
578be6cc70 Merge branch 'release' 2014-09-04 15:50:33 -04:00
Andy Armstrong
8349dbfa42 Implement forum cohort visibility labels correctly 
TNL-25
 2014-09-04 13:47:48 -04:00
Jesse Zoldak
814f6b9144 Fix capitilization on verified flow 2014-09-04 11:05:47 -04: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
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
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
Sarina Canelake
046b9b156c Fix link in account activation email 2014-09-03 12:10:24 -04:00
Renzo Lucioni
93a263b92f Correct 3rd party auth login page message and styling 2014-09-03 09:50:45 -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
Muhammad Shoaib
2cc0433833 Implement mediated bulk purchase epic 
Updating EX-60 logic
 2014-09-02 13:03:24 -04:00
Ben Patterson
fe85223f73 Revert "AWS settings for XBlocks to have filesystem-like storage" 2014-09-02 11:29:59 -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
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
Waqas Khalid
d11aaec3a1 Handle the indexerror exception on create_order 
LMS-2646
 2014-09-02 19:08:53 +05:00
Calen Pennington
880673b97f Merge remote-tracking branch 'edx/master' into andya/merge-hotfix-2014-08-29 2014-09-02 09:38:25 -04:00
Stephen Sanchez
2f4fb30592 Cleaning up ddt syntax for new footer test. 2014-09-02 13:14:28 +00:00
htareque
3f159ea52b username and email request for lti module 
added username and email functionality, so that username and email can be passed to the lti third party app

rev2: added customizable text box

rev3: added revisions from auraz
 2014-09-02 08:12:36 -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
Greg Price
b8049c01ef Merge pull request #4957 from edx/forums/new-post-type 
Add post types to forums

This requires edx/cs_comments_service@66482b5
 2014-08-29 17:15:07 -04:00
Andy Armstrong
4fcc59b318 Merge branch 'release' into andya/merge-hotfix-2014-08-29 
Conflicts:
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
	lms/djangoapps/courseware/tests/test_module_render.py
 2014-08-29 16:50:40 -04:00
Andy Armstrong
7b26e85478 Merge branch 'release' into andya/merge-hotfix-2014-08-29 
Conflicts:
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
	lms/djangoapps/courseware/tests/test_module_render.py
 2014-08-29 16:50:10 -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
Greg Price
988e4e6da5 Update UI for forum actions 
The actions are now consolidated in one location for each piece of
content. Primary actions (vote, follow, endorse, mark as answer) are
buttons, and secondary actions (pin, edit, delete, report, close) are in
a menu. This also includes improved front-end error handling for the
actions and significant test cleanup.

Co-authored-by: jsa <jsa@edx.org>
Co-authored-by: marco <marcotuts@gmail.com>
Co-authored-by: Frances Botsford <frances@edx.org>
Co-authored-by: Brian Talbot <btalbot@edx.org>
 2014-08-29 15:59:33 -04:00