Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

6923 Commits

Author SHA1 Message Date
David Baumgold
e48e250b1b Merge pull request #10712 from edx/github-capital-h 
GitHub has a capital H
 2015-11-24 09:26:55 -05:00
Ahsan Ulhaq
73eb9bd9df Update help text for Name field in edx registration 
ECOM-2897
 2015-11-24 12:47:42 +05:00
David Baumgold
2e71a66daa GitHub has a capital H 2015-11-23 15:06:33 -05:00
Christine Lytwynec
c6f4afc9c9 Header a.dropdown --> button.dropdown 2015-11-23 13:51:00 -05:00
Amir Qayyum Khan
7bb4980f05 Added auto-enrol and email student check boxes to enrolment tab ccx coach dashboard 2015-11-20 19:22:38 +05:00
Chris Dodge
39295f1941 Add support for microsite overrides (template & configuration) for the ID Verification Status display on the dashboard 2015-11-19 15:53:26 -05:00
Alison Hodges
02b43c05fc Merge pull request #10562 from edx/ahodges/DOC-2390 
Updates the example locations to split format
 2015-11-19 14:55:29 -05:00
muhammad-ammar
8d5f153201 Merge remote-tracking branch 'origin/release' into dj18-release-merge 
Conflicts:
	common/djangoapps/util/testing.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/teams/tests/test_views.py
	openedx/core/djangoapps/programs/models.py
	openedx/core/djangoapps/user_api/accounts/tests/test_views.py
	requirements/edx/github.txt
 2015-11-18 17:53:44 +05:00
Usman Khalid
9c2eb1f04a Merge pull request #10640 from edx/usman/wiki-preview-fix 
Use new django-pipeline tags.
 2015-11-17 15:59:07 +05:00
Usman Khalid
4c608077d7 Use new django-pipeline tags. 2015-11-16 20:57:13 +05:00
Peter Pinch
fd8b757c90 Merge pull request #10250 from mitocw/feature/aq/add_pagination_gradebook 
Added pagination on grade book.
 2015-11-13 12:37:34 -05:00
Matt Drayer
b932a202d8 Merge pull request #10593 from edx/asadiqbal08/SOL-1385 
asadiqbal/SOL-1385 Disable "Generate Certs" button until cert is activated
 2015-11-13 09:15:18 -05:00
asadiqbal
35d04bff89 SOL-1385 2015-11-13 15:23:02 +05:00
David Baumgold
685572cbee Merge pull request #10581 from open-craft/courseware-error-stray-quotemark 
Remove stray quotation mark from courseware-error text.
 2015-11-12 14:58:21 -05:00
Matjaz Gregoric
fc2594e37b Remove stray quotation mark from courseware-error text. 2015-11-11 09:02:50 +01:00
Usman Khalid
6cb62f2697 Rebase upgrade Django to v1.8.5 
Please note that this is a squshed commit and the work of:
Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
 2015-11-10 15:00:19 -05:00
Cliff Dyer
ce99ca63fa Merge pull request #10561 from edx/release 
Verify patched fix merge back into master.
 2015-11-10 14:10:05 -05:00
Amir Qayyum Khan
44b409ebff Added pagination on grade book. 2015-11-10 15:18:15 +05:00
Saleem Latif
094ed32176 Added ability to regenerate certificates from Instructor Dashboard 2015-11-10 15:14:55 +05:00
Alison Hodges
056225e3ac Updates the example locations to split format 2015-11-09 17:26:28 -05:00
Alison Hodges
f475200a16 Revert "Update example location to split style" 
This reverts commit 69b261775e.
 2015-11-09 17:22:00 -05:00
Alison Hodges
69b261775e Update example location to split style 2015-11-09 17:15:08 -05:00
Peter Fogg
7b801c66ca Remove check for course home page improvements. 2015-11-09 14:43:53 -05:00
Mark Sadecki
e5fd2888b8 Merge pull request #10514 from edx/cptvitamin/AC-222 
adds an accessible label to the search input and the search button
 2015-11-05 14:21:12 -05:00
Tasawer
06a91979e1 Added checkout error page. 
ECOM-2516
 2015-11-05 07:26:13 +00:00
Mark Sadecki
16b70a45b8 adds an accessible label to the search input and the search button 2015-11-04 18:09:55 -05:00
Mark Sadecki
aa1281456f Merge pull request #10347 from edx/cptvitamin/TNL-3675 
Fixes invalid/improper microdata and attribute values in the header logo
 2015-11-04 16:18:19 -05:00
Robert Raposa
3682fac832 Add json escaping to Studio 
Make escaping for json simpler and more consistent in Mako templates
- add escape_json_dumps to escape and json.dumps
- add escape_js_str to escape javascript string
- refactor Studio to use escape_json_dumps in Mako templates

TNL-2646: Escape json.dumps
 2015-11-04 13:34:42 -05:00
Eric Fischer
24ee5a68f5 Merge pull request #10490 from edx/release 
Release 4 November 2015 to master
 2015-11-04 13:19:09 -05:00
Amir Qayyum Khan
1f60e9696f Disabled auto enroll in ccx enrollment tab 2015-11-04 11:56:01 +05:00
Mark Sadecki
3be86ca891 Fixes invalid/improper microdata and attribute values in the header logo 2015-11-03 15:20:48 -05:00
Sarina Canelake
1172a49580 Merge pull request #10445 from stvstnfrd/chat 
Remove chat feature
 2015-11-03 11:11:23 -05:00
Matt Drayer
fc77a6eae7 Merge pull request #10363 from edx/saleem-latif/SOL-1315 
SOL-1315: Add Cert Exception UI on Instructor Dash
 2015-11-03 10:09:19 -05:00
Saleem Latif
99bd47e9a8 Add Cert Exception UI on Instructor Dash 2015-11-03 12:52:22 +05:00
stv
3a2c0e37dc Remove chat feature 
This was originally contributed upstream by Stanford, circa 2013.

We neither use nor support this feature in its current implementation,
and in fact, we may never have used this production. Until recently, we
had additional chat/Jabber code [1] (in the form of a Jabber djangoapp in
LMS); context there suggests this feature may have never been more than
a prototype. The original author is no longer on the team, so I can't directly
confirm this on our end.

Do you use this feature?

Stanford had already abandoned this Jabber-backed chat implementation,
in favor of an IRC backend, by the time I joined the team in early 2014.

[1] dbe52a6b13
 2015-11-02 14:08:58 -08:00
Peter Fogg
27be371a2c Merge pull request #10430 from edx/peter-fogg/date-summary-blocks 
Date summary blocks.
 2015-11-02 12:42:36 -05:00
Matjaz Gregoric
3320ecf418 Move unenroll messages into separate data attributes. 
Having the messeges embedded into onclick attributes was fragile because
it could break if the translated string contained special characters
such as single quotes.

Rather than trying to escape the special characters inside the onclick handler,
move the translatable strings into separate h-escaped data attributes and interpolate
the values in the (already existing) jQuery click handler rather than in the
inline onclick handler.

This makes the javascript code more consistent as well as fixes the problem
where the popup would break if translation included single quotes.
 2015-11-02 17:21:28 +01:00
Matjaz Gregoric
1037e6b551 Replace s placeholder with %()s in course listing. 
The string is passed through the JS 'interpolate' function,
which expects %()s style placeholders.
 2015-11-02 17:21:27 +01:00
Peter Fogg
d7417d62cc Date summary blocks on the course home page. 
Enabled behind the
`SelfPacedConfiguration.enable_course_home_improvements` flag.

ECOM-2604
 2015-11-02 10:49:18 -05:00
Sarina Canelake
42c5f2ff8c Merge pull request #10125 from open-craft/smarnach/course-number-class 
Add a class to the course number in the page header to facilitate hiding it in a theme.
 2015-11-02 09:55:30 -05:00
Bill DeRusha
62f3cf9c46 Fix cert_status None bug 2015-11-01 18:16:16 -05:00
Sven Marnach
610a0e0fbb Add a class to course number and name in the page header to facilitate hiding them in a theme. 2015-10-31 13:19:06 +01:00
Ahsan Ulhaq
bab065d825 Reimplemented text changes for dashboard 2015-10-30 23:53:22 +05:00
Christina Roberts
057ab71b7c Merge pull request #10052 from edx/andya/segmentio-performance 
Upgrade segment.io and possibly improve its performance
 2015-10-30 14:10:16 -04:00
Ahsan Ulhaq
c47311b11f Add the html and css and backend changes required for the xseries. 2015-10-30 20:59:26 +05:00
chrisndodge
7868067879 Merge pull request #9744 from edx/cdodge/timed-exams 
Timed Exams
 2015-10-30 11:03:59 -04:00
Matt Drayer
90f1473bfc Merge pull request #10418 from edx/ziafazal/SOL-1340 
SOL-1340: added vertical spacing around issued certificates section
 2015-10-30 10:02:16 -04:00
Andy Armstrong
b66cbe3484 Upgrade segment.io to match documentation. 
May improve performance.
TNL-3538
 2015-10-30 09:24:20 -04:00
Muhammad Shoaib
9476898df0 Add Timed Exams as a feature to edx-platform 2015-10-30 08:44:33 -04:00
Zia Fazal
830b2e0ac5 added vertical spacing 
wrapped issued certificates section with p tags to add some vertical
spacing

changes after feedback from frances

indent code
 2015-10-30 12:01:39 +05:00