Your Name 13ca61ba7f fix merge conflict with _variables.scss

2013-07-29 13:32:54 -04:00

..

admin

Pep8 autofixes

2013-02-06 11:13:50 -05:00

candy_res

Simple port of Class2Go's chat feature

2013-07-18 15:00:53 -07:00

coffee

Refactor Segment.io integration with sequentials and instructor dashboard pages

2013-07-02 13:49:33 -04:00

contrib

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

css/vendor

update annotator.min.css with change to fix adder button and serve the minified one.

2013-05-16 14:48:06 -04:00

files

Update edX media kit (LH #221)

2013-02-28 20:16:19 -05:00

fonts

added in vendor font references to lms for font-awesome

2013-06-25 13:19:54 -04:00

images

updated pinning icons and removed images

2013-06-25 13:28:55 -04:00

js

Move Candy.js files to new vendor/ directory

2013-07-18 15:00:54 -07:00

maintenance

adding maintenance static data

2012-08-23 08:30:04 -04:00

sass

fix merge conflict with _variables.scss

2013-07-29 13:32:54 -04:00

scripts

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

staff

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

.gitignore

Added Gemfile.lock to ignore

2012-07-30 09:51:50 -04:00

.hgignore

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

green-pointer.png

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

pixel.jpg

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00