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

29453 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
polesye
d38b51cb4a BLD-1117: Add read-only list of Group Configurations. 2014-07-02 18:26:27 +03:00
louyihua
94faa6b836 Misuse of 'gettext' into mako templates 
To translate strings in mako templates, the pattern of ```${_()}``` should be used instead of ```gettext``` even if the strings to be translated is located in a ```script``` block.
 2014-07-02 20:59:18 +08:00
Will Daly
9322714d9e Merge pull request #4281 from edx/usman/lms6634-support-page-url-matching 
Fixed urlpatterns regex for support views in dashboard app.
 2014-07-02 08:45:01 -04:00
Usman Khalid
c201d78c43 Fixed urlpatterns regex for support views in dashboard app. 
LMS-6634
 2014-07-02 16:01:25 +05:00
Jay Zoldak
3515212196 Merge pull request #4266 from edx/revert-4050-linkedin-email 
Revert "Make LinkedIn auth provider request email by default."
 2014-07-01 14:36:50 -04:00
Jim Abramson
96c77a7ffc Merge pull request #4271 from edx/jsa/fix-new-post-view-spec 
update NewPostViewSpec to correctly initialize NewPostView
 2014-07-01 13:58:04 -04:00
jsa
59e2a6ddde update NewPostViewSpec to correctly initialize NewPostView 2014-07-01 13:43:54 -04:00
Usman Khalid
a278697506 Merge pull request #4268 from edx/usman/lms6631-certificate-mode 
Moved GeneratedCertificates.MODES back inside model.
 2014-07-01 22:32:03 +05:00
Christina Roberts
3f2a6d1edf Merge pull request #4241 from louyihua/fix-name-in-studio 
Change 'Course Name' to 'Course Run' in "Schedule & Details" page
 2014-07-01 11:53:20 -04:00
Usman Khalid
446270c0ff Moved GeneratedCertificates.MODES back inside model. 
LMS-6631
 2014-07-01 19:46:51 +05:00
Adam
653d6f21dd Merge pull request #4171 from edx/adam/fix-lms-2773 
Prevents students from accidentally changing their enrollment on login (...
 2014-07-01 10:38:50 -04:00
David Baumgold
ca7d895350 Revert "Make LinkedIn auth provider request email by default." 2014-07-01 10:05:01 -04:00
Anton Stupak
8201c9906a Merge pull request #4038 from edx/anton/redirect-on-error 
Add 401 error handler.
 2014-07-01 17:03:09 +03:00
Usman Khalid
1fad1d73d9 Merge pull request #4262 from edx/usman/lms2920-no-refund-if-given-certificate 
Do not refund student if a certificate entry already exists for them.
 2014-07-01 17:38:04 +05:00
Mark Hoeber
b989ec149a Merge pull request #4222 from edx/ahodges/documentation/DOC158 
Ahodges/documentation/doc158
 2014-07-01 08:26:31 -04:00
Usman Khalid
6a3d5eb079 Do not refund student if a certificate entry already exists for them. 
LMS-2920
 2014-07-01 16:29:07 +05:00
Clinton Blackburn
d118fb8cb2 Get active student count from new analytics data API 
Disabled by default.
 2014-07-01 07:18:04 -04:00
Christina Roberts
57f364d90e Merge pull request #4259 from edx/benmcmorran/fix-xblock-visibility 
Uses ModuleStoreEnum in is_xblock_visible_to_students
 2014-06-30 20:03:51 -04:00
Adam Palay
536b9dbe31 in some cases we do want that redirect url 2014-06-30 17:05:48 -04:00
Carlos Andrés Rocha
9261a3e6b9 Merge pull request #4234 from rocha/rocha/analytics-active-count 
Get active student count from new analytics data API
 2014-06-30 16:53:56 -04:00
Adam Palay
92f53236cf fix 400s from change_enrollment causing 404s (LMS-6625) 2014-06-30 16:22:14 -04:00
Ben McMorran
d00e2b7477 Uses ModuleStoreEnum in is_xblock_visible_to_students 2014-06-30 15:47:11 -04:00
Ben McMorran
f670ff74e4 Uses ModuleStoreEnum in is_xblock_visible_to_students 2014-06-30 15:34:39 -04:00
Clinton Blackburn
36cfe7ab9e Get active student count from new analytics data API 
Disabled by default.
 2014-06-30 15:16:30 -04:00
Jim Abramson
5d37ea83f7 Merge pull request #4216 from edx/jsa/new-post-redesign 
consolidate new post form variants into single client-side template/view
 2014-06-30 14:39:46 -04:00
David Baumgold
ded1a752a8 Merge pull request #4210 from bdero/bdero/fix-sysadmin-dashboard-gitlog-timezone 
Make sysadmin dashboard gitlog date timezone-aware
 2014-06-30 14:33:01 -04:00
David Baumgold
b817e02602 Merge pull request #4050 from mtyaka/linkedin-email 
Make LinkedIn auth provider request email by default.
 2014-06-30 14:31:53 -04:00
Calen Pennington
1c882da397 Make Studio able to handle deprecated key formats in urls 2014-06-30 14:29:10 -04:00
Ben McMorran
09908bde4c Merge pull request #4229 from edx/studio/uses-mixed-modulestore-xblock-visibility 
Adds is_xblock_visible_to_students
 2014-06-30 12:00:52 -04:00
Will Daly
46469209b4 Merge pull request #4252 from edx/will/ora2-release-2014-06-30T13.39 
ORA2 release-2014-06-30T13.39
 2014-06-30 10:42:08 -04:00
Waheed Ahmed
cb3355b9e7 Merge pull request #4215 from edx/waheed/lms2892-ie-security-warning-fixed 
Fixed IE security warning on course page.
 2014-06-30 18:49:54 +05:00
Will Daly
f40834fa2f ORA2 release-2014-06-30T13.39; update EASE to bump the NLTK version to 2.0.4 2014-06-30 09:41:55 -04:00
Nimisha Asthagiri
91f102c778 Merge pull request #4232 from edx/nimisha/modulestore-enum-constants 
ModulestoreEnum class.
 2014-06-30 08:58:03 -04:00
Waheed Ahmed
68a0f4e45c Fixed IE security warning on course page. 
LMS-2892
 2014-06-30 13:56:08 +05:00
jsa
994ccd1110 consolidate new post form variants into single client-side template/view 2014-06-29 20:45:22 -04:00
Nimisha Asthagiri
d6049239e7 Merge pull request #4217 from louyihua/master 
Fix saving error of video editor with non-english translations
 2014-06-28 00:42:17 -04:00
Felipe Montoya
8fd3ab07ba If microsites are enabled and it is a microsite request, then take the microsite path for theming 2014-06-27 23:01:29 -05:00
Nimisha Asthagiri
4c717ee35d Merge pull request #4236 from edx/nimisha/fix_ms_merge_conflict_heartbeat 
Fix modulestore merge conflict with heartbeat.
 2014-06-27 22:26:30 -04:00
Nimisha Asthagiri
8dca8053f6 Fix branch settings. 2014-06-27 21:47:53 -04:00
Adam
13f41aea07 Merge pull request #4239 from edx/release 
Release
 2014-06-27 17:04:30 -04:00
Alison Hodges
082bcf765a Numbering issue 2014-06-27 16:58:35 -04:00
Alison Hodges
fae12ac0b2 Merge pull request #4243 from edx/ahodges/documentation/DOC657 
Updated for PR 4106, BLD-1134
 2014-06-27 16:45:56 -04:00
Alison Hodges
b4d2927409 Updated for PR 4106, BLD-1134 2014-06-27 16:45:24 -04:00
Alison Hodges
5d27d77ef1 Merge pull request #4242 from edx/ahodges/documentation/DOC367 
PR 2571, log stop_video event
 2014-06-27 16:34:47 -04:00
Alison Hodges
444973911b PR 2571, log stop_video event 2014-06-27 16:34:21 -04:00
Ben McMorran
397bdb4348 Adds is_xblock_visible_to_students 2014-06-27 14:52:14 -04:00
louyihua
5aaae2ebc4 Change 'Course Name' to 'Course Run' in settings.html 
The code behind uses course run to fill this field, so maybe the filed's name should be changed as well?
 2014-06-28 02:50:09 +08:00
Adam
7b4e806e4a Merge pull request #4233 from edx/alex/geoip-none-ip-fix 
Do not look for country if no new ip.
 2014-06-27 14:41:10 -04:00
Nimisha Asthagiri
eecff6e0aa ModulestoreEnum class. 2014-06-27 14:37:35 -04:00
Alison Hodges
2dc50ab4e9 Merge pull request #4235 from edx/ahodges/documentation/DOC639 
Corrected event name in description
 2014-06-27 14:34:01 -04:00