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

17975 Commits

Author SHA1 Message Date
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
Zia Fazal
2bd26fc0e4 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-23 15:12:32 -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
Ahsan Ulhaq
508ded2673 LMS: course navigation menu refactor 2015-09-23 13:13:18 -04:00
Andy Armstrong
d09034e065 Improve team testing of routers 2015-09-23 13:10:46 -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
Diana Huang
a53903c46a Add team column to grade reports. 2015-09-23 12:21:13 -04:00
Saleem Latif
05a72486f3 date format "Monday at 3pm UTC" added for courses starting with-in 5 days 2015-09-23 12:17:08 +05:00
Frances Botsford
5a740961a4 override wrapper-msg styles for auto-cert 2015-09-22 16:27:46 -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
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
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
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
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
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
Christine Lytwynec
f96d4b7142 Manage focus on modal confirmation prompt 2015-09-21 13:36: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
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
Marco Morales
ad465d6ba6 Discussion forum styling cleanup to correct current visual styling issues in addition to cleaning up styles in preparation for adding post images 2015-09-21 09:24:47 -04:00
Matt Drayer
f8e1224f00 Merge pull request #9805 from edx/ziafazal/SOL-1193-escapejs 
escape string literal also
 2015-09-20 22:48:35 -04:00
Sarina Canelake
c480fb8fd5 Remove second tooltip from LMS Sequentials 2015-09-20 10:59:04 -04:00
Awais Jibran
13e8761aa4 In cohort courses, student progress pages differ from the grade report. 
TNL-3204
 2015-09-18 23:43:26 +05:00
Muhammad Ammar
edf88962b5 Merge pull request #9534 from edx/ammar/update-factory-boy 
Update factory_boy
 2015-09-18 19:04:48 +05:00
Christina Roberts
56fd445f5c Merge pull request #9798 from edx/christina/teams-dashboard 
Emit event when last_activity_at is updated.
 2015-09-18 09:54:36 -04:00
Peter Pinch
01aea1a494 Merge pull request #9335 from mitocw/error_message_student_notfound_ccx_coach_dashboard 
Added error message in enrollment tab inside CCX coach dashboard
 2015-09-18 09:33:02 -04:00
muhammad-ammar
6a5ce5d544 Upgrade factory_boy 
TNL-3179
 2015-09-18 18:02:38 +05:00
Peter Fogg
0a2cfbe31c Merge pull request #9738 from edx/peter-fogg/change-studio-help-links 
Remove Tender and change Studio help links.
 2015-09-17 22:42:57 -04:00
Kevin Falcone
81abdbe81b Merge pull request #9819 from edx/release 
Release
 2015-09-17 21:30:48 -04:00
cahrens
0d99449899 Emit event when last_activity_at is updated. 
TNL-3303
 2015-09-17 17:19:17 -04:00
Peter Fogg
fec5129a49 Remove Tender and change Studio help links. 
TNL-2695
 2015-09-17 16:30:40 -04:00
Peter Fogg
0f78989220 Escape team name in screenreader text. 2015-09-17 16:15:50 -04:00
Ned Batchelder
bc13f450a7 Fix mako argument syntax 2015-09-17 15:40:33 -04:00
Ned Batchelder
1d6e91404d Rename google_analytics.html to use a hyphen instead. 2015-09-17 15:40:33 -04:00
Brian Talbot
cb921fd7ff Comprehensive Theming: setting sass !default flag on themeable LMS base variables 2015-09-17 15:40:33 -04:00
Brian Talbot
b815a86e8a Comprehensive Theming: re-organizing/minor simplifying of existing LMS Sass variables 2015-09-17 15:40:32 -04:00
Ned Batchelder
c0856232e1 Use sass interpolation instead of concatenation for -path 2015-09-17 15:39:04 -04:00
Ned Batchelder
5d64f9a80b Minor changes, responding to pull request comments 2015-09-17 15:39:03 -04:00
Ned Batchelder
a8dd9ca99d Use the proper 'off' default for COMP_THEME_DIR. 2015-09-17 15:39:03 -04:00
David Baumgold
6ebf2515f4 Comprehensive theming 
This is a squash of 38 commits ending with
5b080f979d692804452400ac5bed9b17c50b001e
 2015-09-17 15:39:03 -04:00
Gabe Mulley
b56d4a0295 Revert "Fix order of tracking backends" 2015-09-17 15:04:21 -04:00