Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
34,644 Commits 1 Branch 0 Tags
3d30bb11abaa5b95dddc0ddf7204c495fcf58b97
Commit Graph

13128 Commits

Author SHA1 Message Date
Matt Drayer
4d7be021e5 Merge pull request #11140 from edx/saleem-latif/SOL-1431 
SOL-1431: Remove no-op translations from devstack.py
 2016-01-07 10:40:20 -05:00
Matt Drayer
b7b8c745d6 Merge pull request #11139 from edx/asadiqbal08/WL-242 
asadiqbal08/WL-242 - Marked strings on shopping cart pages for translations
 2016-01-07 10:32:40 -05:00
Piotr Mitros
e87fabe45e Merge pull request #8289 from edx/danielli/pyfs_xblocks 
Add setting for pyfs xblock service to devstack.py
 2016-01-06 17:21:30 -05:00
Adam
4c5c8c18a3 Merge pull request #10648 from OmarIthawi/edraak/calculator-fixups 
Calculator layout and help popup fixes
 2016-01-06 15:32:58 -05:00
Matt Drayer
083ff7f0ef Merge pull request #11150 from edx/release 
2016-01-06 Release
 2016-01-06 13:51:49 -05:00
Omar Al-Ithawi
e21505b76a Fixed issues in the calculator help 
- Corrected the direction of the English equations
  - TNL-3798: Removed the greek letters
  - The equal (=) button is now the default submit button in the calculator, instead of the help button
  - TNL-3798: Removed the subscript note
  - Added some comments for the translators in the calculator
  - Using `fixed` position for the calculator for best mobile/desktop look
 2016-01-06 17:52:44 +02:00
swdanielli
ac66b4a8cd Add setting for pyfs xblock service 2016-01-05 23:09:09 +00:00
Nimisha Asthagiri
59605159b4 Course Blocks API: support for all blocks when no username 2016-01-05 15:06:55 -05:00
Kelketek
7af7553175 Merge pull request #10413 from edx/register-dropdown 
Add custom fields to registration menu.
 2016-01-05 13:44:11 -06:00
Toby Lawrence
56fe511a81 Merge pull request #11025 from edx/PERF-224 
[PERF-224] Serve course assets from a CDN
 2016-01-05 13:40:54 -05:00
Jonathan Piacenti
acc0161c0f Add custom registration form extension feature. 2016-01-05 10:14:28 -06:00
Toby Lawrence
77343df0d9 [PERF-224] Support to serve static assets from a CDN. 
A base URL can now be configured which is, potentially, prepended to an
asset URL.  This allows a CDN, or caching server, to front static asset
requests, taking load off of the contentstore and speeding up page load
times.

Asset URL generation respects locked vs unlocked assets, and will not
generate links to locked assets that would traverse a CDN (even though
the authorization component of the contentserver middleware wouldn't
allow those links to work anyways).
 2016-01-05 10:24:44 -05:00
Christine Lytwynec
b1e31c133f Merge pull request #11098 from edx/clytwynec/ac-303 
remove aria-hidden from staff lms controls
 2016-01-05 10:09:21 -05:00
Douglas Hall
e7dc6fcfe5 Rolling back template inheritance change that was causing child templates to break 2016-01-05 09:40:34 -05:00
Ayub-Khan
96e64464b5 -fix TNL-3556 Instructor tool "View as Specific Student" doesn't work on the course updates page. 
-Added test for TNL-3556.
 2016-01-05 17:50:23 +05:00
asadiqbal
47827ecb6f WL-242 2016-01-05 14:25:22 +05:00
Saleem Latif
e3edb4e9f5 remove no-op translations from devstack.py 2016-01-05 13:33:51 +05:00
Carol Tong
e7dab0dfbb Merge pull request #11126 from edx/carol/doc/cohort_help_target 
Fix cohort doc help targets in Instructor Dashboard
 2016-01-04 17:02:31 -05:00
Carol Tong
0f3da297f6 Fix help targets in Instructor Dashboard 2016-01-04 15:20:40 -05:00
David Baumgold
c6ed893df9 Merge pull request #11109 from ovnicraft/patch-1 
Remove duplicate import
 2016-01-04 14:36:58 -05:00
Peter Fogg
c0fa05e2ae Merge pull request #11107 from edx/peter-fogg/enrollment-support-email 
Allow searching enrollments by email as well as username.
 2016-01-04 12:57:36 -05:00
Arbab Nazar
8576a180b5 Merge pull request #11114 from edx/arbab/devops-3388 
DEVOPS-3388 Remove unused setting from edxapp configuration
 2016-01-04 21:21:12 +05:00
Matt Drayer
2c1680a9cb Merge pull request #11080 from edx/saleem-latif/SOL-1529 
SOL-1529: Allow PMs to Invalidate Certificates
 2016-01-04 10:46:27 -05:00
Saleem Latif
9aa0a01cae Allow PMs to Invalidate Certificates 2016-01-04 14:28:32 +05:00
arbabnazar
49d8ec3543 DEVOPS-3388 Remove unused setting from edxapp configuration 2016-01-01 12:50:42 +05:00
Cristian Salamea
c7c542d7da Remove duplicate import 2015-12-30 21:51:14 -05:00
Peter Fogg
b96a8bf6ff Allow searching enrollments by email as well as username. 
This brings the enrollment support tool's UI in line with the other
support tools.
 2015-12-30 16:53:31 -05:00
Peter Fogg
51a89cab29 Merge pull request #11102 from edx/peter-fogg/active-email-text-change 
Add mailing address to activation email form.
 2015-12-30 15:19:32 -05:00
Peter Fogg
238968c3cd Add mailing address to activation email form. 
ECOM-3318
 2015-12-30 13:30:43 -05:00
Peter Fogg
69432015f3 Allow removing upgrade deadlines through the Commerce API. 2015-12-30 12:22:22 -05:00
Peter Fogg
45bff268ae Allow removing a verification deadline through the Commerce API. 
ECOM-3268
 2015-12-30 11:25:52 -05:00
Christine Lytwynec
c2e325020f remove aria-hidden from staff lms controls 2015-12-30 11:11:36 -05:00
Peter Fogg
d2392b451f Merge pull request #11089 from edx/peter-fogg/update-account-settings-name-label 
Update name label on account settings page.
 2015-12-30 09:49:10 -05:00
Christine Lytwynec
00b1e2155b Merge pull request #11090 from edx/clytwynec/ac-250 
add sr text for show/hide answer button
 2015-12-30 09:28:30 -05:00
Christine Lytwynec
bb329c7b6f add sr text for show/hide answer button 2015-12-29 17:03:32 -05:00
Peter Fogg
bd50186fb9 Update name label on account settings page. 
ECOM-3130
 2015-12-29 16:19:22 -05:00
aamir-khan
3fbdebcd30 ECOM-3107: Updated the progress page to not display the eligibility if user is not enrolled as credit mode 2015-12-29 17:34:34 +05:00
Nimisha Asthagiri
a00c2a7c47 Course API: Change field name from course_id to id 2015-12-28 16:24:54 -05:00
Nimisha Asthagiri
6bbc46b1b5 Merge pull request #11049 from edx/mobile/catalog-api-overview-field 
Update Course Catalog API to support About Overview field
 2015-12-28 16:09:15 -05:00
Nimisha Asthagiri
3d84e29218 Update Course Catalog API to include About Overview field. 2015-12-28 15:03:22 -05:00
Chris Dodge
0b4f3599b3 Apply patch from hasnain-naveed/HOL-4-navigation-template-change in order to get a Jenkins build running 2015-12-27 19:18:07 -05:00
Nimisha Asthagiri
44abf7a9a2 Performance enhancement in see_exists: reverse order of checks 2015-12-23 16:40:38 -05:00
Nimisha Asthagiri
8e3f4e058d Update Course Catalog API to support filters 2015-12-23 12:31:31 -05:00
Robert Raposa
5e69224c32 Deprecate escaping in display_name_with_default 
- Remove escaping in display_name_with_default
- Move escaped version to deprecated display_name_with_default_escaped
- Does not include any other changes to remove double-escaping

Thanks to agaylard who initiated this work:
https://github.com/edx/edx-platform/pull/10756

TNL-3425
 2015-12-22 11:52:04 -05:00
Peter Fogg
72ed155c8a Merge pull request #11046 from edx/merge-release-into-master 
Merge release into master
 2015-12-22 09:11:43 -05:00
Peter Desjardins
2bf25b2f51 Merge pull request #11043 from edx/pdesjardins/DOC-2543-b 
Edit text strings in default template for web certificates to make them more generally applicable
 2015-12-22 08:56:57 -05:00
Usman Khalid
5e972b2a66 Merge pull request #11022 from edx/bookmarking 
Bookmarking
 2015-12-22 18:25:48 +05:00
Usman Khalid
a93ef10f8c Merge pull request #11016 from edx/ekafeel/bookmarks-limit 
Limit the number of bookmarks a learner can add in a course
 2015-12-22 11:52:17 +05:00
Saleem Latif
3967d8093d Move get_logo_url from branding/__init__.py to branding/api.py for consistency. 2015-12-22 11:50:16 +05:00
Saleem Latif
475429c0a6 Web Certificates: Platform Branding integration 2015-12-22 11:50:15 +05:00