Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* fixed problem with animal_identificationBryan Berry2010-01-112-10/+3
* Merge branch 'master' of gitorious@git.sugarlabs.org:karma/mainlineBryan Berry2010-01-1151-0/+0
|\
| * commiting change in the pictures for numerical math puzzlehither2forlorn2010-01-1051-0/+0
* | refactored scoreboard widget to use Nepal's jQuery UI themeBryan Berry2010-01-11109-1003/+955
|/
* Merge branch 'master' of gitorious@git.sugarlabs.org:karma/mainlineBryan Berry2010-01-10359-0/+112548
|\
| * removing tmp fileshither2forlorn2010-01-0720-688/+0
| * adding the more missing vocabulary lessonshither2forlorn2010-01-07141-0/+38372
| * adding the missing vocabulary lessonshither2forlorn2010-01-07238-0/+74864
* | fixed merge conflictBryan Berry2010-01-1036-23/+5634
|\ \ | |/ |/|
| * minor changes to scoreboard widgetBryan Berry2010-01-105-53/+50
| * scoreboard can now be oriented vertically but haven't figured out how to cent...Bryan Berry2010-01-108-63/+183
| * scoreboard now laid out properly when horizontal. Now need to move all css ru...Bryan Berry2010-01-089-25/+7847
| * made the jQUI icon appearBryan Berry2010-01-0715-8/+17
| * minor changesBryan Berry2010-01-072-83/+36
| * scoreboard plugin now basically works. Next step is to make it attractive and...Bryan Berry2010-01-0617-1/+5441
* | jquery svgRoshan Karki2010-01-074-0/+36
* | lesson QuickMultiplication addedRoshan Karki2010-01-074-0/+7768
* | changed Karma.rand and Karma.shuffle to pgijsels implementationBryan Berry2010-01-072-87/+30
|/
* jake clean now removes vim backup filesBryan Berry2010-01-051-1/+1
* Karma.shuffle works and passes unit testsBryan Berry2010-01-0513-1463/+1567
* moved math functions to Karma.* namespace. Fixed the lessons that used them t...shuffle-karmaBryan Berry2010-01-04169-2169/+1871
* buil, bundle, and clean work nicely. Still need to package up as xo bundle, g...Bryan Berry2010-01-041-12/+3
* basic bundling worksBryan Berry2010-01-04726-28330/+51
* jake targets build-stable and build-latest now workBryan Berry2010-01-047-145/+16
* reworked JakefileBryan Berry2010-01-044-11/+44
* jake clean-bundle worksBryan Berry2010-01-042-14/+87
* minor changes to JakefileBryan Berry2010-01-042-38/+81
* Merge branch 'master' of gitorious@git.sugarlabs.org:karma/mainlineBryan Berry2010-01-04238-74864/+0
|\
| * Updating Vocabulary to exampleshither2forlorn2010-01-01238-74864/+0
* | added Jakefile w/ working clean taskBryan Berry2010-01-04122-915/+8794
* | kbuild.js is broken in this build, I am moving things aroundBryan Berry2010-01-03943-32/+29
|/
* minor change to kbuild.jsv0.2.0Bryan Berry2010-01-011-0/+2
* minor change to kbuildBryan Berry2010-01-011-5/+7
* fixed Conozco a UruguayBryan Berry2009-12-312-6/+18
* kbuild.js seems to workBryan Berry2009-12-313-37/+110
* hopefully fixed obnoxious commit problemsBryan Berry2009-12-31943-0/+0
* testing more obnoxious commit problemsBryan Berry2009-12-31944-0/+162206
* testing obnoxious commit problemsBryan Berry2009-12-311-0/+1
* adding bundle files for real this timeBryan Berry2009-12-311-55/+59
* added XO bundle stuff to bundles/ directoryBryan Berry2009-12-313-2/+3
* build part of script now works, still need to do bundling partBryan Berry2009-12-302-5/+8
* Merge branch 'master' of gitorious@git.sugarlabs.org:karma/mainlineBryan Berry2009-12-302-17/+22
|\
| * Merge branch 'master' of gitorious@git.sugarlabs.org:karma/mainlineRoshan Karki2009-12-307-0/+353
| |\
| * | added isActive flag, titleRoshan Karki2009-12-302-17/+22
* | | kbuild.js now has some basic functionalityBryan Berry2009-12-301-71/+178
* | | kbuild.js can parse basic argumentsBryan Berry2009-12-302-40/+61
| |/ |/|
* | added test for number words using svgBryan Berry2009-12-307-0/+353
|/
* added lesson numberwords for testingRoshan Karki2009-12-285-0/+193
* changed footer on start pageBryan Berry2009-12-231-1/+1
* changed image on start pageBryan Berry2009-12-233-4/+5