Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/ReckonPrimer.activity
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.sugarlabs.org/rp/mainline into mainlineHEADmasterChristian Mayer2010-05-174-368/+178
|\
| * Collation.data -> gitignoreWalther Neuper2010-05-171-890/+0
| * Merge branch 'wintersw'Walther Neuper2010-05-174-124/+824
| |\
| | * exstore: PraxisVS partially, OK (in contrary to previous commit)Walther Neuper2010-05-142-18/+18
| | * exstore: PraxisVS partiallyWalther Neuper2010-05-142-255/+657
| | * exstore: templates partiallyWalther Neuper2010-05-142-224/+302
| | * display adapted to calcs with 5 lines; finished with calculation_boxWalther Neuper2010-05-141-2/+3
| | * display adapted to calcs with 5 lines; all relevant tables except calculation...Walther Neuper2010-05-141-27/+19
| | * removed settings.py, all initiated in exstore.pyWalther Neuper2010-05-132-140/+2
| | * extimesdiv replaced with new version; works, if no remainder with :, inWalther Neuper2010-05-133-162/+292
| | * all old exercises work: calc+settingsWalther Neuper2010-05-132-10/+25
| | * activated exaddsimp, expassten; the latter doesnt show settingsWalther Neuper2010-05-134-134/+157
| | * restored original-winters extimesdiv and settings, worksWalther Neuper2010-05-132-249/+130
| | * DOES NOT WORK: saved bevor CH cameWalther Neuper2010-04-063-130/+280
| | * new Display: exercise_table with butts, feedback_table smaller aboveWalther Neuper2010-02-051-11/+36
| | * problem with sugar.activity.widgets, sugar.graphics just outcommentedWalther Neuper2010-02-041-2/+2
| | * all of Winterstellers new workWalther Neuper2010-02-0429-829/+1570
| | * nach ende der sessionWalther Neuper2010-02-041-8/+8
| | * new: functions.ins_ordWalther Neuper2010-02-031-0/+31
| | * nach dem Abgang von Hr.NeppelWalther Neuper2010-01-271-4/+8
| | * NEPPEL: found flaw in make_input_remainderWalther Neuper2010-01-183-19/+21
| | * NEPPEL calcs OKWalther Neuper2010-01-182-116/+177
| | * session NEPPEL: new settings, sys worksWalther Neuper2010-01-181-0/+2
* | | switch Learner/AuthorChristian Mayer2010-05-174-164/+93
|/ /
* | merge branch winterswWalther Neuper2010-05-1424-1029/+1327
* | Merge branch 'master' of git://git.sugarlabs.org/rp/mainline into holzmannWalther Neuper2010-01-205-10/+94
|\ \
| * | write generated calcs to file and to journalWalther Neuper2010-01-205-10/+94
* | | error handling without journalWalther Neuper2010-01-206-13/+110
|/ /
* | before manual merge with Groebl/RuttingerWalther Neuper2010-01-201-1/+1
* | comments for W.WinterstellerWalther Neuper2010-01-126-10/+167
* | exstore --> pickle, exstore_table oldWalther Neuper2010-01-124-235/+179
* | forgot to store exstore just beforeWalther Neuper2010-01-111-6/+5
* | inserted treeview, but old version runsWalther Neuper2010-01-119-111/+741
* | Merge branch 'master' of git://git.sugarlabs.org/rp/mifixs-cloneWalther Neuper2010-01-113-17/+77
|\ \
| * | protocol generated calculationsChristian Mayer2010-01-113-17/+77
* | | Merge branch 'mayer'Walther Neuper2010-01-1114-191/+240
|\ \ \
| * | | case sensitiv filenamesWalther Neuper2010-01-112-3/+6
| * | | disable toolbar (pre 0.86)Walther Neuper2010-01-112-7/+13
| * | | You have local changes; cannot switch branchesWalther Neuper2010-01-111-2/+2
| * | | Merge branch 'master' of git://git.sugarlabs.org/rp/mifixs-clone into mayerWalther Neuper2010-01-1014-189/+229
| |\ \ \ | | |/ /
| | * | Merge branch 'master' of git://git.sugarlabs.org/rp/mainlineChristian Mayer2010-01-094-132/+135
| | |\ \ | | | |/
| | * | * moved exercises into subfolderChristian Mayer2010-01-079-130/+142
| | * | moved Coach#notify('setting-done') into separate methodChristian Mayer2010-01-062-11/+5
| | * | moved Coach#notify('switch-to-setts') into separate methodChristian Mayer2010-01-062-4/+5
| | * | * moved Learner#notify('digit-done') into separate methodChristian Mayer2010-01-062-27/+19
| | * | moved Learner#notify('start-calcs') into separate methodChristian Mayer2010-01-062-12/+11
| | * | moved Coach#notif('exerc-selected') into separate methodChristian Mayer2010-01-062-5/+5
| | * | Built simple ToolbarChristian Mayer2010-01-062-4/+46
* | | | before git checkout mayerWalther Neuper2010-01-111-0/+1
|/ / /
* | | cleanupsWalther Neuper2010-01-102-6/+11
| |/ |/|