Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,133 Commits 1 Branch 0 Tags
495cd305d4222e1bcd20ff5362567b97b29d44ea
Commit Graph

4588 Commits

Author SHA1 Message Date
marco
495cd305d4 adjusted cursor for span label on pins to be default 2013-05-16 10:29:34 -04:00
Your Name
e2d3aee768 styling inline flaggin 2013-05-16 10:29:34 -04:00
marco
65dbd3cf73 padding around icons for flags and pins 2013-05-16 10:29:34 -04:00
marco
0a43c0ff59 minor css tweaks to flag and pin icons 2013-05-16 10:29:34 -04:00
Your Name
90e7a84570 show inline pinning and flagging 2013-05-16 10:29:34 -04:00
Your Name
78097c7ee1 update css for better cursor on pinning and flagging 2013-05-16 10:29:33 -04:00
Your Name
121f678f1b restore flagging to inline thread 2013-05-16 10:29:33 -04:00
Jay Zoldak
3b8a8a13b0 Revert "Revert "Merge pull request #1883 from MITx/feature/kevin/flagging_refactor_verbs"" 
This reverts commit 5560a4add4.
 2013-05-16 10:29:33 -04:00
Jay Zoldak
ed5ad46192 Revert "Revert "fix merge conflict"" 
This reverts commit 2df3fe9344.

Conflicts:
	common/static/coffee/src/discussion/utils.coffee
 2013-05-16 10:29:33 -04:00
Kevin Chugh
c410da91de fix coffeescript error 2013-05-16 10:29:32 -04:00
Calen Pennington
0701e1a776 Use local node_modules as system_node_path if none is set 2013-05-15 15:25:42 -04:00
Chris Dodge
6cec66979a fix broken tests. Also drive by fix for the sporadic failure on tests which may go to a textbook page. The URL formatting was incorrect in the test 2013-05-15 11:16:47 -04:00
Greg Price
87cc4fab5a Add tags to comment service request Datadog timer 2013-05-14 14:49:56 -04:00
Greg Price
c8970cafee Add comment service request time logging to Datadog 2013-05-14 11:32:40 -04:00
David Baumgold
d376cb52ca Forgot to update phantom-jasmine location for LMS 2013-05-13 17:31:57 -04:00
e0d
eb843172ff Enable Delft and Georgetown to be handled by the dynamic path 2013-05-13 14:02:41 -04:00
VikParuchuri
e122efc5a3 Merge pull request #1991 from edx/feature/vik/oe-tests 
Feature/vik/oe tests
 2013-05-13 10:49:33 -07:00
Vik Paruchuri
6dfc490fc7 Json updates 2013-05-13 12:49:01 -04:00
Chris Dodge
d32e7a5b61 Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting 2013-05-13 11:06:49 -04:00
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
Chris Dodge
1db66957af Merge branch 'master' of github.com:edx/mitx into fix/cdodge/textbooks-not-exporting 2013-05-10 15:44:55 -04:00
Chris Dodge
1b0eff52ed create test cases to simulate error exporting/importing textbooks 2013-05-10 10:01:10 -04: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
f9023fd112 Merge pull request #1983 from edx/diana/jobs-page-update 
Jobs page updates.
 2013-05-09 11:04:14 -07: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
Vik Paruchuri
fd46ebd1fa Move some functions, make notification tests more robust 2013-05-08 19:04:07 -04:00
Jason Bau
1354cd412a Set SERVER_EMAIL so that mail_admins works 2013-05-08 14:16:20 -07:00
Diana Huang
1e61bbd1c8 Jobs page updates. 2013-05-08 16:06:08 -04:00
Diana Huang
d522b53f6d Merge pull request #1974 from edx/diana/hide-api-key 
Hide the Comments Service API key during logging.
 2013-05-08 07:50:31 -07:00
VikParuchuri
fb4685fe9a Merge pull request #1976 from edx/vik/fix/oe-bugs 
Vik/fix/oe bugs
 2013-05-07 14:54:17 -07:00
Diana Huang
c6f63140a2 Hide the API key during logging. 2013-05-07 16:38:38 -04:00
Giulio Gratta
91e2a39ec7 moving preventDefault() statements to the local script tag 2013-05-07 12:50:59 -07:00
Vik Paruchuri
1398b55713 Comment touched modules 2013-05-07 15:48:19 -04: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
Vik Paruchuri
258aebed20 Fix anonymoususer 500 error 2013-05-07 12:58:49 -04:00
Jay Zoldak
2ffaea7ade Merge pull request #1949 from edx/fix/zoldak/modulestore-tests 
Fix tests that intermittently fail when run in concurrent jobs on jenkins.
 2013-05-06 13:32:27 -07:00
Greg Price
ec3c8458e7 Merge pull request #1911 from edx/feature/gprice/feedback-button 2013-05-06 11:03:41 -07:00