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

1504 Commits

Author SHA1 Message Date
Julia Hansbrough
5752312bbb Merge pull request #2776 from aboudreault/embargo-restrict-additions 
Extended Embargo feature to support site access restriction and ip network
 2014-05-21 15:24:07 -04:00
John Jarvis
d25136893c Merge pull request #3712 from edx/jarv/cert-mode 
returning enrollment mode for both active and inactive users
 2014-05-21 10:07:17 -04:00
David Baumgold
6e0e13003f Merge pull request #3744 from lduarte1991/lduarte-harvardx 
Reconnecting Token Generator for Annotation Tool [Fix]
 2014-05-20 15:34:34 -04:00
David Baumgold
75ff35e208 proxy raw further along 2014-05-20 14:01:55 -04:00
David Baumgold
8080261aa7 generate raw URLs that are not rewritten by static_replace 2014-05-20 13:27:47 -04:00
Alan Boudreault
877ec3f963 some minor improvements to embargo 2014-05-20 10:03:06 -04:00
Jason Bau
411dc09af7 Autoactivate inactive users on external_auth login 
Conditional on existing flag BYPASS_ACTIVATION_EMAIL_FOR_EXTAUTH
 2014-05-19 13:35:35 -07:00
Alan Boudreault
db161543d8 Modified EMBARGO_SITE to SITE_EMBARGOED, improved logs 2014-05-19 15:53:45 -04:00
Alan Boudreault
25948e3694 Fix minor typo in a test 2014-05-19 15:12:02 -04:00
Alan Boudreault
ba6e61b907 Extended Embargo feature to support site access restriction and ip network 2014-05-19 15:12:02 -04:00
lduarte1991
e911d57911 Revert "Revert pull request #3466" 
This reverts commit 59e3cae4c9.
 2014-05-15 15:23:28 -04:00
David Baumgold
59e3cae4c9 Revert pull request #3466 2014-05-14 13:55:26 -04:00
John Jarvis
71c447768d returning enrollment mode for both active and inactive users 2014-05-13 17:47:52 -04:00
David Ormsbee
77c7ebd704 Merge pull request #2768 from carsongee/cg/ssl-next-url 
Modified ssl certificate authentication to handle next redirection
 2014-05-11 20:12:12 -04:00
David Baumgold
c0a5171c75 Merge pull request #3466 from lduarte1991/lduarte-harvardx 
Reconnecting Token Generator for Annotation Tool
 2014-05-09 16:14:42 -04:00
Carson Gee
cbf525f6cf Fix infinite redirect loop on logout caused by django caching 2014-05-09 14:22:11 -04:00
Carson Gee
5452de20d8 Modified ssl certificate authentication to handle next redirection 
Makes small changes in lms and cms both so that user's go to the
original page they intended to if they weren't already logged in
 2014-05-09 14:22:10 -04:00
Feanil Patel
1a9b505572 Merge pull request #3622 from edx/feanil/fix_enrollment_bug 
Field name is 'username' not 'user'
 2014-05-08 09:44:12 -04:00
Feanil Patel
f14146a5fa Field name is 'username' not 'user' 2014-05-06 15:39:00 -04:00
Ned Batchelder
db8c4de202 Remove press-page machinery and assets 2014-05-06 13:29:17 -04:00
Sarina Canelake
799c3611de Merge pull request #3602 from edx/sarina/LMS-2644 
Ensure system language is released in dark lang middleware
 2014-05-05 16:29:37 -04:00
Sarina Canelake
41b25fec9a Ensure system language is released in dark lang middleware 
LMS-2644
 2014-05-05 15:42:48 -04:00
Adam
0b8cc25be3 Merge pull request #3582 from edx/adam/some-cleaning 
Adam/some cleaning
 2014-05-05 15:14:59 -04:00
Waqas
a07da78a0f Add the "VERIFIED_CERTIFICATES" toggle on dashboard 2014-05-05 20:10:26 +05:00
Christina Roberts
b914ddf768 Merge pull request #3576 from edx/christina/view-studio-bug 
Do not show "View in Studio" links for child verticals of verticals.
 2014-05-04 20:59:25 -04:00
Joe Blaylock
ae8847cd6e Certificates: URL endpoint for cert gen 
* API endpoint for certificate generation, an authenticated  post with course
  id requests that grading be carried out and a cert generated for
  request.user in that course, using the usual grading and certificate
  machinery (ie, it does not imply whitelisting, though whitelists and
  blacklists will be respected)
  - Logs each request as it comes in
  - Calls xq.add_cert() and consequently, does grading synchronously on
    this app host and then queues request for certificate agent.
  - example usage:
    ```
    curl --data "student_id=9999&course_id=Stanford/2013/Some_Class" http://127.0.0.1:8000/request_certificate
    ```

* Studio advanced setting added, "certificates_show_before_end", which
  determines whether a course should permit certificates to be downloadable
  by students before the coures's end date has passed.
  - Modifications to dashboard view and templates to allow display of
    certificate download links before course has ended.
    (XXX: may declare failing students as failing before the course has ended.)
  - To test, turn the setting on in a course which hasn't ended yet, and
    force certificate generation for a student, then check their
    dashboard.
 2014-05-02 14:34:21 -07:00
Adam Palay
ced3f67ab1 fix authentication check in auth 2014-05-02 15:28:59 -04:00
Sarina Canelake
af31f31be8 Expose "enabled" checkbox in Embargo admin 2014-05-02 14:59:22 -04:00
cahrens
1e92a6c884 Do not show "View in Studio" links for child verticals of verticals. 
STUD-1558
 2014-05-02 13:36:44 -04:00
Gabe Mulley
36269bd5a8 Integrate event-tracking in to the LMS 
Support incremental conversion of events from the old API to the new, in order to ensure the new system is working, enrollment events have been modified to make use of the new API.
 2014-05-01 14:04:35 -04:00
Ned Batchelder
f3952f2a96 Merge pull request #3533 from johncox-google/johncox/bug/pipeline 
Fix bug that prevented account association during registration
 2014-04-30 16:59:59 -04:00
John Cox
5333bd7d14 Fix bug that prevented account association during registration 2014-04-29 17:42:08 -07:00
Jason Bau
f8c062b6ce lti 2.0 result service rest endpoint 2014-04-29 12:01:12 -07:00
muhammad-ammar
dfa45eac16 Merge pull request #3440 from edx/ammar/config-youtube-stub-for-bok-choy 
Configure youtube stub for bok-choy
 2014-04-28 17:32:33 +05:00
Muhammad Ammar
6f064e2b27 Configure youtube stub for bok-choy 2014-04-25 20:01:09 +00:00
John Cox
1192b5f7c9 Make dispatch logic clearer 2014-04-25 12:11:20 -07:00
John Cox
c80b596890 Fix two error message corner cases 2014-04-25 12:11:20 -07:00
John Cox
ce0b640712 Add third-party auth implementation and tests 2014-04-25 12:11:20 -07:00
lduarte1991
5ae1ca9685 Reconnecting Token Generator for Annotation Tool 2014-04-24 16:14:05 -04:00
jsa
f71e78b69f add acceptance tests for user profile pagination. 
JIRA: FOR-492
 2014-04-24 13:47:03 -04:00
David Baumgold
6773105264 Merge pull request #3425 from edx/pk-set-can-be-none 
pk_set can be None
 2014-04-23 15:30:37 -04:00
John Jarvis
27256bbbb4 Merge pull request #3396 from edx/jarv/change_enrollment_cmd 
adding django admin command to change enrollment
 2014-04-23 09:44:46 -04:00
David Baumgold
8351869346 Fixes #3409 2014-04-22 13:30:49 -04:00
Sef Kloninger
f3842dcc01 Merge pull request #2834 from edx/sef/theme-embargo-master 
make embargo template theme-able
 2014-04-22 10:04:08 -07:00
John Jarvis
67128c5ff8 grammar 2014-04-18 10:13:23 -04:00
John Jarvis
b67987cd43 fixing example 2014-04-18 10:12:47 -04:00
John Jarvis
27104c93ea adding django admin command to change enrollment 2014-04-18 10:07:18 -04:00
Jay Zoldak
3fc19a35b0 Serve video HTML5 sources locally for acceptance tests 2014-04-15 10:40:53 -04:00
Waqas Khalid
70b525e259 Merge pull request #3203 from mlkwaqas/waqas/lms2479-fixed-userlazy-object-change-name 
fix change name view by replacing the request.user simple lazy object wi...
 2014-04-14 17:55:26 +05:00
Valera Rozuvan
615ce23930 Update acceptance tests to use real duration of YouTube video. 2014-04-14 10:37:56 +03:00