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

31328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Davorin Šego
ad5a98e40a Merge pull request #8282 from Stanford-Online/giulio/default-course-about-images 
Default "Course About" image
 2015-07-07 00:24:54 +02:00
Ahsan Ulhaq
796e4cb5e6 Merge pull request #8580 from edx/ahsan/ECOM-1719-LMS-Modification-enrollment-API-update 
LMS: Modification in enrollment API
 2015-07-07 02:32:53 +05:00
Matt Drayer
a8f909fe77 Merge pull request #8659 from edx/ziafazal/SOL-1006 
ziafazal/SOL-1006: Disable course 'start date' for inactive web-enabled certificates
 2015-07-06 16:45:24 -04:00
David Baumgold
d3a5bc32b3 Merge pull request #8780 from edx/db/mention-confluence-in-readme 
Mention Confluence in the README
 2015-07-06 16:40:49 -04:00
Matt Drayer
685a2d31b3 Merge pull request #8774 from edx/ziafazal/SOL-1008 
ziafazal/SOL-1008: Ensure that only authorized actors can perform assigned roles
 2015-07-06 15:57:28 -04:00
Matt Drayer
669b5d2b1b Merge pull request #8789 from edx/carol/doc/SOL-1014_test 
asadiqbal08/SOL-1014: Improved text in Studio Certificate Configuration
 2015-07-06 15:57:06 -04:00
Ahsan Ulhaq
8d9d4b85d5 LMS: Modification in enrollment API 
Changed enrollment api to set enrollment atributes if the course is
credit course

ECOM-1719
 2015-07-07 00:49:02 +05:00
asadiqbal
2e4f1225ea Improved text in Studio Certificate Configuration 2015-07-06 15:35:32 -04:00
Utkarsh
07ce76b3f9 Merge pull request #8722 from edx/utkjad/injecting_callstackmanager 
Adding entries of Call Stack Manager in StudentModule and StudentModuleHistory
 2015-07-06 15:06:06 -04:00
utkjad
10a3863832 Enable CallStackManager on StudentModule and StudentModuleHistory to capture any use outside of DjangoXBlockUserStateClient 2015-07-06 18:11:05 +00:00
Giulio Gratta
84f7aef917 Default "Course About" image 
Templates that display the image now check if courses specifies an image, if they don't the default image is displayed

Path set in both common.py and aws.py to allow for easy overriding in one place.

Addresses SOL-926

Some code provided by Davorin Sego
 2015-07-06 10:29:12 -07:00
Christine Lytwynec
f3caef9b8f Merge pull request #8762 from edx/clytwynec/TE-965 
Clytwynec/te 965
 2015-07-06 13:07:18 -04:00
Akiva Leffert
f0b52c698d Merge pull request #8739 from edx/aleffert/remove-chromeless-xblock-border 
Remove border from chromeless xblock
 2015-07-06 11:37:29 -04:00
Christine Lytwynec
ab79b0dd1a add coveralls 2015-07-06 11:10:59 -04:00
David Baumgold
8d5c1a055c Mention Confluence in the README 2015-07-06 10:58:48 -04:00
Awais Jibran
770b3e807e Merge pull request #8499 from edx/aj/tnl2435-broken-page-for-schedule-details-cms 
Fixed Broken page in "Schedule & Details" due to course image
 2015-07-06 19:50:21 +05:00
Davorin Šego
e7f7bdaed9 Merge pull request #8738 from edx/dsego/SOL-734-addendum 
Fixes header styling issue introduced in SOL-734 (#8389) by reverting…
 2015-07-06 16:18:00 +02:00
Shrhawk
a67d80c232 Merge pull request #8702 from edx/shr/bug/TNL-2592-problem-release-date-error 
Handle dates have year smaller than 1900
 2015-07-06 06:39:11 -07:00
Awais Jibran
ded7682090 Studio "Schedule & Details" page is broken in IDBx+IDB9x+2015_T2 
TNL-2435
 2015-07-06 18:26:00 +05:00
Daniel Friedman
c4004e1113 Merge pull request #8593 from edx/dan-f/topic-list-2 
Teams Topic List View
 2015-07-06 09:23:31 -04:00
Sarina Canelake
bc4479a118 Merge pull request #8778 from edx/sarina/20150706-update-translations 
Update translations (autogenerated message)
 2015-07-06 09:17:18 -04:00
Frances Botsford
b45b122c18 fixed pagination styles in teams and studio 2015-07-06 08:45:03 -04:00
Daniel Friedman
3b55d88283 Implement paginated Team Topics UI 
Authors:
  - Dan Friedman
  - Ben McMorran
  - Peter Fogg

TNL-1892
 2015-07-06 08:45:03 -04:00
Ben McMorran
351e491c82 Add generic paging framework 
Authors:
  - Daniel Friedman
  - Ben McMorran
  - Peter Fogg

TNL-1892
 2015-07-06 08:45:03 -04:00
Sarina Canelake
1cc7ea2a37 Update translations (autogenerated message) 2015-07-06 08:14:16 -04:00
Zia Fazal
9711cd5fc3 certificate add/update/delete operations permission check 
address quality violation
 2015-07-06 09:45:33 +05:00
Ben Patterson
65a36a64df Merge pull request #8686 from edx/benp/3bok-choy-check-invisible 
Update to latest bok-choy. Update tests to be compatible with the updated `invisible` property.
 2015-07-03 17:36:09 -07:00
Usman Khalid
e086bb4ddc Merge pull request #8704 from edx/usman/tnl2305-disable-ora 
Hide ORA 1 in LMS.
 2015-07-04 00:35:05 +05:00
Usman Khalid
64ff890ff8 Disable ORA 1 tabs in LMS if combinedopeneded is disabled in LMS. 
TNL-2305
 2015-07-03 20:58:42 +05:00
Usman Khalid
fe54b085c6 Added ability to disable xblock types in LMS. 
TNL-2305
 2015-07-03 20:58:40 +05:00
Davorin Šego
83d920ecba Merge pull request #8759 from edx/dsego/SOL-958 
Add feature flag to skip enrollment start date filtering for course s…
 2015-07-03 16:20:21 +02:00
Ben Patterson
8d9c16ba6e Update comment to match method name. 2015-07-03 06:54:56 -07:00
Ben Patterson
d8a649ae36 Use new bok-choy with invisible property. 2015-07-03 06:51:25 -07:00
Ben Patterson
c39ebf1bc8 Wait for element to not be present. (Compatible with minor bok-choy upgrade.) 
With an upcoming bok-choy upgrade, 'not-present' and
'invisible' are two distinct concepts. In the upgrade, an
invisible element must be present on the page. This commit
draws that distinction across two helper methods, one for
'invisible' and the other for 'not-present' (or, not on the page at all).
 2015-07-03 06:51:25 -07:00
Davorin Sego
7374624b3c Add feature flag to skip enrollment start date filtering for course search 
add flag to lms/envs/common

update edx-search release tag
 2015-07-03 13:24:25 +02:00
zubair-arbi
8934818381 Merge pull request #8753 from edx/zub/bugfix/ecom-1734-change-login-redirect-url 
change redirect url from '/accounts/login' to '/login'
 2015-07-03 16:19:24 +05:00
Matt Drayer
b1e0ceb34f Merge pull request #8634 from edx/asadiqbal08/SOL-766 
asadiqbal08/SOL-766: Share web certificate on Facebook
 2015-07-03 06:47:58 -04:00
Ned Batchelder
07da7657b3 Merge pull request #7354 from edx/ned/clean-test-turds 
Clean up temp file management, mostly in tests
 2015-07-02 20:20:41 -04:00
Ned Batchelder
514d85c183 Fix other temp dirs that are not cleaned up properly 2015-07-02 19:31:49 -04:00
Ned Batchelder
e6e5a8d812 Convert some try/finally to addCleanup 2015-07-02 19:31:48 -04:00
Ned Batchelder
cb0624bfa1 Correct parent references in one test. 2015-07-02 19:31:48 -04:00
Ned Batchelder
8c8810ee2c Put gitignores for test_root/uploads in one place 2015-07-02 19:31:48 -04:00
Matt Drayer
593ee74073 Merge pull request #8770 from edx/mattdrayer/update-num-queries-check 
mattdrayer/update-num-queries-check: Modify value to reflect improved workflow(s)
 2015-07-02 18:56:51 -04:00
asadiqbal
57d5de5d14 asadiqbal08/SOL-766: Add Facebook sharing to certificate view 
* updated the flags for social media sharing
* added facebook feed ui to share public url
* update the condition logic
* update the code as per suggestion and added pick new style for share buttons
* update the css class reference
* update the bok-choy test
* updated description and some text touch-ups
* moved the JS related to facebook into separate location
* js formatting
* Add trailing comma per chrisndodge
* Add wait to fix flaky test...maybe
 2015-07-02 18:52:15 -04:00
Matt Drayer
289ec980a5 mattdrayer/update-num-queries-check: Modify value to reflect improved workflow(s) 2015-07-02 18:03:57 -04:00
David Ormsbee
db3de51ad4 Merge pull request #6190 from mitocw/bdero/import-export-api 
Public Course Import/Export API
 2015-07-02 16:29:41 -04:00
Matt Drayer
1ca37737e9 Merge pull request #8566 from edx/ziafazal/SOL-980 
ziafazal/SOL-980: Generate certificates from instructor dashboard
 2015-07-02 16:07:33 -04:00
Will Daly
8824d032d4 Merge pull request #8767 from edx/will/optimize-credit-reqs-update 
Credit requirement optimizations
 2015-07-02 12:37:26 -07:00
Will Daly
bfe01605b4 Merge pull request #8700 from edx/will/remove-provider-course-m2m-relation 
Credit eligibility/provider refactor
 2015-07-02 12:36:37 -07:00
Brandon DeRosier
85b3bfe4f6 Add feature flag for Import/Export API in LMS 
This feature flag gates the exposure of the Full course/library
Import/Export API URLs in the LMS. This allows openedX deployments
that operate without Studio to take advantage of the API, while
others may turn the feature off to reserve all content authoring for
Studio.
 2015-07-02 15:32:00 -04:00