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

30999 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dino Cikatic
b5dfb5ed05 Fix SEARCH_ENGINE set logic in settings files 2015-06-18 23:03:53 +02:00
Jesse Zoldak
4eee094ea5 Merge pull request #8559 from edx/zoldak/bok-choy-migrations 
Update bok-choy cached db with the latest migrations
 2015-06-18 16:42:08 -04:00
Matt Drayer
2b63ddb5b9 Merge pull request #8565 from edx/asadiqbal08/SOL-939 
SOL-939 Jasmine Tests
 2015-06-18 13:33:09 -04:00
Matt Drayer
5b7ce018fc Merge pull request #8555 from edx/mattdrayer/SOL-639 
mattdrayer/SOL-639: Update edx-milestones Github reference
 2015-06-18 11:54:23 -04:00
Will Daly
7cb41c7783 Merge pull request #8553 from edx/will/ecom-467 
Add professional enrollments to the instructor dashboard.
 2015-06-18 11:27:26 -04:00
Matt Drayer
e710ba7ebe Update edx-milestones Github reference 2015-06-18 11:01:24 -04:00
chrisndodge
57c8072752 Merge pull request #8539 from edx/cdodge/update-edx-search-hash 
update edx-search hash to include faceted search
 2015-06-18 10:23:34 -04:00
Ben Patterson
e9c84503f6 Merge pull request #8561 from Stanford-Online/kluo/improve-cohort-test 
Improve cohort test
 2015-06-18 10:13:57 -04:00
Ben McMorran
d544db6525 Merge pull request #8513 from edx/benmcmorran/topic-card 
TNL-1893 Add teams topic card
 2015-06-18 10:03:37 -04:00
Ben McMorran
390e2c1865 Merge pull request #8528 from edx/benmcmorran/discussion-caching 
TNL-2291 Discussion forums permission caching
 2015-06-18 09:22:09 -04:00
Ben McMorran
c02d09a185 TNL-1893 Teams Topic Card 2015-06-18 13:16:28 +00:00
asadiqbal
58129031a5 SOL-939 Jasmine Tests 2015-06-18 14:26:47 +05:00
dino-cikatic
89f13e15bb Merge pull request #8548 from edx/dcikatic/SOL-994 
SOL-994 fix js loading if search features disabled
 2015-06-18 09:22:13 +02:00
Greg Price
7c53400134 Merge pull request #8541 from edx/gprice/discussion-api-rendered-body 
Add rendered_body to discussion API endpoints
 2015-06-17 22:51:38 -04:00
Greg Price
c28b295806 Add rendered_body to discussion API endpoints 
The rendering in this commit does not prevent MathJax content from being
rendered as the discussion JavaScript code does.
 2015-06-17 20:23:30 -04:00
Greg Price
82b117f66e Merge pull request #8543 from edx/gprice/discussion-api-comment-vote 
Add comment voting to discussion API
 2015-06-17 19:41:08 -04:00
Kevin Luo
718c21cfc8 Improve cohort test 
Remove SQLite version dependent error string check
 2015-06-17 16:06:10 -07:00
David Ormsbee
b92ad0ad13 TNL-2291 Add caching to discussion forum permissions 
Caches all permissions per user per course. Adds caching functionality to has_permission and replaces all instances of cached_has_permission with has_permission.
 2015-06-17 21:08:28 +00:00
Jesse Zoldak
7601eaa941 Update bok-choy cached db with latest migrations 2015-06-17 17:01:38 -04:00
Calen Pennington
e3d820a7a4 Merge pull request #8519 from jazkarta/check-ccx-enabled 
WIP: Limit application of CCX overrides to enabled courses and providers
 2015-06-17 16:15:01 -04:00
Christine Lytwynec
11e10499d8 Merge pull request #8557 from edx/clytwynec/quiet_sass_compile_warnings 
compile sass in quiet mode unless debug=True
 2015-06-17 15:55:37 -04:00
Jesse Zoldak
176a70de6a Merge pull request #8556 from edx/revert-8533-zoldak/update-bok-choy 
Revert "Update bok-choy version and move to base.txt"
 2015-06-17 15:31:26 -04:00
Calen Pennington
b8e63cbb4d Disable lineage traversal when no providers are specified in OverrideFieldData 2015-06-17 15:26:10 -04:00
Calen Pennington
6bb25982de Add enable_ccx to the suite of override performance checking tests 2015-06-17 15:26:10 -04:00
Carlos de la Guardia
d56303dd0f Only enable the OverrideFieldData when there are active overrides on a course. 2015-06-17 15:26:10 -04:00
Christine Lytwynec
a1af17e4b1 compile sass in quiet mode unless debug=True 2015-06-17 15:13:47 -04:00
Jesse Zoldak
d382b69954 Revert "Update bok-choy version and move to base.txt" 2015-06-17 14:50:27 -04:00
Chris
b211e9fd36 Merge pull request #7474 from openfun/rmoch/fix_forum_action_button_issue 
Fix forum response display issue with long labels on action buttons
 2015-06-17 14:18:48 -04:00
Jesse Zoldak
a57c780a08 Merge pull request #8534 from edx/zoldak/lower-pylint-threshold 
Lower pylint threshold to 7100
 2015-06-17 13:32:00 -04:00
Will Daly
1223d88ebb Add professional enrollments to the instructor dashboard. 2015-06-17 11:54:31 -04:00
Greg Price
de68c30486 Merge pull request #8530 from edx/gprice/discussion-api-text-search 
Add text_search parameter to discussion API
 2015-06-17 11:35:12 -04:00
Jesse Zoldak
483f2e45dd Lower pylint threshold to 7100 2015-06-17 11:32:32 -04:00
Richard Moch
e455c3b7b7 Add background to focused labels for cleaner display 2015-06-17 16:21:51 +02:00
Richard Moch
d851c6ded3 Improve support for right to left languages 2015-06-17 16:21:51 +02:00
Richard Moch
e68b784528 add Richard Moch to AUTHORS 2015-06-17 16:21:50 +02:00
Richard Moch
4277757961 set .response-header-actions block to absolute position to allow overlap with title 2015-06-17 16:21:50 +02:00
Greg Price
fecbdcd052 Add text_search parameter to discussion API 
The thread list endpoint now accepts the text_search parameter and also
includes a text_search_rewrite field in its responses.
 2015-06-17 10:20:13 -04:00
Awais Qureshi
fa4dcdebbe Merge pull request #8531 from edx/awais786/ECOM-1494-del-migrations 
ECOM-1494 deleting models from database through new migrations.
 2015-06-17 19:19:02 +05:00
Sarina Canelake
c16cbb1826 Merge pull request #8516 from edx/markhoeber-doc2017 
Update studio templates to remove fieldset and legend tags
 2015-06-17 10:10:09 -04:00
Chris
d6aa1578c4 Merge pull request #7351 from Stanford-Online/kluo/remove-redundant-modal 
Remove extra lean modal trigger
 2015-06-17 08:55:34 -04:00
Chris
5ebe91e18b Merge pull request #7395 from Stanford-Online/kluo/fix-modal-display-issue 
Fix modal css to be hidden immediately
 2015-06-17 08:54:06 -04:00
Dino Cikatic
af7521b240 SOL-994 fix js loading if search features disabled 2015-06-17 14:53:45 +02:00
Muzaffar yousaf
7dd7e6525b Merge pull request #8532 from edx/muzaffar/tnl2304-ora1-message-studio 
Display error message on ORA 1 components in units Studio.
 2015-06-17 17:47:50 +05:00
Jesse Zoldak
8f769d2345 Merge pull request #8533 from edx/zoldak/update-bok-choy 
Update bok-choy version and move to base.txt
 2015-06-17 08:25:51 -04:00
muzaffaryousaf
4fecf03874 Display error message on ORA 1 components in units in Studio. 
TNL-2304
 2015-06-17 17:05:09 +05:00
chrisndodge
50851934ce Merge pull request #8542 from edx/cdodge/fix-typo 
Fix typo in Instructor dashboard UI text
 2015-06-17 07:29:21 -04:00
Awais Qureshi
52e8d71fb9 Merge pull request #8489 from edx/awais786/ECOM-1683-remove-cert-regen-code 
ECOM-1683 removing regen-cert code.
 2015-06-17 14:51:19 +05:00
zubair-arbi
773c346974 Merge pull request #8545 from edx/zub/bugfix/ecom-1738-update-reverification-block-version 
update reverification block version to fix error for 'skip_reverifica…
 2015-06-17 14:05:17 +05:00
zubair-arbi
6ed4ac08d0 update reverification block version to fix error for 'skip_reverification' service method 
ECOM-1738
 2015-06-17 12:49:58 +05:00
Greg Price
0998df8c4b Add comment voting to discussion API 2015-06-16 23:32:48 -04:00