| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branches 'epaath' and 'epaath' of gitorious@git.sugarlabs.org:karma/mai...epaath | root | 2009-09-09 | 4 | -15/+4 |
|\ |
|
| * | created "epaath" branch for nepal specific customizations of knavbar, made ch... | christophd@sugarlabs.org | 2009-09-07 | 4 | -15/+4 |
|
|
* | | renamed "KLayer" to "KSurface", k.init supports surfaces | Felipe Lopez Toledo | 2009-09-08 | 3 | -46/+82 |
|/ |
|
* | improved knav layout, esp. welcome screen | christophd@sugarlabs.org | 2009-09-07 | 6 | -71/+78 |
|
|
* | added knavbar designs | christophd@sugarlabs.org | 2009-09-07 | 4 | -0/+304 |
|
|
* | increased size of chakra icon to 40px | christophd@sugarlabs.org | 2009-09-07 | 4 | -15/+27 |
|
|
* | added e-pustakalaya link to stage 1 | christophd@sugarlabs.org | 2009-09-07 | 1 | -4/+5 |
|
|
* | added index_nepal.html for Nepali Chakra style | christophd@sugarlabs.org | 2009-09-07 | 1 | -0/+45 |
|
|
* | still experimenting w/ knavbar, breaking lots of things in the process | christophd@sugarlabs.org | 2009-09-07 | 1 | -0/+1 |
|
|
* | removed <!DOCTYPE HTML> tag from Chakra files again as it has undesired side ... | christophd@sugarlabs.org | 2009-09-07 | 3 | -3/+0 |
|
|
* | added <!DOCTYPE HTML> to Chakra files, improved stage 3 w/ button layout | christophd@sugarlabs.org | 2009-09-07 | 5 | -6/+14 |
|
|
* | had forgotten to include week B selections | christophd@sugarlabs.org | 2009-09-07 | 1 | -4/+4 |
|
|
* | changes for icon use in stage 3 | christophd@sugarlabs.org | 2009-09-07 | 1 | -14/+14 |
|
|
* | adapted for icon use in stage 3 | christophd@sugarlabs.org | 2009-09-07 | 1 | -2/+0 |
|
|
* | added OLE Nepal logo and buttoms for months and weeks (for stage 3) | christophd@sugarlabs.org | 2009-09-07 | 17 | -0/+0 |
|
|
* | now using <nav> tag for knabvar | christophd@sugarlabs.org | 2009-09-07 | 4 | -16/+37 |
|
|
* | testing with week buttons in stage 3 | christophd@sugarlabs.org | 2009-09-07 | 1 | -4/+4 |
|
|
* | Merge branch 'master' of git://git.sugarlabs.org/karma/mainline | christophd@sugarlabs.org | 2009-09-07 | 3 | -33/+81 |
|\ |
|
| * | fixed problem w/ monkey animation | root | 2009-09-07 | 1 | -1/+6 |
|
|
| * | chimp animation now works | root | 2009-09-07 | 3 | -32/+75 |
|
|
* | | corrected label "Weeks" to "Months" | christophd@sugarlabs.org | 2009-09-07 | 1 | -1/+1 |
|/ |
|
* | now using klayers entirely. Scoreboard works. Reset button works | root | 2009-09-06 | 5 | -88/+224 |
|
|
* | now using k.layer for scoreboxCanvas | root | 2009-09-06 | 1 | -9/+15 |
|
|
* | Merge branches 'master' and 'multicanvas' | root | 2009-09-04 | 14 | -114/+245 |
|\ |
|
| * | fixed bugs in jquery.karma.js , one that added the canvas element even if it ... | root | 2009-09-04 | 8 | -52/+64 |
|
|
| * | Merge branch 'multicanvas' of gitorious@git.sugarlabs.org:karma/mainline into... | root | 2009-09-04 | 4 | -18/+131 |
| |\ |
|
| | * | clone function description added | Felipe Lopez Toledo | 2009-09-04 | 1 | -4/+5 |
|
|
| | * | KLayer modified, added | Felipe Lopez Toledo | 2009-09-04 | 4 | -18/+130 |
|
|
| * | | adding timer functions to adding_up | root | 2009-09-04 | 3 | -45/+54 |
| |/ |
|
| * | added score to adding up | root | 2009-09-04 | 8 | -40/+37 |
|
|
* | | worked on stage 3 which looks quite a bit better now, also started cleaning u... | christophd@sugarlabs.org | 2009-09-04 | 4 | -382/+107 |
|
|
* | | slight improvements on the stage 3 layout, some bugs still remain | christophd@sugarlabs.org | 2009-09-04 | 2 | -6/+7 |
|/ |
|
* | fixed summing error accidentally added by me in addding_up | root | 2009-09-04 | 29 | -12/+9 |
|
|
* | Merge branch 'multicanvas' of gitorious@git.sugarlabs.org:karma/mainline into... | Felipe Lopez Toledo | 2009-09-04 | 86 | -0/+12716 |
|\ |
|
| * | deleted experiments directory | root | 2009-09-04 | 86 | -0/+12716 |
|
|
| * | Merge branch 'felipe' of gitorious@git.sugarlabs.org:karma/mainline into mult... | root | 2009-09-04 | 2 | -27/+3 |
| |\ |
|
* | \ | Merge branch 'master' of gitorious@git.sugarlabs.org:karma/mainline into mult... | Felipe Lopez Toledo | 2009-09-04 | 2 | -27/+3 |
|\ \ \
| | |/
| |/| |
|
| * | | default week and lesson tabs now load automatically (after deleting a javascr... | christophd@sugarlabs.org | 2009-09-03 | 2 | -27/+3 |
|
|
* | | | adding up multicanvasas "correct/incorrect" bug fixed | Felipe Lopez Toledo | 2009-09-04 | 2 | -32/+32 |
| |/
|/| |
|
* | | got rid back up files created by emacs, changed lesson1.js to lesson.js | root | 2009-09-03 | 9 | -636/+132 |
|
|
* | | adding up to 10 now kind of works w/ new layout | root | 2009-09-03 | 1 | -19/+24 |
|
|
* | | can now draw on all 5 boxes using karma plugin. However, using the distance2 ... | root | 2009-09-03 | 8 | -118/+469 |
|
|
* | | working on an example | root | 2009-09-03 | 30 | -0/+11325 |
|
|
* | | cleaned out extraneous files, such as old versions of karma plugin | root | 2009-09-03 | 188 | -14981/+3733 |
|/ |
|
* | made small changes to jquery.karma-0.5.js to help working with jsdoc. I added... | root | 2009-09-03 | 1 | -97/+52 |
|
|
* | got rid of example adding_up_to_10_old as it was redundant | root | 2009-09-03 | 68 | -9871/+1090 |
|
|
* | multiple canvases support started | Felipe Lopez Toledo | 2009-09-02 | 5 | -4/+1085 |
|
|
* | added previously forgotten b/w images, continued work on stage 3 | christophd@sugarlabs.org | 2009-09-02 | 7 | -23/+20 |
|
|
* | added black/white versions of images, renamed subject images from <random_num... | christophd@sugarlabs.org | 2009-09-02 | 15 | -14/+15 |
|
|
* | modified Chakra according to feedback from 2009-09-02 OLE Nepal meeting (e.g.... | christophd@sugarlabs.org | 2009-09-02 | 5 | -12/+310 |
|
|