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

905 Commits

Author SHA1 Message Date
Renzo Lucioni
f9ecd8849a Fix logistration Jasmine tests 
Includes several bug fixes caught during test writing, general clean-up, and adds js-url, a lightweight URL parser
 2014-11-06 12:07:49 -05:00
AlasdairSwan
d0b1a8ec06 Fixed bug with validation templates expecting number but being passed string. 2014-11-05 15:40:38 -05:00
Diana Huang
a971e71792 Merge branch 'will/logistration-third-party-auth-fixes' into will/combine-reg-login-form 
Conflicts:
	common/djangoapps/course_modes/views.py
 2014-11-04 10:50:09 -05:00
Renzo Lucioni
471f513566 Merge pull request #5770 from edx/renzo/logistration-i18n 
i18n logistration
 2014-10-30 14:20:08 -04:00
Renzo Lucioni
4157e5c0f6 i18n logistration 2014-10-30 14:09:15 -04:00
AlasdairSwan
ff753f2bcb Merge pull request #5784 from edx/alasdair/rwd-header-and-footer 
Alasdair/rwd header and footer
 2014-10-30 09:21:21 -04:00
Renzo Lucioni
bcef7611d4 Clean up logistration copy 2014-10-29 14:42:57 -04:00
AlasdairSwan
e04a3ab32b ECOM-406 Added JS fil that will update DOM to make the header and footer responsive 
Made the header and footer responsive
 2014-10-29 14:00:54 -04:00
Will Daly
48bc4776be Merge branch 'will/third-party-auth-fixes' into will/combine-reg-login-form 
Conflicts:
	common/djangoapps/third_party_auth/__init__.py
	common/djangoapps/third_party_auth/pipeline.py
 2014-10-28 15:16:27 -04:00
AlasdairSwan
08e03ef380 ECOM-369 updated in light of review with Andy and code review 2014-10-27 15:17:07 -04:00
AlasdairSwan
2ea9685552 ECOM-369 Added handling of model save errors. Updated FormView to add preRender function to limit amount of duplicate code. Updated PasswordResetModel to return error object when errors occur. 2014-10-27 15:16:33 -04:00
AlasdairSwan
a86e9e68db ECOM-466 Added support for custom error messages. Styled select widths 2014-10-27 15:15:10 -04:00
AlasdairSwan
c3083069d1 ECOM-466 cleaned up form submission validation 2014-10-24 08:55:28 -04:00
AlasdairSwan
e332e79328 ECOM-369 Moved to Base FormView extended by other views. 2014-10-23 16:23:59 -04:00
David Baumgold
14209c672a Merge pull request #5667 from lduarte1991/lduarte-harvardx-pr33 
Annotation Tools: Upgrading Share plugin from v1.0 to v1.1
 2014-10-23 11:22:22 -04:00
Anton Stupak
b12aa0b1b6 Merge pull request #5518 from edx/anton/requirejs-optimizer 
Add RequireJS Optimizer.
 2014-10-23 15:29:42 +03:00
Will Daly
33f0e92d62 Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form 2014-10-22 17:13:30 -04:00
lduarte1991
976c3cb11f Annotation Tool: Fix Share Plugin style and spacing 
- fixed parseInt issue

 - PR fixes
 2014-10-22 09:22:10 -04:00
lduarte1991
deefe9b13e Annotation Tools: Updated Share plugin from version 1.0 to v1.1 2014-10-22 09:21:39 -04:00
Will Daly
fabd8a97ad Fix validation for checkboxes in forms. 
Remove hard-coded TOS checkbox in registration template.
Disable new dashboard in settings; expose password reset end-point in student account app.
Added empty JS tests for new JavaScript
 2014-10-21 07:29:46 -04:00
David Baumgold
9c8c33c532 Merge pull request #5603 from lduarte1991/lduarte-harvardx-pr32 
Image Annotation Tool: Border and tag-based coloring
 2014-10-20 16:40:11 -04:00
lduarte1991
464de86c2d Annotation Tool: Search happens when user hits enter 2014-10-20 15:14:36 -04:00
AlasdairSwan
b70dfb0780 ECOM-369 added registration view and front end validation 2014-10-20 12:07:51 -04:00
Waqas Khalid
be19c1a9a5 Merge pull request #5610 from mlkwaqas/waqas/tnl607-forum-post-are-uneditable 
Post with the discussion id containing dots uneditable
 2014-10-20 19:39:29 +05:00
polesye
83fbdc2ac4 TNL-481: Add RequireJS Optimizer. 2014-10-20 17:33:21 +03:00
zubair-arbi
6bb878afb2 Merge pull request #5468 from edx/zub/bugfix/tnl-256-protex-scroll-with-increased-font-size 
set overflow to scroll so that user can see full content with increased ...
 2014-10-20 12:23:24 +05:00
Waqas Khalid
9ba03c8aac Post with the discussion id containing dots uneditable 
When user try to edit the post under dicussion whose
id contains dots it doesn't allow user to edit taht
post.

TNL-607
 2014-10-18 01:07:27 +05:00
lduarte1991
946c7eb24c Annotation Tools: Addressing PR Comments from DB 2014-10-17 15:14:37 -04:00
Frances Botsford
c92f52e0bd cleanup and response to PR review 2014-10-17 13:51:43 -04:00
Frances Botsford
ce3cb27864 switching RTL on the fly - added bi-app for sass compiling 2014-10-17 13:51:42 -04:00
Frances Botsford
e255ac1f29 Initial pass at LMS and Studio RTL 2014-10-17 13:51:42 -04:00
Waqas Khalid
ff8b281f5b Clicking the magnifying glass should perform search 
In forum search is only working when user enter some
text in the search textfield and press the Enter
button. It should also work when we click on
magnifying glass.

TNL-526
 2014-10-17 18:34:57 +05:00
Ben Patterson
5703adb722 Merge branch 'release' 
Includes rc/2014-10-14
 2014-10-16 20:11:55 -04:00
lduarte1991
9005f2e829 Annotations Tools: spacing and comment fixes - will be squashed 2014-10-16 10:55:33 -04:00
Calen Pennington
e00b666db9 Merge pull request #5590 from cpennington/xblocks-with-children 
Enable pure XBlocks to use children in edx-platform
 2014-10-16 10:23:35 -04:00
Calen Pennington
41f3c040c8 Add block type to the available attributes in the xblock javascript frontend 2014-10-16 09:08:57 -04:00
lduarte1991
d6549d2e41 Annotation Tools: CSS fixes for editor 2014-10-15 16:24:25 -04:00
E. Kolpakov
4f3240e488 Fixed errors in discussion XModule, caused by c2716d4 [TNL-606] 
Co-Authored-By: jmclaus <jmc@edx.org>
Co-Authored-By: jsa <jsa@edx.org>
 2014-10-15 12:29:27 -04:00
jsa
786fc806f5 Add topic selection to inline thread editing, fixing errors 
Co-Authored-By: Brian Talbot <btalbot@edx.org>

TNL-549
 2014-10-14 15:45:19 -04:00
lduarte1991
fea2ba5e1e Annotation Tools: Bug fixes - tinymce bug after exiting full screen, stupid check for type, missing tag subscriptions 2014-10-14 14:06:33 -04:00
lduarte1991
14dfe9a1e8 Image Annotation Tool: Double border, color borders and tag buttons 2014-10-14 13:00:47 -04:00
Waqas Khalid
f023b62bd0 Endorsement username shouldn't be broken 
If we endourse the answer of the question in discussion
the username link that is created is broken whereas it
should point to the userprofile.

TNL-188
 2014-10-13 16:58:30 +05:00
Nimisha Asthagiri
d7f850a764 Merge branch 'release' 
Conflicts:
	lms/djangoapps/instructor/features/data_download.py
 2014-10-07 16:23:28 -04:00
jmclaus
588979d5e5 Merge pull request #5308 from edx/jmclaus/forum-thread-type 
Change the thread type of a previously posted post. [TNL-172]
 2014-10-03 19:53:37 +02:00
jmclaus
c2716d470c TNL-172: Change type of a previously posted post. IMPORTANT: this commit depends on commit 774887b in cs_comments_service. 2014-10-03 18:29:25 +02:00
John Eskew
2a8529d37a Change email address detection in TinyMCE link plugin. 
- If link has a "@" and a ":", do not consider it an email address.
Add un-minified version of plugin.js file for link plugin.
Update build instructions to include media plugin.
Commit re-built minified JS.
Add all plugins to Jakefile.js in zip file.
Reason for this commit:
Split acceptance test was failing when TinyMCE detected a Split asset
key as an email address. Fix was to modify email address detection.
 2014-10-03 10:56:00 -04:00
Oleg Marshev
f020d1c584 Show date and time on Schedules and Details in UTC (TNL-85). 2014-10-03 11:17:00 +03:00
Andy Armstrong
7be11b47da Address PR review comments 2014-10-02 13:07:58 -04:00
Andy Armstrong
ba491195e6 Update final text strings & readthedoc URL 
TNL-401
 2014-10-02 11:54:23 -04:00
zubair-arbi
dbe4410d44 set overflow to scroll so that user can see full content with increased font size 
TNL-256
 2014-10-02 19:34:57 +05:00