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

28764 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Awais
1e53a79705 ECOM-985 fixing the 'NoneType' object has no attribute 'profile'. 2015-02-25 10:10:16 +00:00
Clinton Blackburn
6f7a06657f Merge pull request #7089 from edx/clintonb/cs-api-fix 
Fixed Course List Endpoint
 2015-02-24 16:24:22 -05:00
Martyn James
8acdf532fc Merge pull request #7066 from edx/dcikatic/SOL-259 
SOL-259 Change HTML content listed type in index from HTML Content to Te...
 2015-02-24 16:06:48 -05:00
Martyn James
d879905758 Merge pull request #6914 from edx/dcikatic/courseware_search_index_DRF 
Changing search_reindex call to be more inline with DRF convention
 2015-02-24 16:06:16 -05:00
David Baumgold
3a9a7961ba Merge pull request #7093 from edx/pylint-6k 
Pylint violations are below 6000
 2015-02-24 15:14:34 -05:00
Clinton Blackburn
0385a8b504 Fixed Course List Endpoint 
Updated filter to ensure only course descriptors are returned.
 2015-02-24 14:42:47 -05:00
David Baumgold
a1fc25b848 Pylint violations are below 6000 2015-02-24 13:14:55 -05:00
Ned Batchelder
d8a4529433 Merge pull request #7088 from edx/ned/move-docs-to-docs 
Move internal documentation to the internal documentation directory
 2015-02-24 12:03:54 -05:00
David Baumgold
3b06d71198 Merge pull request #7078 from edx/db/upgrade-pip 
Use pip 6.0.8
 2015-02-24 11:03:56 -05:00
Dino Cikatic
b597df2e39 Changing search_reindex call to be more inline with DRF convention 2015-02-24 10:58:50 -05:00
Ned Batchelder
1b7e8b784a Move internal documentation to the internal documentation directory 2015-02-24 10:55:16 -05:00
Ned Batchelder
a76e5c68cb Merge pull request #7083 from edx/ned/readme-rst 
Convert README.md to README.rst
 2015-02-24 10:52:00 -05:00
Ben Patterson
954d8ed9a0 Merge pull request #7070 from edx/benp/fix-tnl1479 
Wait for DOM to reflect the selected option.
 2015-02-24 10:49:47 -05:00
Adam
0b9e5719c1 Merge pull request #7080 from edx/adam/merge-release-into-master 
Adam/merge release into master
 2015-02-24 06:40:10 -08:00
Nimisha Asthagiri
b280e44fe1 Merge pull request #7025 from edx/mobile/oauth2-allow-inactive-user 
MA-291 Allow API access without email activation.
 2015-02-24 09:12:30 -05:00
Ben Patterson
8e7c17d50f Wait for DOM to reflect the selected option. 
TNL-1479
 2015-02-24 08:24:39 -05:00
Adam Palay
338ab4a6a9 fix quality violation 2015-02-24 08:20:04 -05:00
Ned Batchelder
0b41d0f226 Convert README.md to README.rst 2015-02-24 07:03:43 -05:00
Nimisha Asthagiri
83a3adb97b MA-291 Allow API access without email activation 2015-02-24 06:05:18 -05:00
Adam Palay
3aca0d5472 Merge remote-tracking branch 'origin/release' into adam/merge-release-into-master 
Conflicts:
	common/djangoapps/student/models.py
	lms/djangoapps/bulk_email/tasks.py
 2015-02-23 18:40:45 -05:00
Matt Drayer
9856deedba Merge pull request #6668 from edx/ziafazal/entrance-exam-management-on-instructor-dashboard-am 
Ziafazal/entrance exam management on instructor dashboard
 2015-02-23 16:29:09 -05:00
Adam
320d481250 Merge pull request #7072 from edx/hotfix/2015-02-23 
split up bulk email query for students and unenrolled course staff (TNL-...
 2015-02-23 13:17:26 -08:00
Zia Fazal
b3f85e1d4a Instructor Dashboard management tools for Entrance Exams 
Conflicts:
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/instructor_task/api.py

refined entrance exam student attempts reset
added rescore, delete state and task history functionality
 2015-02-23 15:04:05 -05:00
David Baumgold
310a60ee8f Use pip 6.0.8 2015-02-23 14:51:04 -05:00
Will Daly
80ae71765d Merge pull request #7071 from edx/will/ecom-1108 
Preserve enrollment_action and course_id querystring params in header 'Sign In' button
 2015-02-23 14:08:56 -05:00
Sarina Canelake
169175b7b2 Merge pull request #7074 from edx/sarina/20150223-translations-update 
Update translations (autogenerated message)
 2015-02-23 13:54:31 -05:00
Sarina Canelake
40745c2899 Update translations (autogenerated message) 2015-02-23 13:53:13 -05:00
Will Daly
94daf078ea Merge pull request #7073 from edx/will/linkedin-margin-fix 
Fix right margin of LinkedIn add-to-profile button
 2015-02-23 13:43:29 -05:00
Will Daly
1d985b9154 Fix right margin of LinkedIn add-to-profile button 2015-02-23 13:37:09 -05:00
Will Daly
000cfa78cb Merge pull request #7040 from edx/will/finish-linkedin 
Finish LinkedIn button
 2015-02-23 12:37:34 -05:00
Will Daly
f854726efc Add tracking code to LinkedIn URL. 
Add client-side analytics event for LinkedIn Add to Profile button click.

Add management command for generating certs for testing.

Update styling of the certificate messages.
 2015-02-23 11:52:47 -05:00
Will Daly
368554754b Make the linked in configuration migration backwards compatible 2015-02-23 11:40:41 -05:00
Will Daly
badcb78ac9 Force English for email opt in text appearing on the marketing site 2015-02-23 11:40:41 -05:00
Syed Hassan Raza
cfb2df113d python standard logging 2015-02-23 11:40:41 -05:00
Calen Pennington
b9c9a58aac Bump MongoDBProxy to handle AutoReconnect during find_one 2015-02-23 11:40:40 -05:00
John Eskew
d3e2cb0fac Merge pull request #7027 from edx/jeskew/defn_loading_perf_problems 
Rollback override of lazy definition loading for large courses.
 2015-02-23 11:15:44 -05:00
Will Daly
0f17d8c99e Preserve enrollment_action and course_id querystring params in header 'Sign In' button 2015-02-23 11:12:06 -05:00
Akiva Leffert
906f3474bb Merge pull request #7057 from edx/aleffert/existing-enrollment-success 
Convert enrollment already exists errors to success.
 2015-02-23 11:08:33 -05:00
Adam Palay
c12b542136 split up bulk email query for students and unenrolled course staff (TNL-1332) (TNL-1143) 2015-02-23 10:58:37 -05:00
Anton Stupak
767324dddb Merge pull request #6744 from edx/anton/edxnotes-caret-navigation 
TNL-716: Add possibility for notes creation via keyboard.
 2015-02-23 17:55:12 +02:00
Will Daly
0f19d1fcb5 Merge pull request #7067 from edx/will/query-count-middleware 
Include middleware database queries in Django debug toolbar
 2015-02-23 10:46:09 -05:00
John Eskew
4e7ed93b3e Rollback eager definition loading. 
Pass 'lazy' parameter down properly into low-level definition caching.
Adjust mongo call numbers in tests and add missing bulk_op wrapper.
Avoids the loading of all definitions in a large course when only
specific, filtered definitions are needed to be loaded for an endpoint.
 2015-02-23 10:33:43 -05:00
ahsan-ul-haq
a02101bd99 Merge pull request #6928 from edx/ahsan/tnl-944-calculator-UI-difficult-access 
Calculator UI difficulit to access
 2015-02-23 19:42:04 +05:00
Will Daly
4c252d5fce Include middleware database queries in Django debug toolbar 2015-02-23 09:17:17 -05:00
Jesse Zoldak
c72cc5dcba Merge pull request #7062 from edx/benp/cohort-mgmt-flaky 
Flakiness fix for cohort group selection TNL-1479
 2015-02-23 08:06:29 -05:00
Dino Cikatic
a643397275 SOL-259 Change HTML content listed type in index from HTML Content to Text 2015-02-23 13:30:14 +01:00
Ahsan Ulhaq
6536ab8452 change the description for ambiguous tests 2015-02-23 17:02:03 +05:00
Ben Patterson
d7cbe46994 Flakiness fix for cohort group selection. 2015-02-23 06:28:25 -05:00
ahsan-ul-haq
de64bfa0f1 Merge pull request #6956 from edx/ahsan/tnl-1382-css-background-used-home-link 
CSS Background Image used for important link
 2015-02-23 15:41:36 +05:00
Awais Qureshi
e5039b8c24 Merge pull request #7001 from edx/awais786/ECOM-1046-add-cert-btn 
Awais786/ecom 1046 add cert btn
 2015-02-23 12:11:12 +05:00