Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Don Mitchell
7b52d45aa6 Move edit info into xblock and runtime mixins 
LMS-11183, LMS-11184
 2014-09-02 10:08:39 -04:00
clytwynec
df5802224f Update pavelib.rst and run_devstack.rst for changes to default settings 2014-09-02 10:03:44 -04:00
Christine Lytwynec
4270d8f01b change default settings for servers/assets paver tasks from "dev" to "devstack" 2014-09-02 10:01:55 -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
Ben Patterson
e3b40a8c46 Create shard 3 for bok-choy; handle unknown shards. 
This accomplishes three things:
1. Create a 3rd bok-choy shard
2. Allow the script to run 'all' shards
3. If the script receives an unknown shard, it will pass through empty tests.

The last one (3) is intended to allow us to expand to additional shards
on our Jenkins infrastructure. If we have, for example, a 4th shard introduced,
but someone attemps to run a commit that is older (and therefore still
has 3 shards); the script will just pass-through shard '4'. This means
older commits can still get tested. In that case, the older commit
will still test all cases, because the last shard (n) is basically an
'everything else' shard.
 2014-09-02 08:32:55 -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
Ned Batchelder
b89dccdc27 Merge pull request #5028 from edx/pmitros/update-xblock 
New XBlock with final/tested/non-prototype scope_key
 2014-08-29 16:58:18 -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
765cd93d0b Merge pull request #5030 from edx/revert-5024-sanchez/ECOM-216-django-template-settings 
Revert "The main django template needs header and footer feature flags."
 2014-08-29 16:45:47 -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
Andy Armstrong
1838d9d432 Merge pull request #5020 from edx/hotfix/reduce-studio-mongo-calls 
Hotfix - reduce number of Studio mongo calls
 2014-08-29 16:20:55 -04:00
Alison Hodges
c9bf9ada7f New UI for discussions 2014-08-29 16:00:41 -04:00
Alison Hodges
02b42d5cb3 Added endorsement and thread_type fields 2014-08-29 16:00:41 -04:00
Piotr Mitros
520fc2b09d New XBlock with final/tested/non-prototype scope_key 2014-08-29 16:00:10 -04:00
Alison Hodges
fe9763ab61 Adding question and discussion categories for posts 2014-08-29 15:59:33 -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
Greg Price
748d76600f Remove "flagged discussions" from forum topic menu 
This feature is supplanted by the flagged option in the filter menu,
which can work within topics as well as across all topics.
 2014-08-29 15:59:33 -04:00
Greg Price
80d1cae6a0 Add filter menu to forum nav sidebar 
The menu allows filtering to unread, unanswered, or flagged threads.
This includes passing through the appropriate query parameters to the
comments service.
 2014-08-29 15:59:33 -04:00
Greg Price
eaa93bf615 Hide comments in marked answers in forum questions 
A link to show the comments appears in their place.
 2014-08-29 15:59:33 -04:00
Greg Price
ec482c0dc2 Allow authors of forum questions to mark answers 
Co-authored-by: jsa <jsa@edx.org>
 2014-08-29 15:59:32 -04:00