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

2272 Commits

Author SHA1 Message Date
Waheed Ahmed
44efb654fd Fixed keyboard focus remains within modal simulated dialogs. 
ECOM-4188
ECOM-5303
 2016-09-29 19:21:03 +05:00
Adam
cd2203ebd2 Merge pull request #13521 from edx/adam/update-dump-neo4j-command 
set neo4j configuration at the command line
 2016-09-28 15:35:13 -04:00
Christina Roberts
1473bd6107 Merge pull request #13592 from edx/christina/merge-release 
Christina/merge release
 2016-09-28 12:47:15 -04:00
Brian Jacobel
e42c1f8576 Merge pull request #13541 from edx/bjacobel/url.min.js 
Prevent url.min.js from being loaded outside a bundle
 2016-09-28 11:23:44 -04:00
cahrens
e77b5eb3c3 Merge with release. 2016-09-28 09:58:14 -04:00
Adam Palay
239867963e set neo4j configuration at the command line 2016-09-28 09:08:04 -04:00
attiyaishaque
e8f109a328 Revert "ECOM-5281 Add retires for email sending while registering." 
This reverts commit 4bbeaf32ae.
 2016-09-27 17:21:24 +05:00
attiyaishaque
648bc7efb4 Revert "Adding celery task for sending activation email." 
This reverts commit fe136122db.
 2016-09-27 17:20:57 +05:00
Matjaz Gregoric
344c72b3e2 Use non-ascii PLATFORM_NAME in tests. 
It should help catch unicode encoding problems earlier.

This also updates python-saml dependency to a version that includes a
patch for unicode strings.
 2016-09-23 15:38:23 +02:00
attiyaishaque
fe136122db Adding celery task for sending activation email. 2016-09-23 11:43:26 +05:00
attiyaishaque
4bbeaf32ae ECOM-5281 Add retires for email sending while registering. 2016-09-23 11:43:26 +05:00
Brian Jacobel
abe7fd29dd Prevent url.min.js from being loaded outside a bundle 2016-09-22 12:07:23 -04:00
asadiqbal
2833d1e9a5 WL-603 load locale paths for themes directories 2016-09-22 13:26:11 +05:00
Christina Roberts
4288793a23 Merge pull request #13497 from edx/release 
Merge release into master
 2016-09-16 13:19:01 -04:00
cahrens
9804f73e36 Revert "Fixed focus should remain within the simulated dialogs." 
This reverts commit ae849406bf.
 2016-09-16 09:27:19 -04:00
Nimisha Asthagiri
660bc8f447 Enable Persistent Grades in unit tests 2016-09-09 19:05:04 -04:00
Eric Fischer
31953c5e0c Update correct persistent score 
* First take at forcing a subsection's grade to update when a signal is
  sent that a problem's score has changed
* Refactor signal handler connection.
* Expand bokchoy tests to cover progress page
* Add some grading unit tests

TNL-5394
TNL-5364
 2016-09-08 15:09:05 -04:00
J. Cliff Dyer
1371739f45 Register block_structure djangoapp. 
TNL-5274
 2016-09-06 11:42:38 -04:00
sanfordstudent
b7ac081e49 Merge pull request #13329 from edx/sstudent/TNL-5382-part-1 
creating django admin settings for subsection grades
 2016-09-02 10:52:51 -04:00
Sanford Student
d54a784a43 creating django admin settings for subsection grades 2016-09-02 09:32:33 -04:00
Nimisha Asthagiri
b37d2d739a Make BlockStructure tasks more resilient against failures. 
https://openedx.atlassian.net/browse/TNL-5041
 2016-09-02 08:02:49 -04:00
Peter Desjardins
e276ae2d36 Adds a context-sensitive link to learner documentation from the LMS. The base URL defaults to Open edX learner doc and can be overridden with the base URL for edx.org learner doc. Also relabels the tab for support from help to support. 2016-09-01 10:56:09 -04:00
Adam
35c1654643 Merge pull request #13103 from edx/dump-to-neo4j-py2neo 
dump item information to neo4j
 2016-08-31 16:36:20 -04:00
Adam Palay
10bd4ef6bf dump item information to neo4j 
clear request cache to avoid memory leak

update to use https

delete courses in the same transaction as writing them

python3 compatibility
 2016-08-30 14:59:00 -04:00
George Song
194ace0ff0 Update to latest django-debug-toolbar 
Also make sure we set the recommended settings according to
<https://django-debug-toolbar.readthedocs.io/en/stable/installation.html#explicit-setup>
 2016-08-30 11:33:05 -07:00
Marco Morales
2e2a23b9d3 Merge pull request #13204 from edx/marco/copyrightyear/update 
Updated copyright year for LMS / CMS
 2016-08-26 10:51:43 -04:00
Waheed Ahmed
ae849406bf Fixed focus should remain within the simulated dialogs. 
ECOM-5303
 2016-08-26 16:28:51 +05:00
J. Cliff Dyer
bd8a8babe2 Update django-oauth-toolkit admin 2016-08-24 13:31:11 -04:00
Eric Fischer
22046d4067 Use PersistentSubsectionGrade in grades application 
Hooks the pre-existing grades code into our new PersistentSubsectionGrade data
model. Includes test updates, and some minor changes to the data model that
were discovered in testing.
 2016-08-22 09:47:37 -04:00
Brian Jacobel
7e12a1f7ae Merge pull request #12771 from edx/discussion-forums-ui-update 
Discussion forums UI update feature branch
 2016-08-18 12:58:54 -04:00
Andy Armstrong
89f93df46e Refactor out a new discussions Django app 2016-08-17 16:20:45 -04:00
Eric Fischer
8fa2c23377 TNL-5005 Persistent Grades Data Model 
Introduces database models and simple CRUD interface for robust grading
usage.
 2016-08-17 17:45:27 +00:00
marcotuts
8343918c9f updated copyright setting file 
updated LMS footer to include year in copyright message
 2016-08-15 10:04:24 -04:00
Andy Armstrong
5e8a62faa1 Merge pull request #13206 from EDUlib/bugfix-moment 
common.py incorrect moment.js for locales
 2016-08-12 16:34:45 -04:00
Pierre Mailhot
d2042f72c1 moment-with-locales.min.js must be used for locales other than en 2016-08-12 14:54:48 -04:00
Brian Beggs
1182ae6c54 Adding edx-django-release-util to LMS and CMS 2016-08-05 13:50:05 -04:00
Nimisha Asthagiri
be5940e6f4 Robust Grades refactor 
Adds ENABLE_SUBSECTION_GRADES_SAVED feature flag to both lms and cms. Also
installs the wiring that will allow robust grades to be used for courses
that enable it. This functionality is still gated by the feature flag
and should not be used until the remaining robust grades work is finished.
 2016-08-03 15:47:16 -04:00
Ned Batchelder
76bc4fb98e Fix 29 anomalous-backslash-in-string errors 2016-08-03 12:44:41 -04:00
wajeeha-khalid
986dcff626 MA-2536: get 'course_about' url in enrollment 2016-07-29 14:58:54 +05:00
Nimisha Asthagiri
a1a5a0fcb9 Enable Milestones in LMS Tests 2016-07-27 14:56:24 -04:00
Saleem Latif
6277bd27e6 Remove all usages of USE_CUSTOM_THEME and THEME_NAME from python files 2016-07-27 14:53:02 +05:00
Saleem Latif
8ae92901ef 1. Merge microsites into Comprehensive Theming 
2. Add site configuration overrides to theming/helpers.py
3. Move microsite.get_value from theming/helpers to site_configuration/helpers
4. Move microsite_configuration.microsite.get_value usages to site_configuration.helpers.values
 2016-07-27 13:55:14 +05:00
Renzo Lucioni
29672370b9 Configure JWT auth when running Studio in devstack 
An important step towards being able to use Studio's program editor out of the box. Part of ECOM-4638.
 2016-07-25 13:37:20 -04:00
Kevin Kim
2fddd2bd71 Initial check of removing feature flag (#13058) 2016-07-22 09:28:19 -04:00
Nimisha Asthagiri
b04a6a6a4b Merge pull request #13053 from edx/tnl/grades-app 
Create Grades djangoapp
 2016-07-22 09:07:40 -04:00
Nimisha Asthagiri
1ada5c3487 Create Grades djangoapp 
https://openedx.atlassian.net/browse/TNL-5008
 2016-07-22 00:09:43 -04:00
Christina Roberts
467bc55d27 Merge pull request #12950 from edx/christina/studio-support-levels 
Studio support level of components/xblocks
 2016-07-21 17:13:58 -04:00
cahrens
d4cc7b8ffd Support level support for Studio xblock creation. 
TNL-4670
 2016-07-21 15:44:59 -04:00
Jesse Zoldak
3647c17911 Make the temp dir for instructor dashboard local files uniquely named. EV-56 2016-07-16 09:37:30 -04:00
Renzo Lucioni
863782d021 Merge pull request #12991 from edx/renzo/run-marketing-urls 
Use course run marketing URLs from the catalog service on program detail page
 2016-07-15 17:55:01 -04:00