Commit Graph

2032 Commits

Author SHA1 Message Date
Vasyl Nakvasiuk
f1d1a3f606 refactoring after Python code review 2013-05-13 14:44:07 +03:00
Valera Rozuvan
13bed39dde Refactoring after peer review. 2013-05-13 14:44:07 +03:00
Valera Rozuvan
f4b247d2bb Refactoring, documenting, moving all HTML generation to template. 2013-05-13 14:44:07 +03:00
Vasyl Nakvasiuk
6deeb60278 update template for word_cloud, refactor empty json answer 2013-05-13 14:44:04 +03:00
Vasyl Nakvasiuk
dac9b5c038 Word Cloud: add full cycle Python + HTML + JS 2013-05-13 14:44:01 +03:00
Vasyl Nakvasiuk
dd5a7e7ba8 initialize JS for word_cloud 2013-05-13 14:44:01 +03:00
Alexander Kryklia
bb9bc42171 adds initial word_cloud_module files 2013-05-13 14:44:00 +03:00
Greg Price
c765906fc5 Merge pull request #1986 from edx/feature/gprice/fix-help-modal-text
Update "thank you" text in help modal
2013-05-09 14:37:13 -07:00
Greg Price
89d0dc1963 Update "thank you" text in help modal
As per request from Mary.
2013-05-09 17:16:43 -04:00
Diana Huang
e5b18a5688 Put Front End Developer back in. 2013-05-09 13:58:25 -04:00
Diana Huang
ec5f239d91 Add in new Coordinator position. 2013-05-09 09:12:07 -04:00
Diana Huang
1e61bbd1c8 Jobs page updates. 2013-05-08 16:06:08 -04:00
Giulio Gratta
91e2a39ec7 moving preventDefault() statements to the local script tag 2013-05-07 12:50:59 -07:00
Giulio Gratta
87362aa887 Merge branch 'master' of github.com:edx/mitx into feature/giulio/accessibility 2013-05-07 11:21:44 -07:00
Giulio Gratta
f7719a60c7 changed offending javascript:void() hrefs on anchors to preventDefault() 2013-05-07 11:20:47 -07:00
Giulio Gratta
953af59b0d fixing some more LMS accessibility issues 2013-05-07 10:25:16 -07:00
Giulio Gratta
a266330b2d made signup form labels and close modal button accessible friendly and tweaked login form to match signup form 2013-05-07 10:25:08 -07:00
Giulio Gratta
3eac9376dd made forgot password form close modal button accessible friendly 2013-05-07 10:25:08 -07:00
Giulio Gratta
2dde742f38 made login form labels and close modal button accessible friendly 2013-05-07 10:25:08 -07:00
Greg Price
ec3c8458e7 Merge pull request #1911 from edx/feature/gprice/feedback-button 2013-05-06 11:03:41 -07:00
Greg Price
00729a8c13 Add an omnipresent help tab to the LMS
The help tab opens a modal dialog that directs the user at various resources
(e.g. the site FAQ and course forums) and allows the user to submit feedback
to the feedback endpoint (which will ultimately create a ticket for the
student support team).
2013-05-06 13:35:52 -04:00
Victor Shnayder
06846d9187 update EPFL profile. LH # 374 2013-05-06 11:06:05 -04:00
Victor Shnayder
aae40b4378 Press updates
LH: 381, 382, 383
2013-05-03 08:55:40 -04:00
Diana Huang
befe7beccb Add accessibility text to the Contact page. 2013-04-29 16:55:29 -04:00
Diana Huang
2df3fe9344 Revert "fix merge conflict"
This reverts commit acfd0d9fd6, reversing
changes made to e4194c99d8.
2013-04-26 12:40:35 -04:00
Steve Strassmann
8baddc0645 Merge branch 'master' of https://github.com/MITx/mitx into feature/i18n 2013-04-24 10:41:09 -04:00
Calen Pennington
621a935577 Merge pull request #1858 from MITx/feature/ichuang/masquerade-v3
Allow course staff to masquerade as students in viewing courseware
2013-04-24 04:17:34 -07:00
Your Name
acfd0d9fd6 fix merge conflict 2013-04-23 10:30:51 -04:00
Kevin Chugh
d6bc426ecd Merge pull request #1731 from MITx/feature/kevin/pinning_inline
Feature/kevin/pinning inline
2013-04-23 07:24:22 -07:00
Your Name
3f1d97b065 Merge branch 'master' into feature/kevin/flagging 2013-04-22 17:22:33 -04:00
chrisndodge
0eed587571 Merge pull request #1839 from MITx/feature/sef/pressreleases
Press Releases: generic matching rule instead of explicit lines in url.py
2013-04-22 07:01:36 -07:00
Kevin Chugh
e8c646142f Merge branch 'master' into feature/kevin/flagging 2013-04-21 06:15:55 -04:00
Kevin Chugh
649578ea2f unify flag moderator permissions 2013-04-21 06:15:23 -04:00
ichuang
f1a899ac1c Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/masquerade-v3 2013-04-20 12:25:47 -04:00
ichuang
3de927fe01 untabify course_nagivation.html 2013-04-17 21:22:08 -04:00
Steve Strassmann
6e34c668bb introduce i18n 2013-04-17 11:30:29 -04:00
Calen Pennington
3cd414afbb Merge pull request #1825 from MITx/fix/cale/gradebook
Fix/cale/gradebook
2013-04-17 07:37:02 -07:00
brianhw
91d84c0208 Merge pull request #1863 from MITx/fix/brian/jobs-20130410
Update with 2013-04-10 changes
2013-04-16 12:56:58 -07:00
Brian Wilson
7f90e31709 Update with 2013-04-10 changes 2013-04-16 15:43:14 -04:00
Carlos Andrés Rocha
a947f620a0 Merge pull request #1861 from MITx/fix/btalbot/stanford-logo
fixing the visual display of the stanford logo
2013-04-16 11:50:43 -07:00
Brian Talbot
b417651cf1 fixing the visual display of the stanford logo used in press releases on the homepage and dashboard (proportions were off) 2013-04-16 14:47:26 -04:00
Vik Paruchuri
d82ac2b747 Merge remote-tracking branch 'origin/master' into fix/vik/sa-and-coe 2013-04-16 13:45:46 -04:00
Vik Paruchuri
701bdc55c0 Minor fixes 2013-04-16 11:55:54 -04:00
Calen Pennington
6644b78819 Fix gradebook when using grade cutoffs other than A/B/C 2013-04-16 11:38:58 -04:00
ichuang
ffb125f8a9 course_navigation for masquerade 2013-04-13 22:46:48 -04:00
ichuang
fb0a23238a allow staff to masquerade as student - works
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/course_navigation.html
2013-04-13 22:46:39 -04:00
Brian Wilson
2d9deaf38c remove code for supporting anchor_id on html textbooks, since it doesn't work 2013-04-12 11:53:06 -04:00
Vik Paruchuri
9f04769c00 Better confirmation for flagging 2013-04-10 16:16:13 -04:00
Vik Paruchuri
a64d57ae1d Add popup when flag box is checked 2013-04-10 16:01:56 -04:00
Sef Kloninger
bcdc6db4a9 press releases: fix stanford announcement in rss feed 2013-04-10 02:26:43 -04:00