marco 72bb93d436 Merge branch 'feature/vik/oe-ui' of github.com:edx/edx-platform into feature/vik/oe-ui

2013-08-15 13:57:05 -04:00

..

admin

…

candy_res

Simple port of Class2Go's chat feature

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

coffee

Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui

2013-08-15 11:36:11 -04:00

contrib

…

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-07-22 10:10:23 -04:00

images

add member list widget, add segment.io call for section view

2013-08-02 09:53:21 -04:00

js

Move Candy.js files to new vendor/ directory

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

maintenance

…

sass

Merge branch 'feature/vik/oe-ui' of github.com:edx/edx-platform into feature/vik/oe-ui

2013-08-15 13:57:05 -04:00

scripts

…

staff

…

.gitignore

…

.hgignore

…

green-pointer.png

…

pixel.jpg

…