Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

17975 Commits

Author SHA1 Message Date
Will Daly
342b3bb0e9 Merge branch 'master' into feature/will/ci-lettuce-tests 
Resolved conflict with changes to Rakefile in master

Conflicts:
	rakefile
 2013-05-16 11:21:59 -04:00
Your Name
a9db41d8d0 flag and unflag tests for comments and threads 2013-05-16 10:59:23 -04:00
Your Name
c7e0b576d0 fix missing paren 2013-05-16 10:59:23 -04:00
Kevin Chugh
03725de34a flag abuse failing 2013-05-16 10:59:23 -04:00
Kevin Chugh
fa269d3c96 add flag thread django test 2013-05-16 10:59:23 -04:00
marco
71be3debc4 updated flagging icons to not use other libraries 2013-05-16 10:56:58 -04:00
Jay Zoldak
e1481d93a8 Work on view test for comment client code. 2013-05-16 10:56:58 -04:00
Jay Zoldak
7e63611478 Start adding view tests for discussion client. Note that these will not work unless you change your test.py to enable discussion forums. 2013-05-16 10:56:57 -04:00
marco
33e8621af6 cursor state for discussions (not inline) span text needed to be set to pointer 2013-05-16 10:29:34 -04:00
marco
18759b21d6 capitalization on tooltips 2013-05-16 10:29:34 -04:00
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
dcadams
67356cdcc8 Merge of master to get Jenkins running. 2013-05-15 09:54:53 -07:00
dcadams
6225950356 Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement 2013-05-15 09:48:14 -07:00
Will Daly
1240c5ae92 Merge branch 'master' into feature/will/ci-lettuce-tests 2013-05-15 11:40:54 -04:00
Will Daly
b3e959773d Disabled logging of warnings/errors for acceptance tests 
to make the logs readable
 2013-05-15 11:31:52 -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
Arthur Barrett
3a178bab1f Merge branch 'master' into feature/abarrett/lms-notes-app 2013-05-15 11:12:42 -04:00
Chris Dodge
ce52be1e57 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master 2013-05-15 09:59:26 -04:00
Greg Price
87cc4fab5a Add tags to comment service request Datadog timer 2013-05-14 14:49:56 -04:00
Will Daly
36fb8f91e0 Acceptance tests now use the same mongo db as the unit test suite. 
The LMS/CMS acceptance tests both use the collection acceptance_modules
 2013-05-14 12:45:38 -04:00
Will Daly
daef910494 Mae mongo DB and collection names consistent for all 
acceptance tests.
 2013-05-14 12:34:15 -04:00
Arthur
c8bdc1ab66 update readme 2013-05-14 12:42:26 -03:00
Greg Price
c8970cafee Add comment service request time logging to Datadog 2013-05-14 11:32:40 -04:00
Arthur Barrett
149f2ff897 add readme 2013-05-14 11:26:15 -04:00
Chris Dodge
5df23d15f2 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master 
Conflicts:
	cms/djangoapps/contentstore/views/course.py
 2013-05-14 10:57:11 -04:00
Arthur Barrett
5e39971fcc merge master. resolved conflicts in component.py and course.py. 2013-05-14 10:54:21 -04:00
Will Daly
e2d7f6a027 Changed module store directory root to test_root/data 2013-05-14 10:45:27 -04:00
Will Daly
72a42413e2 Fixed database to work on Jenkins (now stored in test_root), 
moved syncdb/migration steps into the rake test_acceptance commands
and updated the documentation.
 2013-05-14 10:33:25 -04:00
David Baumgold
d376cb52ca Forgot to update phantom-jasmine location for LMS 2013-05-13 17:31:57 -04:00
Ned Batchelder
b682e1c0d3 Put a feature flag around the staff-only debugging page. 2013-05-13 17:07:13 -04:00
Arthur Barrett
026773b508 fix pep8 warnings and add empty message to notes tab 2013-05-13 16:54:32 -04:00
Arthur Barrett
bea943d537 merged master. resolved conflict with the cms contentstore/views.py that was refactored into separate modules. 2013-05-13 16:26:28 -04:00
dcadams
5e75e91322 Takes care of Victor's comments on the PR. 
Note, the students_lc list is used in _do_enroll_students when overload
= True so it needs to be left in.
 2013-05-13 13:20:37 -07:00
dcadams
3890701cbb Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement 2013-05-13 13:10:16 -07:00
Chris Dodge
5d2b8879f8 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master 2013-05-13 16:04:28 -04:00
Chris Dodge
cbe205328a Merge branch 'master' of github.com:edx/mitx into feature/cdodge/autoprovision-forums-master 
Conflicts:
	cms/djangoapps/contentstore/views.py
 2013-05-13 15:47:33 -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
Arthur Barrett
66d3ccff17 sanitize note text and other input in the model as well as escape template output to close potential security hole 2013-05-13 13:40:19 -04:00
Arthur Barrett
be98b5fa3e merged master. resolved conflict in cms/djangoapps/contentstore/views.py (added word_cloud to advanced_modules list) 2013-05-13 13:26:55 -04:00