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

9213 Commits

Author SHA1 Message Date
Christina Roberts
5fc4e02ff8 Merge pull request #5063 from edx/christina/cohorts-bok-choy 
Christina/cohorts bok choy
 2014-09-05 10:35:03 -04:00
Muhammad Ammar
5bcfaaaa8b Merge pull request #5072 from edx/ammar/tooltip-test 
Tooltip Acceptance Test
 2014-09-05 18:43:21 +05:00
Adam
385b3ff48a Merge pull request #5087 from edx/release 
Release
 2014-09-05 09:31:40 -04: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
cahrens
bc483ebae8 Bok choy test for cohort group label in post. 2014-09-04 16:19:35 -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
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
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
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
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
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
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
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
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
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
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
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
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
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
Don Mitchell
7b52d45aa6 Move edit info into xblock and runtime mixins 
LMS-11183, LMS-11184
 2014-09-02 10:08:39 -04: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
muhammad-ammar
94c90556c2 Split Bok-Choy Tests into 3 shards 
TE-447
 2014-09-02 08:36:33 -04: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
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
Greg Price
a99196a164 Clear search alerts when a forum topic is selected 2014-08-29 15:59:33 -04:00