Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
35,222 Commits 1 Branch 0 Tags
45f8e526c06e99bf565dc62d0c9eb417a8343c8a
Commit Graph

13371 Commits

Author SHA1 Message Date
Muzaffar yousaf
a26d576458 Merge pull request #11499 from mehrozezahid/mehrozezahid/TNL-4096 
Added target='_blank' to both cohort external doc links.
 2016-02-11 12:46:32 +05:00
Peter Fogg
5d0ed333a5 Merge pull request #11502 from edx/peter-fogg/audit-cert-cutoff-date 
Explicitly cut off cert eligibility.
 2016-02-10 15:41:16 -05:00
Peter Fogg
2d028f8246 Add an explicit cutoff date for audit cert granting. 
The previous logic was a convoluted way of doing the same thing, and
has already led to one bug. Instead of hoping that the bugs are ironed
out now and that future devs maintain this logic properly, let's just
set a real cutoff date.
 2016-02-10 12:16:37 -05:00
Awais Jibran
eb97c6cfb9 Merge pull request #11421 from edx/aj/ecom3612-beta-tester-self-paced-course-issue 
Fix Beta Testers access courseware in self-paced courses
 2016-02-10 21:02:22 +05:00
Renzo Lucioni
2717f228f8 Merge pull request #11483 from edx/renzo/programs-task-fixes 
Fixes for program certificate generation
 2016-02-10 10:41:01 -05:00
Jesse Zoldak
7ccca469fc Merge pull request #11481 from edx/zoldak/remove-lettuce-homepage-test 
Convert homepage acceptance test to bok-choy
 2016-02-10 08:45:06 -05:00
Awais Jibran
dabda5bc75 Merge pull request #11375 from attiyaIshaque/ai/tnl3573-resetpassword-empty-page-fix 
Resetting password shows empty page.
 2016-02-10 18:39:21 +05:00
Asad Iqbal
64291d3c01 Merge pull request #11391 from edx/asadiqbal08/WL-272 
asadiqbal08/WL-272 - Studio Language Selection
 2016-02-10 18:30:29 +05:00
Jesse Zoldak
f0c54c15ee Convert homepage acceptance test to bok-choy 2016-02-10 06:32:38 -05:00
mehrozezahid
4ed9d0a44a Added target='_blank' to both href attributes 2016-02-10 14:49:44 +05:00
Attiya Ishaque
a042cbc7f0 Resetting password shows empty page. 
TNL-3573
 2016-02-10 14:47:41 +05:00
Awais Jibran
5899be9207 Fix Beta Testers access courseware in self-paced courses 
ECOM-3612
 2016-02-10 14:47:03 +05:00
asadiqbal
64778cdf69 WL-272 2016-02-10 14:33:38 +05:00
Saleem Latif
ccbd88acc1 Merge pull request #11402 from edx/saleem-latif/WL-298 
WL-298: Create a theme named 'stanford-style' to be used by comprehensive theming
 2016-02-10 10:38:46 +05:00
Renzo Lucioni
23dc424ca6 Merge pull request #11488 from edx/renzo/remove-extra-p-tag 
Remove unnecessary p tag from XSeries dashboard message
 2016-02-09 22:49:26 -05:00
John Eskew
3f58954f3a Merge pull request #11469 from edx/jeskew/fix_django_19_warnings 
Remove deprecation warnings from Django models.
 2016-02-09 16:38:23 -05:00
Renzo Lucioni
67f8b49056 Fixes for program certificate generation 
ECOM-3528
 2016-02-09 16:27:16 -05:00
Renzo Lucioni
cceeff3657 Remove unnecessary p tag from XSeries dashboard message 2016-02-09 16:05:06 -05:00
Andy Armstrong
84773d2ff7 Merge pull request #11482 from edx/release 
Merge release back to master
 2016-02-09 12:49:41 -05:00
Andy Armstrong
caf4cfbd3a Merge pull request #11268 from edx/andya/add-pattern-library 
Add edX Pattern Library to edx-platform
 2016-02-09 12:07:03 -05:00
Ben Patterson
f12c415ed6 Merge pull request #11470 from edx/benp/remove-ruby-deps 
[S&B] Remove ruby dependencies.
 2016-02-09 10:56:21 -05:00
clrux
a5e34d4e12 Merge pull request #11105 from edx/clrux/ac-23 
Updating forum buttons and overall icon cleanup
 2016-02-09 10:53:31 -05:00
Chris Rodriguez
4454c819c8 LMS: forum markup tweaks and cleanup 2016-02-09 09:34:58 -05:00
John Eskew
bb5c28c0c5 Remove deprecation warnings from Django models. 
Add app_label definitions in Meta classes for models.
Move import of course_mode model into methods to prevent importing
the models at startup time.
 2016-02-09 09:28:43 -05:00
Jesse Zoldak
f8c66c1a16 Merge pull request #11463 from edx/zoldak/staff-debug-test 
Remove duplicate staff debug acceptance tests
 2016-02-09 09:24:19 -05:00
wajeeha-khalid
9d6df1e132 Merge pull request #11189 from edx/ekafeel/discussion-api-namespace-pagination 
Ekafeel/discussion api namespace pagination
 2016-02-09 17:42:48 +05:00
Ehtesham Kafeel
cf5dc1075f Merge pull request #11289 from edx/ekafeel/Deprecated-Advanced-Component-Types 
Ekafeel/deprecated advanced component types
 2016-02-09 15:07:59 +05:00
Saleem Latif
c265dfbac4 Merge pull request #11390 from edx/saleem-latif/SOL-1529-translation-updates 
Going to merge, "Remove concatenation of i18n strings."
 2016-02-09 11:35:17 +05:00
Ben Patterson
ffa089a9c6 Remove ruby reference in pipeline arguments. 2016-02-08 18:18:37 -05:00
Andy Armstrong
a27c702517 Merge pull request #11455 from edx/clrux/hotfix-rc-2016-02-09 
Hotfix: ac-201
 2016-02-08 14:35:56 -05:00
Jesse Zoldak
fc4866054f Remove duplicate staff debug acceptance tests 2016-02-08 13:17:14 -05:00
Peter Fogg
f3c20e7360 Correctly add profile image to edX header. 2016-02-08 12:47:27 -05:00
David Ormsbee
9ae0dada4c Merge pull request #11445 from edx/ormsbee/clear_cache_in_tests 
Clear caches between tests for ModuleStoreTestCase/SharedModuleStoreTestCase
 2016-02-08 10:23:54 -05:00
Chris Rodriguez
ad36f761c1 Hotfix: ac-201 2016-02-08 09:05:52 -05:00
sanfordstudent
c51bcdbf91 Merge pull request #11418 from edx/sstudent/MA-1918-handle-no-handouts 
MA-1918 returning None for courses with no handouts
 2016-02-08 08:52:41 -05:00
Ehtesham
b9c8b3308d [TNL-3962] moving DEPRECATED_ADVANCED_COMPONENT_TYPES to dJango admin 2016-02-08 17:26:49 +05:00
Saleem Latif
dc502ea913 Remove concatenation of i18n strings. 2016-02-08 11:24:19 +05:00
David Ormsbee
be25bb8aba Clear caches between tests for ModuleStoreTestCase/SharedModuleStoreTestCase 
Cached values were leaking across tests, causing difficult to debug errors,
particularly when using Config Models. As part of this work, certain tests
that had query counts that relied on those values being cached needed to
be adjusted up.
 2016-02-06 00:01:15 -05:00
Andy Armstrong
d731b07bd4 Add UXPL to edx-platform 
UITK-39
 2016-02-05 13:33:55 -05:00
jsa
92aa346fdf Implement celery task to award program certs. 
ECOM-3354
 2016-02-05 12:21:20 -05:00
Sanford Student
f88e5bc1d8 MA-1918 returning None for courses with no handouts 2016-02-05 11:31:16 -05:00
Robert Raposa
29fe2c7b0c Move markup helpers to djangolib 2016-02-05 02:42:43 -05:00
Kevin Falcone
98671a8aa6 Merge pull request #11399 from edx/jibsheet/dont-use-using 
Don't use using() in migrations
 2016-02-04 19:47:10 -05:00
Peter Fogg
2ddf1f2e6f Merge pull request #11427 from edx/peter-fogg/fix-audit-cert-regen 
Correctly set certificate status for audit certs when regenerating.
 2016-02-04 18:56:40 -05:00
Peter Fogg
711e2e7f3c Correctly set certificate status for audit certs when regenerating. 
COR-2403
 2016-02-04 17:23:20 -05:00
Ned Batchelder
aec1ed3992 Merge pull request #11423 from edx/ned/update_translations 
Update translations (autogenerated message)
 2016-02-04 16:50:35 -05:00
Brian Talbot
0195877842 certificates: reference NPM installed UXPL 
* remove static UXPL + lib files from root
* updating edx-pattern-library npm version to 0.8.12
* resolving UXPL syntax/version changes
* syntax/spacing corrections
* correcting npm-based lib paths
* UXPL update - syncing up sass LTR/RTL compile
* UXPL update - font-size, line-heights, + colors
* UXPL update - breakpoint names
* UXPL update - removing unnecessary %reset-link reference
* customizing UXPL buttons for banner actions
 2016-02-04 15:55:26 -05:00
Peter Fogg
2d2913ef5d Merge pull request #11426 from edx/peter-fogg/fix-date-block-format 
Correctly format date block dates.
 2016-02-04 15:45:04 -05:00
Peter Fogg
22cb307961 Correctly format date block dates. 2016-02-04 14:34:08 -05:00
Ned Batchelder
21218ef989 Merge pull request #11372 from open-craft/omar/remove-multiple-enrollment-feature 
Remove unused MULTIPLE_ENROLLMENT_ROLES feature setting
 2016-02-04 13:42:48 -05:00