Ned Batchelder
a5a575a056
Merge pull request #9887 from edx/ned/faster-pyc-cleaning
...
A faster way to clean the .pyc files
2015-09-23 19:04:52 -04:00
Brian Beggs
e9fceb8bc2
Merge pull request #9891 from edx/release
...
merge release in to master for release 2015-09-22
2015-09-23 18:09:01 -04:00
Feanil Patel
06998ead16
Merge pull request #9867 from edx/feanil/update_requests
...
Upgrade to the latest version of requests.
2015-09-23 17:09:07 -04:00
Brian Beggs
a6ad7c1c2b
Merge pull request #9897 from edx/revert-9803-usman/use-included-staticfiles-app
...
Revert "Upgrade django-pipeline and staticfiles"
2015-09-23 15:52:51 -04:00
Brian Beggs
c26bb9188a
Revert "Upgrade django-pipeline and staticfiles"
2015-09-23 15:52:24 -04:00
Brian Beggs
4c05fa4f49
Merge pull request #9803 from edx/usman/use-included-staticfiles-app
...
Upgrade django-pipeline and staticfiles
2015-09-23 15:50:39 -04:00
clrux
0b64f2d612
Merge pull request #9525 from edx/clrux/ac-76
...
LMS: Course navigation revamp
2015-09-23 14:26:10 -04:00
Ned Batchelder
210be884bf
A faster way to clean the .pyc files
...
On my devstack, the old line takes about 5.5 seconds, the new line takes
about 1.3 seconds.
For background:
http://nedbatchelder.com/blog/201505/be_careful_deleting_files_around_git.html
2015-09-23 13:57:12 -04:00
Ahsan Ulhaq
508ded2673
LMS: course navigation menu refactor
2015-09-23 13:13:18 -04:00
Sarina Canelake
b7a432c2eb
Merge pull request #9786 from OmarIthawi/edraak/descriptive-dashboard-title
...
More descriptive dashboard title
2015-09-23 13:05:08 -04:00
Bill DeRusha
d75a36a347
Merge pull request #9853 from edx/bderusha/mailchimp-sync
...
Add mailchimp list fields and config for new users
2015-09-23 12:44:57 -04:00
Brian Beggs
55e2a326cb
Merge pull request #9835 from edx/rc/2015-09-22
...
Release candidate for 2015 09 22
2015-09-23 12:39:23 -04:00
Brian
10e07d0f3e
Merge branch 'hotfix/2015-09-21' into rc/2015-09-22
2015-09-23 08:40:22 -04:00
Brian Beggs
ad7db1b5db
Merge pull request #9883 from edx/hotfix/2015-09-21
...
merge hotfix/2015-09-21 in to release
2015-09-23 08:31:18 -04:00
Sarina Canelake
d8d49f7544
Merge pull request #9606 from Colin-Fredericks/ColinF-PC-not-dropdown
...
TNL-3197 Partial Credit (not Dropdown)
2015-09-22 15:10:13 -04:00
Feanil Patel
779861550f
Upgrade to the latest version of requests.
...
Changelog: https://pypi.python.org/pypi/requests
2015-09-22 13:33:35 -04:00
Jim Abramson
358f8056dd
Merge pull request #9345 from open-craft/smarnach/enrollment-api
...
Allow staff users to request a list of courses a student is enrolled in via the Enrollment API.
2015-09-22 13:22:50 -04:00
Colin-Fredericks
350387c0a9
TNL-3197 Partial Credit (not Dropdown)
...
Updated templates
Updating responsetype tests.
Updating other tests for PC
Putting OptionInput back the way it was.
Acceptance tests for partial credit
Testing tools
pep8
scss name fix
Missing }
icon fix
icon fix
2015-09-22 13:20:39 -04:00
Matt Drayer
fac7b24872
Merge pull request #9863 from edx/ziafazal/SOL-1230
...
SOL-1230: fixed bug in certificate html view
2015-09-22 12:30:21 -04:00
Matt Drayer
028c0fa4f7
Merge pull request #9802 from edx/asadiqbal08/SOL-1212
...
asadiqbal08/SOL-1212: Update edx-organizations reference
2015-09-22 11:41:35 -04:00
Usman Khalid
158bdf4d09
Use django.contrib.staticfiles instead of django-staticfiles.
...
TNL-3137
2015-09-22 20:39:44 +05:00
Usman Khalid
1e799eb508
Upgrade to django-pipeline v.1.5.3.
...
TNL-3137
2015-09-22 20:39:43 +05:00
Matt Drayer
5de93a3ad1
Merge pull request #9850 from edx/asadiqbal08/SOL-1188-fix
...
asadiqbal08/SOL-1188-fix
2015-09-22 11:38:00 -04:00
wajeeha-khalid
242c4c83f6
Merge pull request #9759 from edx/jia/MA-1212
...
MA-1212 - Discussion API: add response_count field in GET single thread
2015-09-22 19:43:05 +05:00
Bill DeRusha
ccc43cfe98
Add mailchimp list fields and config for new users
2015-09-22 10:24:24 -04:00
wajeeha-khalid
8e9e94df43
Merge pull request #9847 from edx/jia/MA-1305
...
MA-1305 - formatted author label to Staff & Community TA
2015-09-22 18:45:25 +05:00
Jesse Zoldak
d9dbc1f24b
Merge pull request #9793 from edx/zoldak/django-session-cookie
...
Add the ability to change the SESSION_SAVE_EVERY_REQUEST django setting
2015-09-22 09:28:42 -04:00
asadiqbal
396beadd97
SOL-1122 update github.txt reference
2015-09-22 17:35:22 +05:00
wajeeha-khalid
ab4d85a5d1
MA-1305 - formatted author label to Staff & Community TA
...
refactor community_ta and staff in docstrings
2015-09-22 17:03:04 +05:00
wajeeha-khalid
3f453e892d
added response count in thread
...
MA-1212 - added response count field in tests
removed unneccessary function
"MA-1212 - added response count in thread retrieval service and updated tests"
updated serializerz test for response count
MA-1212
exclude response count from thread get list
removed response_count field from update and create thread services
made resp_total dynamic for cs thread in test_serielizer
quality fixed
improved quality
add TODO JIRA ticket on removed fields
2015-09-22 16:55:36 +05:00
Zia Fazal
2a523848b9
fixed bug in certificate html view
...
Fixed bug: When certificate id previewed by a user who already has a
certificate generated with different mode it would not display
certificate in right preview mode.
2015-09-22 16:08:56 +05:00
Brian Beggs
8b39e1bf2b
Merge pull request #9857 from edx/cdodge/proctoring-0.9.6e
...
Bump proctoring to 0.9.6e
2015-09-21 17:03:09 -04:00
Nimisha Asthagiri
946102a3e0
Merge pull request #9823 from edx/mobile/xblock-rendering-api
...
MA-1337 xBlock Rendering View
2015-09-21 17:00:05 -04:00
Nimisha Asthagiri
31d5d513f8
MA-1337 xBlock Rendering View
2015-09-21 16:17:11 -04:00
Chris Dodge
94377662fd
Bump proctoring to 0.9.6e
2015-09-21 15:43:54 -04:00
Clinton Blackburn
8cd297ec08
Merge pull request #9816 from edx/clintonb/admin-updates
...
Additional Admin Updates
2015-09-21 15:34:02 -04:00
Daniel Friedman
3c70af3ba8
Merge pull request #9814 from edx/dan-f/update-course-structure-api-doc
...
Document child order in course structure api docs
2015-09-21 15:16:53 -04:00
Chris Dodge
d98510e1e9
use edx-proctoring 0.9.6d
2015-09-21 14:47:29 -04:00
Sarina Canelake
8797a4f67d
Merge pull request #9855 from edx/gymnasium/fix-final-check-label
...
fix label for check/final check
2015-09-21 13:13:02 -04:00
Jesse Zoldak
8a876a5ec3
Add the ability to change the SESSION_SAVE_EVERY_REQUEST django setting
2015-09-21 13:01:42 -04:00
Mike Bifulco
13c6550aea
fix label for check/final check
...
This label hadn't been updated to change its message depending on whether students were on their "final" submission attempt.
2015-09-21 12:12:49 -04:00
Ned Batchelder
1665993f0e
Merge pull request #9851 from edx/ned/coverage-40
...
Use coverage.py 4.0 final, and coveralls to match
2015-09-21 11:23:06 -04:00
David Baumgold
03aeae4bd7
Merge pull request #8271 from edx/sass-theming
...
Comprehensive Theming
2015-09-21 10:55:18 -04:00
Sarina Canelake
9a0152724b
Merge pull request #9846 from edx/sarina/tooltips
...
Make LMS courseware tooltips better
2015-09-21 10:32:07 -04:00
David Baumgold
5711fd42b0
Merge pull request #9818 from edx/ned/fix-xmodule-scss
...
Import the correct scss files for xmodule styling
2015-09-21 09:58:39 -04:00
Sarina Canelake
94b73dc921
Remove blank lines from tooltip display
2015-09-21 09:29:24 -04:00
Ned Batchelder
3c74219c3d
Use coverage.py 4.0 final, and coveralls to match
2015-09-21 08:22:54 -04:00
asadiqbal
3a2c97a02f
SOL-1188 fix
2015-09-21 17:08:27 +05:00
Brian Talbot
553804d7d8
Merge pull request #9834 from edx/talbs/fix-xmodule-scss
...
Simplifying needed sass assets for xmodule sass compilation
2015-09-21 08:02:09 -04:00
Matt Drayer
58488eaa0b
Merge pull request #9782 from edx/asadiqbal08/SOL-1188
...
SOL-1188 Cancel button Saving not Canceling
2015-09-20 23:01:34 -04:00
