19654 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
cahrens	4a697a8da1	Verify that caller of add or remove from creator group is staff.	2013-06-26 10:52:26 -04:00
cahrens	190c07d954	Add smoke coverage for add and remove of course group permissions.	2013-06-26 10:52:26 -04:00
cahrens	2c60a7dbc1	pep8 cleanup	2013-06-26 10:52:26 -04:00
Ned Batchelder	6e5c861018	Merge pull request #272 from edx/fix/LMS-500 ... Fix LMS-500: Random class in random module was None	2013-06-26 07:49:54 -07:00
cahrens	318372f2c0	Introduce course creator group.	2013-06-26 10:48:31 -04:00
marco	f94ec6cf2a	merge conflicts resolved	2013-06-26 10:47:32 -04:00
marco	84d505e8cc	modified html for discussion home to use tables instead of lists, cleaned up styling as well	2013-06-26 10:41:49 -04:00
Ned Batchelder	46788f31c8	Remove obsolete and distracting SCSS file	2013-06-26 10:12:40 -04:00
Alexander Kryklia	72aa56a45e	updated CHANGELOG.rst	2013-06-26 13:00:15 +03:00
Jason Bau	c41c102b7a	Update CHANGELOG.rst	2013-06-25 21:37:20 -06:00
Jason Bau	4a3165414d	Merge pull request #84 from edx/feature/jbau/activation-after-password-reset-confirm ... Moves user activation from just clicking on reset password to following the link in the password reset email	2013-06-25 20:34:19 -07:00
Jason Bau	734440f4b9	Refactored tests	2013-06-25 20:21:20 -07:00
Don Mitchell	d9575a0874	Remove traling commas to make json valid	2013-06-25 22:34:36 -04:00
Don Mitchell	b42fe277d4	Add serial commas to modulestore definitions	2013-06-25 22:34:36 -04:00
Don Mitchell	8b23eeca7e	Minor pylint/whitespace changes	2013-06-25 22:34:29 -04:00
Renzo Lucioni	3f49da385f	Swap Logger call from check_fd to check	2013-06-25 17:22:05 -04:00
Jay Zoldak	fe82e865aa	Merge pull request #267 from edx/zoldak/fix-acceptance-xcontent ... Specify a different xcontent mongo db for the acceptance tests	2013-06-25 14:04:30 -07:00
Jay Zoldak	6c66736e3c	Specify a different xcontent mongo db for the acceptance tests	2013-06-25 16:56:36 -04:00
Christina Roberts	9dad14c48e	Merge pull request #265 from edx/christina/activation-email ... Don't mention edge in the subject line; use same message for edx and edg...	2013-06-25 13:21:51 -07:00
Carlos Andrés Rocha	94e1746500	Merge pull request #258 from edx/rocha/pre-external-grader-cleanup ... Cleanup before adding external grader	2013-06-25 13:17:11 -07:00
Julian Arni	1e0702f374	Allow nested object methods for the grade and state functions	2013-06-25 16:14:34 -04:00
Renzo Lucioni	881d63dae7	Fixed Jasmine tests in light of Logger changes, and wrote test to cover case where data passed is not a dictionary	2013-06-25 16:04:00 -04:00
Will Daly	68c0f04462	Merge pull request #264 from edx/will/update-diff-cover-v0.1.3 ... Updated diff-cover to version 0.1.3 to fix a bug	2013-06-25 12:45:16 -07:00
cahrens	401dc82c46	Don't mention edge in the subject line; use same message for edx and edge.	2013-06-25 15:35:47 -04:00
Renzo Lucioni	84f4361d52	Avoid changing format of data sent to our logs, and prevent problem_check event from firing twice	2013-06-25 15:33:16 -04:00
Renzo Lucioni	bcbce3eff0	Add handful of events to the Segment.io whitelist	2013-06-25 15:33:16 -04:00
Jonah Stanley	b14553d867	Merge pull request #220 from edx/jonahstanley/make-units-parallel ... Jonahstanley/make units parallel	2013-06-25 11:44:01 -07:00
Ned Batchelder	ed62c5a6f9	Fix LMS-500: Random class in random module was None ... Deleting the module object isn't needed to replace it, and deleting a module object causes all of its attributes to be set to None.	2013-06-25 14:23:16 -04:00
Carlos Andrés Rocha	e4ee1c6c9b	Rename arguments of modx_dispatch and handle_ajax related functions ... Refactor a bit modx_dispatch	2013-06-25 13:38:57 -04:00
Carlos Andrés Rocha	2f02496c8f	Reorder imports on module_render	2013-06-25 13:31:53 -04:00
marco	a24c3a9700	updated pinning icons and removed images	2013-06-25 13:28:55 -04:00
marco	05a7d664f7	updated flag icons to be font-awesome based	2013-06-25 13:28:55 -04:00
marco	770bfdc180	removed new post icon and added font-awesome replacement	2013-06-25 13:28:55 -04:00
marco	0f84a52023	new post button using font-awesome	2013-06-25 13:28:55 -04:00
marco	98cd032ade	cleaned up topic header to allow for multiple line titles still being visible	2013-06-25 13:28:55 -04:00
marco	b83d5aa42d	removed icon stack from email area of helpgrid	2013-06-25 13:28:55 -04:00
marco	07e87a54bc	icon color changes and profile link style to match profile page	2013-06-25 13:28:55 -04:00
marco	9fe626469e	sass build cleanup for baseline fixes	2013-06-25 13:28:54 -04:00
marco	74ea364a5a	cleaned up margin and padding to use baseline variable	2013-06-25 13:28:54 -04:00
marco	d648b18d72	removed border to the right of discussion list	2013-06-25 13:28:54 -04:00
marco	b870679673	basic shell for home page exists, along with start of color cleanup for the rest of _discussion.scss	2013-06-25 13:28:54 -04:00
marco	52403420fd	cleaned up variables styling to sync up closer to studio, incorporated fontawesome icons into discusison home with basic positioning	2013-06-25 13:28:54 -04:00
marco	23f19423be	cleaned up font-awesome integration to work with new mako file .scss compiling, added in initial icon references	2013-06-25 13:28:54 -04:00
brianhw	397583e1ab	Merge pull request #262 from edx/fix/brian/changelog ... Update CHANGELOG for per-student problem rescoring.	2013-06-25 10:24:42 -07:00
Will Daly	c0805c334d	Updated diff-cover to version 0.1.3 to fix a bug	2013-06-25 13:23:13 -04:00
marco	38d8863ca1	added in vendor font references to lms for font-awesome	2013-06-25 13:19:54 -04:00
marco	8ef258d465	addition of font-awesome to LMS sass vendor assets, in additio nto light organization for applicaiton.scss to match studio sass breakdown.	2013-06-25 13:19:54 -04:00
marco	46998bd702	basic shell for discussion home page with both profile information and email notification settings	2013-06-25 13:19:53 -04:00
marco	3df08dc1c4	blankslate edited, header bar now with home button	2013-06-25 13:19:53 -04:00
JonahStanley	8a9125f121	Test Mongo database is now unique and destroyed in teardown	2013-06-25 11:33:46 -04:00