Commit Graph

417 Commits

Author SHA1 Message Date
Waqas Khalid
4834e51aca Mathjax should be used after complete loading
Student couldn't able to submit his answer in ie9
becuase mathjax was used before its complete loading
thats cuase the problem. Mathjax operations should be
handled synchronously inorder to avoid error.

BLD-1199
2014-09-05 17:19:48 +05:00
Julia Hansbrough
c7d4183310 Merge pull request #4915 from edx/flowerhack/redo-third-party
Facebook auth support.
2014-08-30 02:50:57 -04:00
Julia Hansbrough
fd925e8970 Add server-side analytics logging for login
Also, removed the client-side analytics for logging in.
Ensures that analytics are collected for third-party-auth logins.
Fixed failing tests related to third-party-auth.
2014-08-29 19:49:42 +00:00
Daniel Friedman
a01e57ee71 Improve test coverage for course groups 2014-08-28 17:07:22 -04:00
Don Mitchell
49ed732824 JS regex's need to escape special chars
LMS-11260
2014-08-25 18:07:37 -04:00
Waqas Khalid
01aa38fb82 Truncated markup can be displayed in forums user profile view
FOR-581
2014-08-20 14:33:23 +05:00
David Baumgold
2e02cefc90 Update comments to point to openedx.atlassian.net
And whitespace corrections (automatically made by my editor, and I'm too lazy
to remove them)
2014-08-18 15:34:06 -04:00
Sarina Canelake
76516f52b8 Merge pull request #4796 from lduarte1991/lduarte-harvardx-pr18
Annotation Tools: Fixing implicit typecasting and reordering plugins
2014-08-13 20:38:09 -04:00
lduarte1991
63f1d9834d - replaced tabs with 4 spaces
- fixed spaces after commas, if conditions, braces, operators
 - fixed some typecasting issues as well

 - added missing semicolons
2014-08-13 11:46:46 -04:00
lduarte1991
7114b25a40 Annotation Tools: Explicit typecasting === changes and reorganizing plugins 2014-08-11 17:01:15 -04:00
lduarte1991
71e9f4488b Annotator Tools: Fix major logic bug in code 2014-08-08 14:56:21 -04:00
polesye
37c3a50ffa Add tooltip manager in Studio. 2014-08-08 16:31:14 +03:00
lduarte1991
c9e51b9956 Annotation Tools: Adding Loading Bar to Annotations Table
- added label below loading gif

 - fixed spacing issues

  - change the error messages in annotator code
2014-08-07 11:47:05 -04:00
lduarte1991
0ca9bfa7e4 Annotation Tools: Added Grouping Plug-In
- adding comments

 - spacing issues and indentation
2014-08-06 14:49:40 -04: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
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
lduarte1991
a1684d2e64 Text Annotation Tool: Safari Colored Highlights Bug Fix
- fixed spacing
2014-08-05 12:04:29 -04: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
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
Dave St.Germain
eb1d046352 Show the enrollment counts for each mode on the instructor dashboard. 2014-08-01 12:17:36 -04: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
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
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
lduarte1991
28f5ed1cf9 Annotations Tools: Sharing Plugin Fixed with Proper URI 2014-07-31 14:48:25 -04:00
Renzo Lucioni
3599e2eec7 Revert "Revert "Merge pull request #4545 from edx/renzo/bi-analytics-overhaul""
This reverts commit 079808ee47.
2014-07-30 17:01:52 -04:00
Julia Hansbrough
14dc3ce853 Merge branch 'release' 2014-07-30 19:35:51 +00:00
jmclaus
58ca939ba6 Merge pull request #4292 from terman/jsinput
Supply initial_state attribute for jsinput tag
2014-07-30 16:56:45 +02:00
Julia Hansbrough
079808ee47 Revert "Merge pull request #4545 from edx/renzo/bi-analytics-overhaul"
This reverts commit 252038c376, reversing
changes made to 7caf8c53b1.
2014-07-29 17:41:46 +00:00
Renzo Lucioni
252038c376 Merge pull request #4545 from edx/renzo/bi-analytics-overhaul
Overhaul Segment.io integration
2014-07-28 11:59:58 -04:00
Renzo Lucioni
8bd84b5f3a Overhaul Segment.io integration 2014-07-28 11:08:02 -04:00
Chris Terman
d3149f66aa add initial_state attribute to jsinput tag 2014-07-23 09:21:42 -04:00
louyihua
7f1c784629 Add defininition of window.location.origin in both CMS/LMS
The same bug in studio was fixed in #3893, and as TinyMCE is also used in LMS, it should be also fixed in LMS.
Here a common javascript file called 'ie_shim.js' is added, so that in the future it can be used for other IE compatibility purposes too.
2014-07-15 11:34:52 +08:00
lduarte1991
a5d8669f68 Annotation Tool: Removed conflict between tags-annotator and flagging-annotator 2014-07-10 11:20:29 -04:00
Waheed Ahmed
68a0f4e45c Fixed IE security warning on course page.
LMS-2892
2014-06-30 13:56:08 +05:00
lduarte1991
cd9c6c5f3e Annotations Tools: Commented OSDA code and added clarification to catch changes 2014-06-21 16:25:53 -04:00
lduarte1991
95c0738361 Annotation Tools: Removed background-color from image annotations
- Also fixed edit bug when annotation is not created first
- Also fixed indentation issues
2014-06-19 13:52:44 -04:00
Sarina Canelake
30c8da1596 Fix variable names to give context for translators
fix other various i18n issues
2014-06-18 23:28:39 -04:00
stv
fd10fbf725 Fix JSInput scope leak
Declare variables locally
- The `allSections` variable was leaking into the global scope, due to a
  typo in the declaration.
- `dataProcessed` can be declared more narrowly within the callback.
2014-06-13 11:04:24 -07:00
stv
cf14dee790 Fix JSInput test fixture
Clean up fixtures automatically between tests
- Nesting test fixture markup within a DIV allows Jasmine to
  automatically restore the fixture to a clean state between each test
  run.

Fix id attribute collision typo
- This looks like a copy/pasta gone wrong; the two test INPUT elements
  were both declared with the same id, `input_1`.

Remove trailing whitespace
2014-06-13 11:04:24 -07:00
stv
bdf90bfcfb Remove superfluous JSInput test
The behavior previously tested here was to check that if a JSInput
element was marked as not processed, re-walking the DOM *should* have
reinitialized it. Unfortunately, this behavior is not supported by the
underlying JSChannel library. In fact, if JSChannel detects an existing
channel with the same origin and scope, it throws an uncaught exception,
leaving the DOM in a "broken" state.

JSInput will prevent duplicates from being added, as long as we don't
manually update the `data-processed` attribute. This behavior is already
being tested.
2014-06-13 11:04:24 -07:00
stv
60a9e99871 Fix JSInput tests
Select DOM elements with wildcard syntax

- DOM lookups were being done with non-existent literal selectors, so it
  was returning empty lists. As assertions were to be made while
  iterating over the list of elements, nothing was actually being
  verified.

- Common code has been centralized in the setup function. By declaring
  CSS selectors once, we minimize the odds of inadvertently using the
  wrong selector, as happened here.

- Had these tests actually been iterating over a non-empty list, this
  would have thrown undefined exceptions. jQuery.each calls its handler
  with an index and an item/object as the arguments. However, the object
  is a DOM-object, not a jQuery-object.  These tests break, as they had
  assumed the latter.
2014-06-13 11:04:24 -07:00
stv
e2cab19084 Ensure JSInput tests actually run
This test currently fails, meaning that the existing tests weren't
testing what they claimed.

Assertions are made for each element returned by the CSS selectors.
However, the selectors are assumed to be wildcard matches, but are
actually literal selectors. As there are no matched elements, this
causes the assertions to be (silently) checked zero times, without
failure.
2014-06-13 11:04:24 -07:00
Sarina Canelake
2aea261d48 Merge branch 'release'
Conflicts:
	common/djangoapps/course_modes/views.py
	common/djangoapps/student/tests/test_roles.py
	common/djangoapps/student/views.py
	common/lib/opaque_keys/opaque_keys/__init__.py
	common/lib/opaque_keys/opaque_keys/tests/test_opaque_keys.py
	common/lib/xmodule/xmodule/contentstore/mongo.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/notes/views.py
2014-06-10 16:59:23 -04:00
lduarte1991
894428ea9a Reverting commit @3bfb633 and updating openseadragon.js for latest build 2014-06-06 15:40:03 -04:00
lduarte1991
3bfb633fd3 Annotator Tool: Fixed delete bug and factored out settings
Removed print context
2014-06-06 12:39:35 -04:00