Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
42,575 Commits 1 Branch 0 Tags
9f2e96d4a010bc4bcbc91cb8d9744db823a6432f
Commit Graph

16793 Commits

Author SHA1 Message Date
Harry Rein
c9f75f6bc8 Merge pull request #15926 from edx/HarryRein/FEDX-375-bootstrap-beta 
Harry rein/fedx 375 bootstrap beta
 2017-09-07 10:12:05 -04:00
Fred Smith
75ca7342fe Merge pull request #15966 from edx/derf/reduce_celery_heartbeat_frequency 
reduce celery heartbeat frequency
 2017-09-07 08:17:28 -04:00
Andy Armstrong
6e10d2a556 Update to use Bootstrap beta release 
FEDX-375
 2017-09-06 22:49:05 -04:00
Gregory Martin
a51b9597e2 Merge pull request #15953 from edx/yro/update_cert_display_date 
Update Cert Display Date
 2017-09-06 16:10:41 -04:00
Jeremy Bowman
f15a686775 Merge pull request #15965 from edx/jmbowman/pytest_compatibility 
pytest compatibility fixes
 2017-09-06 16:03:26 -04:00
Andy Armstrong
2d40854391 Merge pull request #15957 from edx/andya/learner-certificate-filtering 
Only show passing certificates on a learner profile
 2017-09-06 15:21:25 -04:00
Gregory Martin
4d59eff8f6 Update cert display date 
EDUCATOR-1266
 2017-09-06 15:17:27 -04:00
Fred Smith
f891c0fae8 reduce celery heartbeat frequency 2017-09-06 14:58:34 -04:00
Jeremy Bowman
ded294c420 pytest compatibility fixes 2017-09-06 14:20:34 -04:00
Jeremy Bowman
97f5fe035b Fixes for pytest database usage 2017-09-06 13:15:34 -04:00
Andy Armstrong
d05b62a283 Only show passing certificates on a learner profile 
LEARNER-2486
 2017-09-06 12:32:15 -04:00
Sofiya Semenova
038d5182ec Merge pull request #15922 from edx/ssemenova/ed-1101 
"View/Request Certificate" button logic on progress page and dashboard
 2017-09-06 11:20:21 -04:00
Jeremy Bowman
ae44f1840c Merge pull request #15951 from edx/jmbowman/ddt_cleanup 
ddt usage cleanup
 2017-09-06 11:19:39 -04:00
Harry Rein
d6e89e7bde Merge pull request #15956 from edx/HarryRein/LEARNER-2485-profile-issues 
LEARNER-2485: Fix styling issues on learner profile.
 2017-09-06 11:02:19 -04:00
Jeremy Bowman
fd6af6b05e ddt usage cleanup 2017-09-05 17:25:51 -04:00
Alex Dusenbery
0137e38e97 EDUCATOR-1241 | make a separate file to make decisions about auto generated certs. 2017-09-05 16:15:43 -04:00
Sofiya Semenova
f3f7e78e24 educator-1101 view/request certificate button logic on progress page and dashboard 2017-09-05 15:29:22 -04:00
Harry Rein
d0bc499f66 Fix styling issues on learner profile. 
LEARNER-2485

1) Joined Date is shown in bold and there is no line below to separate
it from the next section.
2) The bio shows up below the certificates.
3) Switching to 'limited profile' does not correctly hide the language,
location and joined date fields.
 2017-09-05 15:15:07 -04:00
Brian Mesick
94400d21b6 Merge pull request #15936 from edx/bmedx/oauth_token_delete_setting 
Add default OAUTH_DELETE_EXPIRED to LMS settings
 2017-09-05 11:04:13 -04:00
bmedx
bad68f8b1e Add default OAUTH_DELETE_EXPIRED to LMS settings 2017-09-01 11:06:54 -04:00
Andy Armstrong
ff5c6f0c30 Merge pull request #15868 from edx/andya/profile-certificates 
LEARNER-1860: Course certificates on the learner profile
 2017-09-01 07:12:03 -04:00
Andy Armstrong
6f888d6995 Add course certificates on the learner profile 
LEARNER-1860
 2017-08-31 20:58:35 -04:00
Gabe Mulley
6a36eb0183 Use ACE to 'send' Recurring Nudge emails 2017-08-31 16:58:08 -04:00
tasawernawaz
0c3c78b765 Fixed a11y on course actions dropdown menu on dashboard 
LEARNER-2430
 2017-08-31 10:41:04 +05:00
Clinton Blackburn
0a6029f7a7 Added verified upgrade hero to course run homepage 
Audit learners are now shown a prompt to upgrade to the verified track
of the course run. This message goes away after the learner upgrades.
 2017-08-30 17:01:27 -04:00
Ned Batchelder
ee01e3e0b7 Merge pull request #15909 from edx/nedbat/update-translations 
Update translations (autogenerated message)
 2017-08-30 16:38:54 -04:00
Gregory Martin
1d1fcb8247 Merge pull request #15932 from edx/yro/string_fix 
Update to Certs Date String
 2017-08-30 16:01:40 -04:00
Gregory Martin
18e21ff9c7 Update 2017-08-30 15:04:33 -04:00
Eric Fischer
e32615e132 Revert "Merge pull request #15641 from jspayd/toggle-timer-upstream" 
This reverts commit 0c204e3520, reversing
changes made to 0495d70b46.
 2017-08-30 14:33:18 -04:00
sanfordstudent
4c98c884e6 Merge pull request #15908 from edx/sstudent/state-deletion 
account for delete state in grading code
 2017-08-30 14:15:17 -04:00
Ned Batchelder
96ad386d36 Update translations (autogenerated message) 2017-08-30 18:01:15 +00:00
Gregory Martin
729127c3aa Merge pull request #15920 from edx/yro/disable_nocertificate_date 
Deactivate date display if no cert active
 2017-08-30 13:46:53 -04:00
Sanford Student
2d3e9dd12c account for delete state in grading code 2017-08-30 13:20:52 -04:00
Ayub khan
e56966c147 Merge pull request #15896 from edx/LEARNER-2294 
Remove basket creation calls for audit orders from commerce and remove waffle flag used to stop those calls
 2017-08-30 22:12:45 +05:00
Gregory Martin
43e14b9142 Deactivate date display if no cert active 
EDUCATOR-1234
 2017-08-30 12:23:58 -04:00
Ned Batchelder
63364fd305 Update translations (autogenerated message) 2017-08-30 16:12:38 +00:00
Ibrahim Ahmed
daaf31fd37 Merge pull request #15925 from edx/ibrahimahmed443/WL-1186-program-dashboard-layout-update 
Program dashboard page layout update
 2017-08-30 20:54:25 +05:00
Tasawer Nawaz
120bf907f9 Merge pull request #15912 from edx/tasawer/learner-2305/fix-a11y-issues-on-unenroll-dialogbox 
Fixed tab issue on unenroll dialog.
 2017-08-30 20:34:44 +05:00
ayub-khan
32679b0423 Removed waffle flag on commerce api for default_enrollment_mode 
Removed ecommerce calls for default_enrollment_mode order creation
Removed tests related to those
LEARNER-2294
 2017-08-30 18:13:02 +05:00
Ibrahim
bcbd366fc9 Program dashboard page layout update 2017-08-30 16:52:37 +05:00
Hasnain Naveed
e4deef9dd6 Merge pull request #15451 from edx/mjevtic/remove-waffle-switches 
LEARNER-1146 | Remove populate-multitenant-programs waffle switch
 2017-08-30 15:06:46 +05:00
Harry Rein
f42e6f1c5d Merge pull request #15826 from edx/HarryRein/LEANER-1859-social-profile-links 
LEARNER-1859: social profile links
 2017-08-29 14:43:30 -04:00
Harry Rein
9f88427f9b Add social links to learner profile. 
LEARNER-1859

Added fields to add social links to the user account settings file.
Added icons to the user profile when these links are set, only shown
when users show their entire profile. Added jasmine tests for account
settings and learner profile pages. Added python unit tests to test
validation on the user account.
 2017-08-29 13:53:08 -04:00
Jeremy Bowman
00c4ede8ee Merge pull request #15831 from edx/jmbowman/PLAT-1710 
PLAT-1710 Support lettuce tests in Docker Devstack
 2017-08-29 13:25:58 -04:00
Omar Al-Ithawi
d0c7a532ad Make the platform name translatable 2017-08-29 12:43:36 -04:00
Ari Rizzitano
19dec17e7b Merge pull request #15806 from edx/ari/ss-review-report 
expand proctored exam report to include violation summary
 2017-08-29 10:10:50 -04:00
Waheed Ahmed
dd95861177 Merge pull request #15911 from edx/waheed/LEARNER-2201-create-delete-migration 
Create migration to remove field 'sailthru_activation_template' from DB table.
 2017-08-29 18:36:49 +05:00
Nimisha Asthagiri
d23ed5e2e4 Merge pull request #15878 from edx/ret/foreign-key-course-key 
Ret/foreign key course key
 2017-08-29 09:00:51 -04:00
tasawernawaz
c47806a816 Fixed tab issue on unenroll dialog 
LEARNER-2305
 2017-08-29 17:25:01 +05:00
Waheed Ahmed
7d5446125d Create migration to remove 'sailthru_activation_template' from DB. 
Follow up PR for PR-15863 to remove the field from database table.

LEARNER-2201
 2017-08-29 13:07:28 +05:00