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

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
6cb55e1a36 Stringify ObjectIds before attempting to make a filename out of them 2015-01-28 18:23:22 -05:00
Calen Pennington
1160306438 Replace SplitMongo thread_cache usage with use of request_cache 2015-01-28 18:23:22 -05:00
Greg Price
ef8843ab1a Fix bugs in CSV download of video upload data 
This fixes two bugs:
1. All statuses were listed as "Unknown"
2. Non-ASCII characters in a header column translation resulted in a 500
 2015-01-28 18:23:22 -05:00
David Baumgold
d00c3d0deb Tender is only accessible via HTTP, not HTTPS 2015-01-28 18:23:22 -05:00
Jonathan Piacenti
ed20d5a136 Inverted boolean for rendering in CheckVisible. 2015-01-28 22:58:56 +00:00
Jonathan Piacenti
bd57d56bdd Add classes to group of elements for cohort selector. 
Retriggring Jenkins build
 2015-01-28 22:51:46 +00:00
Matt Drayer
9d2a0a4e9d Merge pull request #6705 from edx/mattdrayer/update-milestones-hash 
Bok Choy test now passes
 2015-01-28 17:38:18 -05:00
Matt Drayer
e5f00e626a Bok Choy test now passes 2015-01-28 17:37:49 -05:00
Will Daly
b467ae8cde Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS" 
This reverts commit b8184d188f.
 2015-01-28 17:26:46 -05:00
Christine Lytwynec
1f17fe1203 Add cov_args and extra_args to python unittest commands 2015-01-28 17:10:06 -05:00
Matt Drayer
dc0816669d Merge pull request #6792 from edx/ziafazal/make-course-requirements-links 
make course requirement as link
 2015-01-28 16:56:35 -05:00
Matt Drayer
40d109e981 Merge pull request #6718 from edx/mattdrayer/hide-isentexam-field 
Added 'is_entrance_exam' to FILTERED_LIST plus a new bokchoy test
 2015-01-28 16:52:20 -05:00
Sarina Canelake
b2330c3739 Update byte-sized bugs filter link 2015-01-28 16:43:55 -05:00
Sarina Canelake
0f0b2cbd49 Merge pull request #6801 from edx/sarina/update-dummy-command 
Update "paver i18n_dummy" to compile assets
 2015-01-28 16:31:41 -05:00
Christine Lytwynec
739322d469 Merge pull request #6780 from edx/clytwynec/update_bokchoy_version 
updating bokchoy version
 2015-01-28 16:30:51 -05:00
Renzo Lucioni
64d0c00e76 Merge pull request #6800 from edx/renzo/redeem-code-conflict-copy 
Change instances of 'register' to 'enroll'
 2015-01-28 15:59:09 -05:00
Adam Palay
bfb173507c fix settings page not handling unicode (TNL-1237) 2015-01-28 15:55:45 -05:00
Sarina Canelake
88fdf5f641 Update "paver i18n_dummy" to compile assets 2015-01-28 15:13:29 -05:00
Renzo Lucioni
3f8ca96f02 Change instances of 'register' to 'enroll' 2015-01-28 14:37:26 -05:00
AlasdairSwan
753a3be75e Merge pull request #6799 from edx/jsa/reuse-osfs 
reuse instances of OSFS in old mongo
 2015-01-28 13:54:16 -05:00
Matt Drayer
ce5c7948fa Added field to FILTERED_LIST plus a new bokchoy test 2015-01-28 13:11:36 -05:00
jsa
513f8cefd8 reuse instances of OSFS in old mongo 2015-01-28 12:45:49 -05:00
Mark Sadecki
dce62ed600 Merge pull request #6783 from edx/cptvitamin/TNL-1264-Skip-to-main-content 
[TNL-1264] changes the skip link text to the industry standard Skip to main content
 2015-01-28 12:12:20 -05:00
AlasdairSwan
9273ee0c72 Merge pull request #6795 from edx/adam/revert-tolerance-fix 
Revert "Fix tolerance broken"
Bok Choy test failure is a known flaky test
 2015-01-28 11:52:24 -05:00
muzaffaryousaf
7b10d14f5d Adding 'user_is_staff' filed to opt_attrs in xblock user. 
TNL-1185
 2015-01-28 21:37:25 +05:00
Mark Sadecki
8cffa152d8 changes the skip link text to the industry standard Skip to main content 2015-01-28 11:07:10 -05:00
Adam Palay
e20b77b4f8 Revert "Fix tolerance broken" 
This reverts commit 66b949b745.
 2015-01-28 10:21:01 -05:00
Anton Stupak
f1fbd0f969 Merge pull request #6789 from edx/anton/edxnotes-fix-tests 
Fix unit tests.
 2015-01-28 16:32:10 +02:00
Chris
e871df555f Merge pull request #6575 from edx/clrux/xuetangx-branding-update 
Video player branding addition for XuetangX
 2015-01-28 09:09:21 -05:00
Chris Rodriguez
9e2494b21d Video player branding addition for XuetangX 2015-01-28 06:39:21 -05:00
muzaffaryousaf
2189ef7c50 Fixing the library tests. 
TNL-836
 2015-01-28 15:01:40 +05:00
Waheed Ahmed
8fb739ee32 Merge pull request #6746 from edx/waheed/tnl935-fix-BOM-in-transcript 
Fixed transcript skip first line if it contains BOM(Byte Order Mark).
 2015-01-28 14:37:21 +05:00
Zia Fazal
ba5fd98aaf make course requirement as link 2015-01-28 14:26:27 +05:00
muzaffaryousaf
4d72910060 Adding get_anonymous_user_id in Xblock 'user' service. 
TNL-836
 2015-01-28 12:47:49 +05:00
polesye
689d7bc8a1 Fix unit tests. 2015-01-28 09:29:02 +02:00
Waheed Ahmed
4ac7b55757 Fixed transcript skip first line if it contains BOM(Byte Order Mark). 
TNL-935
 2015-01-28 12:26:16 +05:00
chrisndodge
5364ccf1c5 Merge pull request #6755 from edx/muhhshoaib/removing-extra-condition-from-pdf-file 
removed the is_invoice condition from the pdf file
 2015-01-28 00:06:14 -05:00
Piotr Mitros
b9b5e05d10 Merge pull request #6773 from edx/danielli/recommender_code_review 
Fix recommenders' bugs: initialization, syntax error, and the incompatibility of the underscore library
 2015-01-27 21:32:02 -05:00
Giulio Gratta
c18ee8cc09 Add cosmetic price field to studio & logic 
- Price field added to Advanced Settings
- Function that decides which price to display
- Test added to check that the function outputs correct price
- Added feature flag and conditional to decide whether to display course price or not
- Feature Flag to show or hide course price on Course About page sidebar when not using shopping cart
 2015-01-27 15:15:43 -08:00
Andy Armstrong
6201af652b Merge pull request #6765 from edx/andya/requirejs-in-lms 
Add RequireJS to the LMS
 2015-01-27 17:57:33 -05:00
Will Daly
b8184d188f Add RequireJS and RequireJS Optimizer configuration to the LMS 
[second attempt which addresses bug building Studio]
 2015-01-27 17:56:29 -05:00
swdanielli
dbec1d6fc7 Fix recommenders' bugs: template_lookup initialization, syntax error, and the incompatibility of the underscore library 2015-01-27 15:47:52 -05:00
Greg Price
3d8fe614e7 Merge pull request #6768 from edx/gprice/fix-video-upload-csv-bugs 
Fix bugs in CSV download of video upload data
 2015-01-27 15:06:28 -05:00
Calen Pennington
9f872d3904 Merge pull request #6779 from edx/cpennington/split-use-request-cache 
Cpennington/split use request cache
 2015-01-27 15:03:03 -05:00
David Baumgold
f6d0918555 Merge pull request #6441 from edx/db/update-pillow 
Update Pillow to 2.7.0
 2015-01-27 14:59:45 -05:00
Anton Stupak
838569d19b Merge pull request #6692 from edx/anton/edxnotes-fix-text-line-breaks 
TNL-1078: Lines don't break correctly in Student Notes.
 2015-01-27 20:49:23 +02:00
stephensanchez
fbbe307f17 Small css changes to the ecommerce tab 2015-01-27 18:47:16 +00:00
Renzo Lucioni
bcf6461e0b Merge pull request #6769 from edx/renzo/fix-flaky-bok-choy-tests 
Fix intermittent failures in bok-choy tests of payment and verification
 2015-01-27 13:32:10 -05:00
stephensanchez
5788a74291 Fix ecommerce test for text changes. 2015-01-27 18:13:36 +00:00
Sarina Canelake
9dece9790d Merge pull request #6781 from mitocw/bugfix/cg/gitlog_unicode 
Add missing sysadmin dashboard unicode cast
 2015-01-27 13:12:42 -05:00