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

8873 Commits

Author SHA1 Message Date
lduarte1991
0ca9bfa7e4 Annotation Tools: Added Grouping Plug-In 
- adding comments

 - spacing issues and indentation
 2014-08-06 14:49:40 -04:00
Christina Roberts
540d67a670 Merge pull request #4687 from lduarte1991/lduarte-harvardx-pr16 
TinyMCE Plugin: Added media plugin to TinyMCE for the Annotation tool
 2014-08-06 12:26:46 -04:00
clytwynec
22582f4931 Merge pull request #4634 from edx/clytwynec/removing_remaining_rake_references 
removing rake and  outdated references to it
 2014-08-06 10:20:30 -04:00
Alexander Kryklia
c9ef2f3efa Request IFRAME API every time with https scheme. 2014-08-06 14:59:17 +03:00
Don Mitchell
753c67a73a Merge pull request #4698 from mitocw/cg/fix_student_migration_35 
Correct UnboundLocalError exception in student_migration_35
 2014-08-05 18:26:45 -04:00
jmclaus
9f313fcbdd Merge pull request #4613 from edx/jmclaus/easy-access-group-configurations-page 
BLD 1020: Easy access to Group Configurations page from Content Experiment component.
 2014-08-05 23:45:55 +02:00
lduarte1991
fe009f5989 TinyMCE Plugin: Added media plugin to TinyMCE for the Annotation tool 
- fixed missing media and link buttons on image

 - fixed a CSS issue with the sharing button
 2014-08-05 15:05:56 -04:00
John Jarvis
043d495a90 Merge pull request #4673 from edx/jarv/rsyslog-handler 
Jarv/rsyslog handler
 2014-08-05 14:31:30 -04:00
jmclaus
459c241e3b BLD 1020: Easy access to Group Configurations page from Content Experiment component. 2014-08-05 19:44:21 +02:00
Sarina Canelake
1673448d08 Merge pull request #4518 from lduarte1991/lduarte-harvardx-pr13 
Text Annotation Tool: Safari Colored Highlights Bug Fix
 2014-08-05 13:17:45 -04:00
Sarina Canelake
1184cc063a Merge pull request #4675 from lduarte1991/lduarte-harvardx-pr14 
Annotations Tools: Fixing major Firefox/Tinymce bug in annotations
 2014-08-05 13:16:33 -04:00
chrisndodge
246a431760 Merge pull request #4590 from edx/cdodge/fix-reg-codes 
eCommerce enhancements (pt. 2)
 2014-08-05 13:12:52 -04:00
lduarte1991
a1684d2e64 Text Annotation Tool: Safari Colored Highlights Bug Fix 
- fixed spacing
 2014-08-05 12:04:29 -04:00
Carson Gee
7bb780335d Correct UnboundLocalError exception in student_migration_35 2014-08-05 11:51:49 -04:00
polesye
4f391f664d Update youtube api. 2014-08-05 18:27:55 +03:00
lduarte1991
0b770e1d53 Annotations Tools: Fixing major Firefox/Tinymce bug in annotations 
- fixed issue in Firefox where the init gets called multiple times

 - fixed spacing issues and added more comments

 - fixed indentation, added missing parens in comment, and fixed typo
 2014-08-05 11:22:37 -04:00
Chris Dodge
a1248f614e add more detail to new CourseModesArchive table 2014-08-05 10:00:17 -04:00
asadiqbal08
932010df59 refund message for purchased courses 
Add little more logic for paid courses
 2014-08-05 10:00:16 -04:00
Muhammad Shoaib
33d5b49e81 added course price set/view/edit functionality 
added CoursmodeArchive model to save the old prices history

analytics -> instructor_analytics

analytics -> instructor_analytics
 2014-08-05 10:00:13 -04:00
Christine Lytwynec
eb3c1ab9a8 removing rake and outdated references to it 2014-08-05 09:54:29 -04:00
Diana Huang
ec13aabe97 Fix up tests and enrollment behavior. 2014-08-05 09:32:39 -04:00
Diana Huang
52f9613274 Add an optional description field to course modes. 2014-08-05 09:32:39 -04:00
Diana Huang
3d942503c2 Add the ability to override non-standard verified mode names 2014-08-05 09:32:39 -04:00
Diana Huang
604bfabb88 fixup! Allow verified to be offered without audit 2014-08-05 09:32:39 -04:00
Diana Huang
cfc3b46c5c Allow verified to be offered without audit 2014-08-05 09:32:38 -04:00
Muhammad Ammar
acc8616d0c Fix Video Player Initialisation Issue 2014-08-05 14:04:31 +03:00
lduarte1991
3e99edd665 Annotation Tool: Flagging plugin should now allow instructors to remove flags from annotations 
Annotation Tools: Added lots of comments, fixed spacing, fixed slice issue

Annotation Tools: i18n fixed for this tool

 - fixed Translator to Translators

Annotation Tools: Removed unnecessary class and worked with element object
 2014-08-04 11:44:29 -04:00
John Jarvis
453528f999 updating handlers list to conditionally include syslogger-remote 2014-08-04 11:36:52 -04:00
Gabe Mulley
ce727fc7bd Merge pull request #4566 from mulby/remove-duplicate-context-fields 
Remove duplicated data from legacy events
 2014-08-04 11:36:48 -04:00
John Jarvis
669e31c68e allow rsyslog to be none 2014-08-04 11:31:13 -04:00
Julia Hansbrough
7b1fce9e3f Merge pull request #4641 from edx/reruns/server-side-handlers 
Basic notifications handling.
 2014-08-01 17:30:54 -04:00
Jesse Zoldak
17841fcdd4 Revert "allow rsyslog to be none" 2014-08-01 16:33:07 -04:00
Diana Huang
69f900dd90 Basic notifications handling. 
LMS-11163
 2014-08-01 19:50:37 +00:00
Anton Stupak
1ae5901062 Merge pull request #4606 from edx/anton/remove-group-configurations 
Add possibility to remove group configurations.
 2014-08-01 22:18:35 +03:00
John Jarvis
8d849f8087 allow rsyslog to be none 2014-08-01 13:55:15 -04:00
polesye
27013e74f4 BLD-1049: Remove Group Configurations. 2014-08-01 20:45:23 +03:00
Jason Bau
9c52e5d74d Merge pull request #4585 from edx/jbau/ext-auth-fix-password-complexity 
Allow external_auth registrations to bypass PW complexity check
 2014-08-01 10:43:57 -07:00
Dave St.Germain
eb1d046352 Show the enrollment counts for each mode on the instructor dashboard. 2014-08-01 12:17:36 -04:00
Jesse Zoldak
a0b4f8b6c6 Merge pull request #4643 from edx/zoldak/disable-video-handout-tests 
Disable video handout tests
 2014-08-01 07:14:30 -04:00
Anton Stupak
1ebb4c5304 Merge pull request #4629 from edx/anton/disable-css-animations-in-bok-choy 
Disable css3 animations in bok-choy tests.
 2014-08-01 13:23:05 +03:00
Sarina Canelake
0217ef80d7 Merge pull request #4351 from lduarte1991/lduarte-harvardx-pr8 
Annotation Tool: Bug Fix Filtered Personal Annotations on Page Load
 2014-07-31 20:19:23 -04:00
Jesse Zoldak
49e0d6b5f9 Disable video handout tests 2014-07-31 18:44:25 -04:00
lduarte1991
6a281dd80b Annotation Tools: Spacing Issues fixed for catch.js 2014-07-31 15:44:02 -04:00
lduarte1991
df8d51b9b9 Annotation Tool: Bug Fix Filtered Personal Annotations on Page Load 
- Made sure that all highlights were removed.

- Forgot closing parens

- added comments to fix
 2014-07-31 15:44:02 -04:00
polesye
7217dd460d Disable css3 animations in bok-choy tests. 2014-07-31 21:58:07 +03:00
lduarte1991
98446d1c6d Annotation Tools: Code clean-up, formatting, spacing 2014-07-31 14:48:25 -04:00
lduarte1991
9751244e2e Annotation Tools: Fixed Share button to allow selection of text box 2014-07-31 14:48:25 -04:00
lduarte1991
4ce70630b4 Annotation Tools: Fixing Share Indentation, Grep Functions and Equality 2014-07-31 14:48:25 -04:00
lduarte1991
eace1413b7 Image Annotation Tool: Fixed Viewport Timeout Issue 2014-07-31 14:48:25 -04:00
lduarte1991
e80992cc1e Annotation Tool: Fixing Table Share bug (2b) 2014-07-31 14:48:25 -04:00