Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* added OLE Nepal logo and buttoms for months and weeks (for stage 3)christophd@sugarlabs.org2009-09-0717-0/+0
* now using <nav> tag for knabvarchristophd@sugarlabs.org2009-09-074-16/+37
* testing with week buttons in stage 3christophd@sugarlabs.org2009-09-071-4/+4
* Merge branch 'master' of git://git.sugarlabs.org/karma/mainlinechristophd@sugarlabs.org2009-09-073-33/+81
|\
| * fixed problem w/ monkey animationroot2009-09-071-1/+6
| * chimp animation now worksroot2009-09-073-32/+75
* | corrected label "Weeks" to "Months"christophd@sugarlabs.org2009-09-071-1/+1
|/
* now using klayers entirely. Scoreboard works. Reset button worksroot2009-09-065-88/+224
* now using k.layer for scoreboxCanvasroot2009-09-061-9/+15
* Merge branches 'master' and 'multicanvas'root2009-09-0414-114/+245
|\
| * fixed bugs in jquery.karma.js , one that added the canvas element even if it ...root2009-09-048-52/+64
| * Merge branch 'multicanvas' of gitorious@git.sugarlabs.org:karma/mainline into...root2009-09-044-18/+131
| |\
| | * clone function description addedFelipe Lopez Toledo2009-09-041-4/+5
| | * KLayer modified, addedFelipe Lopez Toledo2009-09-044-18/+130
| * | adding timer functions to adding_uproot2009-09-043-45/+54
| |/
| * added score to adding uproot2009-09-048-40/+37
* | worked on stage 3 which looks quite a bit better now, also started cleaning u...christophd@sugarlabs.org2009-09-044-382/+107
* | slight improvements on the stage 3 layout, some bugs still remainchristophd@sugarlabs.org2009-09-042-6/+7
|/
* fixed summing error accidentally added by me in addding_uproot2009-09-0429-12/+9
* Merge branch 'multicanvas' of gitorious@git.sugarlabs.org:karma/mainline into...Felipe Lopez Toledo2009-09-0486-0/+12716
|\
| * deleted experiments directoryroot2009-09-0486-0/+12716
| * Merge branch 'felipe' of gitorious@git.sugarlabs.org:karma/mainline into mult...root2009-09-042-27/+3
| |\
* | \ Merge branch 'master' of gitorious@git.sugarlabs.org:karma/mainline into mult...Felipe Lopez Toledo2009-09-042-27/+3
|\ \ \ | | |/ | |/|
| * | default week and lesson tabs now load automatically (after deleting a javascr...christophd@sugarlabs.org2009-09-032-27/+3
* | | adding up multicanvasas "correct/incorrect" bug fixedFelipe Lopez Toledo2009-09-042-32/+32
| |/ |/|
* | got rid back up files created by emacs, changed lesson1.js to lesson.jsroot2009-09-039-636/+132
* | adding up to 10 now kind of works w/ new layoutroot2009-09-031-19/+24
* | can now draw on all 5 boxes using karma plugin. However, using the distance2 ...root2009-09-038-118/+469
* | working on an exampleroot2009-09-0330-0/+11325
* | cleaned out extraneous files, such as old versions of karma pluginroot2009-09-03188-14981/+3733
|/
* made small changes to jquery.karma-0.5.js to help working with jsdoc. I added...root2009-09-031-97/+52
* got rid of example adding_up_to_10_old as it was redundantroot2009-09-0368-9871/+1090
* multiple canvases support startedFelipe Lopez Toledo2009-09-025-4/+1085
* added previously forgotten b/w images, continued work on stage 3christophd@sugarlabs.org2009-09-027-23/+20
* added black/white versions of images, renamed subject images from <random_num...christophd@sugarlabs.org2009-09-0215-14/+15
* modified Chakra according to feedback from 2009-09-02 OLE Nepal meeting (e.g....christophd@sugarlabs.org2009-09-025-12/+310
* added black/white versions of grade images (for grades that aren't available)...christophd@sugarlabs.org2009-09-0213-8/+86
* increased the size of the icons in both grade and subject stage, experimented...christophd@sugarlabs.org2009-09-012-14/+16
* more experimentation with the lesson navigationchristophd@sugarlabs.org2009-09-013-71/+30
* renamed files to meet new naming conventions for knavbar, cleaned up css refe...christophd@sugarlabs.org2009-09-015-17/+11
* corrected a typo in knavbar csschristophd@sugarlabs.org2009-09-011-1/+1
* JS Documentation: Karma main constructor done.Felipe Lopez Toledo2009-09-0127-0/+12182
* Merge branch 'master' of git://git.sugarlabs.org/karma/mainlinechristophd@sugarlabs.org2009-08-313-93/+106
|\
| * now sidebar in mytest.html is properly positionedroot2009-08-312-6/+15
| * all px values now in mytest.htmlroot2009-08-313-91/+95
* | started building lesson navigation with iconschristophd@sugarlabs.org2009-08-313-59/+106
|/
* updated chakra.css to contain lesson specific layout (previously in separate ...christophd@sugarlabs.org2009-08-312-2/+23
* Merge branch 'master' of git://git.sugarlabs.org/karma/mainlinechristophd@sugarlabs.org2009-08-317-3/+105
|\
| * trying mytest1.html w/ 0 width for canvas elementroot2009-08-312-6/+6
| * added experiments folder for my canvas experimentsroot2009-08-316-3/+105