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

36339 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Falcone
b7e070e0b9 Switch to using the edxapp-migrate-(lms|cms) tools 
edxapp-migrate-lms figures out at system build time what databases
it needs to migrate (just default, or default + student_module_history).
This avoids paver needing to be clever about figuring out if a user has
enabled the split CSMHE databases flag and permits this to merge early
and safely.

We can turn the CSMHE flag on from configuration at the same time we
enable all of the database config and ensure that the new database is
created.  Until a devstack is provisioned using that version of
configuration, it'll continue to have 1 DB and migrate 1 DB.  This
allows us to better control deployment.
 2016-04-28 10:48:06 -04:00
Robert Raposa
74346430ba Merge pull request #12176 from edx/robrap/linter-javascript 
TNL-4325: Linter Enhancements for JavaScript files
 2016-04-21 09:25:49 -04:00
Ned Batchelder
c669daa917 Merge pull request #12211 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-04-21 09:11:07 -04:00
Mushtaq Ali
2291e2139f Merge pull request #12209 from edx/mushtaq/ora2_release 
ORA2 Version 1.1.4 Release
 2016-04-21 17:50:32 +05:00
Ned Batchelder
2248bc6c9c Update translations (autogenerated message) 2016-04-21 10:30:10 +00:00
Awais Qureshi
a3fcc93374 Merge pull request #12192 from edx/revert-12191-revert-12106-awais786/ECOM-3199-xseries-certs-view 
Revert "Revert "Adding background image for xseries certificates on dashboard side bar panel""
 2016-04-21 11:56:49 +05:00
Mushtaq Ali
8e93c69e6d edx-ora2 release version 1.1.4 update 2016-04-21 11:29:58 +05:00
Robert Raposa
d1bda204e4 Enhance Mako linting 
- Lint JavaScript context for JavaScript violations
- Lint for Mako specific JavaScript rules
- Skip commented lines
- Change unicode to decode.utf8
- Count lint violations
 2016-04-21 01:23:50 -04:00
Robert Raposa
11982461aa Add JavaScript linting rules 
- check proper use of JQuery functions
- check for concatenation with HTML strings
- add sort for output
- lint CoffeeScript
 2016-04-20 16:29:55 -04:00
Kevin Falcone
b6d5c614dd Merge pull request #12074 from edx/derf/clear_existing_assets_before_copying_new_assets 
clear existing assets before copying new assets
 2016-04-20 16:18:54 -04:00
Cliff Dyer
f1c4a44928 Merge pull request #12152 from edx/cdyer/oauth-toolkit-allow-inactive 
Fix django-oauth-toolkit email and inactive user issues
 2016-04-20 14:13:55 -04:00
Muddasser
72c058f2a9 Merge pull request #12146 from edx/muddasser/updated_ff/sel_253/test_youtube_id_w_different_local_server_sub 
fixed button click issue while repacing subtitles.
 2016-04-20 22:45:33 +05:00
Adam
96cbc7c50f Merge pull request #12202 from edx/adam/fix-pre-1900-course-setting-date 
fix issue with pre-1900 course setting dates (TNL-4397)
 2016-04-20 11:38:41 -04:00
Calen Pennington
498f38779a Merge pull request #11810 from CredoReference/making-asides-values-db-driven 
Dynamic values for the selectboxes with tags (tags are stored in the database tables)
 2016-04-20 11:08:41 -04:00
Adam
49173191f8 Merge pull request #12140 from edx/fix-certificate-query 
Fix certificate query
 2016-04-20 10:45:29 -04:00
Adam Palay
26377a5732 fix issue with pre-1900 course setting dates (TNL-4397) 2016-04-20 10:44:13 -04:00
Adam
88192fd444 Revert "Revert "Adding background image for xseries certificates on dashboard side bar panel"" 2016-04-20 19:21:14 +05:00
Dmitry Viskov
1836065754 Dynamic values for the selectboxes with tags (tags are stored in the database tables) 2016-04-20 16:07:32 +03:00
Adam Palay
9a4f80e5c0 update query for whitelisted users who haven't yet had certs run for them 
remove CertificateStatuses.regenerating
 2016-04-20 09:01:49 -04:00
Adam
bb5874d5a1 truncate email from addresses if >320 chars when encoded (TNL-4264) (#12171) 
* truncate email from addresses if >320 chars when encoded (TNL-4264)

* use exact lengths
 2016-04-20 08:43:26 -04:00
Ben Patterson
85453fb059 Merge pull request #12175 from edx/benp/sel-253-ff42-fix-edit-test 
fix flaky condition in education dropdown.
 2016-04-20 08:39:57 -04:00
Adam
95ae255719 fix flaky test for oauth redirects (TNL-4190) (#12187) 2016-04-20 08:39:06 -04:00
Eric Fischer
47e4804b52 Merge pull request #11941 from CredoReference/invalid-order-in-problem-grade-report-csv 
EdX problem grade report doesn't order problems as shown in course
 2016-04-19 18:38:01 -04:00
Jesse Zoldak
15229ce96b Merge pull request #12191 from edx/revert-12106-awais786/ECOM-3199-xseries-certs-view 
Revert "Adding background image for xseries certificates on dashboard side bar panel"
 2016-04-19 11:46:23 -07:00
Jesse Zoldak
270814102f Revert "Adding background image for xseries certificates on dashboard side bar panel" 2016-04-19 13:52:19 -04:00
sanfordstudent
adcf4a98c7 Merge pull request #12038 from edx/sstudent/seq_item_title_ 
Displaying title of item in course sequence tooltip instead of list of item's children
 2016-04-19 13:32:34 -04:00
Calen Pennington
b2dace8069 Merge pull request #11808 from CredoReference/adapt-asides-to-be-exported-to-xml 
Adaptation asides to be exported to the XML
 2016-04-19 11:31:41 -04:00
Renzo Lucioni
c643bdf719 Merge pull request #12173 from edx/renzo/upgrade-management-commands 
Upgrade edx-management-commands to 0.1.1
 2016-04-19 11:05:49 -04:00
Sanford Student
bbcec0cf40 displaying title of sequence item in tooltip instead of children 2016-04-19 10:28:47 -04:00
Ayub khan
0becea942f Merge pull request #12144 from Ayub-Khan/SUST-35-course_key_from_string_or_404 
SUST-35 Implementation of course_key_from_string_or_404 to return course_key or raise a 404
 2016-04-19 18:44:13 +05:00
Adam
e896359846 fix flaky oauth test (#12168) 2016-04-19 09:09:35 -04:00
Ayub-khan
66f52ba6e9 -fixed Tests. 2016-04-19 16:04:39 +05:00
Awais Qureshi
298770e51b Merge pull request #12106 from edx/awais786/ECOM-3199-xseries-certs-view 
Adding background image for xseries certificates on dashboard side bar panel
 2016-04-18 16:22:11 +05:00
tasawernawaz
75c0ec6149 Merge pull request #12178 from edx/tasawer/story/ecom-3201-handle-empty-list-of-courses-and-programs 
Updated dashboard UI for empty list of courses and programs
 2016-04-18 15:55:30 +05:00
tasawernawaz
b4e1e97185 ECOM-3201 
Updated dashboard UI for empty list of courses and programs
 2016-04-18 08:48:21 +00:00
Awais
54058f6e58 Adding background image for xseries certificates on programs dashboard side bar panel. 
ECOM-3199
 2016-04-18 12:50:08 +05:00
Ayub-khan
9e3f68c0a0 -Addressed wrong course id comment. 2016-04-18 12:03:46 +05:00
Ayub-khan
e687f1e754 -Adressed all comments 2016-04-18 11:57:31 +05:00
attiyaIshaque
717c36bdd4 Merge pull request #12133 from edx/atiya/TNL-4376-course-export-page 
Course export page will not be opened for course id that does not bel…
 2016-04-18 10:16:13 +05:00
attiyaishaque
4c15dd93ba Course export page will not be opened for course id that does not belong to any course. 2016-04-18 09:12:40 +05:00
Dmitry Viskov
0e7a837e11 The problem Grade Report (from the Data Downloads page) must show the problems in the order they occur within the course. 2016-04-17 02:45:02 +03:00
Robert Raposa
069e884fdd Merge pull request #12129 from edx/robrap/linter-mako 
TNL-4324: Add check for HTML entities
 2016-04-16 12:36:03 -04:00
Robert Raposa
14abf32b4b Add check for HTML entities 2016-04-16 15:24:56 +00:00
Dmitry Viskov
0151a149b0 Asides can be exported with the rest of courseware through the Export function within CMS 2016-04-16 03:48:23 +03:00
Ben Patterson
1d57b498be fix flaky condition in education dropdown. 2016-04-15 18:49:44 -04:00
Renzo Lucioni
8304c96808 Upgrade edx-management-commands to 0.1.1 2016-04-15 17:43:56 -04:00
Renzo Lucioni
a406a221b0 Merge pull request #12170 from edx/renzo/program-listing-bokchoy 
Acceptance tests for program listing page
 2016-04-15 17:24:21 -04:00
Renzo Lucioni
182e34f893 Acceptance tests for program listing page 
Includes a11y coverage. ECOM-3980.
 2016-04-15 16:06:41 -04:00
Fred Smith
3664851017 make tests pass by creating staticfiles directories 2016-04-15 13:11:24 -04:00
Adam
98b8b68d40 Revert "Updated dashboard UI for empty list of courses and programs" (#12166) 2016-04-15 12:46:21 -04:00