Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.sugarlabs.org/rp/mainline into mainlineHEADmasterChristian Mayer2010-05-176-368/+252
|\
| * Collation.data -> gitignoreWalther Neuper2010-05-171-1/+2
| * Collation.data -> gitignoreWalther Neuper2010-05-172-890/+1
| * Merge branch 'wintersw'Walther Neuper2010-05-175-124/+896
| |\
| | * 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-272-4/+80
| | * 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 'master' of git://git.sugarlabs.org/rp/mainline into mainlineChristian Mayer2010-05-1624-1029/+1327
|\ \ \ | |/ /
| * | merge branch winterswWalther Neuper2010-05-1424-1029/+1327
* | | Merge branch 'master' of git://git.sugarlabs.org/rp/mainline into mainlineChristian Mayer2010-05-1410-23/+205
|\ \ \ | |/ /
| * | Merge branch 'master' of git://git.sugarlabs.org/rp/mainline into holzmannWalther Neuper2010-01-206-10/+95
| |\ \
| | * | write generated calcs to file and to journalWalther Neuper2010-01-206-10/+95
| * | | error handling without journalWalther Neuper2010-01-206-13/+110
| |/ /
* | | Merge branch 'master' of git://git.sugarlabs.org/rp/mainlineChristian Mayer2010-01-2013-109/+839
|\ \ \ | |/ /
| * | 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-1112-111/+741
| * | Merge branch 'master' of git://git.sugarlabs.org/rp/mifixs-cloneWalther Neuper2010-01-113-17/+77
| |\ \
* | \ \ Merge branch 'master' of git://git.sugarlabs.org/rp/mainlineChristian Mayer2010-01-116-12/+22
|\ \ \ \ | |/ / /
| * | | Merge branch 'mayer'Walther Neuper2010-01-1115-191/+241
| |\ \ \
| | * | | 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-112-2/+3
| | * | | 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-113-6/+12
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | before git checkout mayerWalther Neuper2010-01-111-0/+1
| |/ / /
| * | | cleanupsWalther Neuper2010-01-102-6/+11
| | |/ | |/|
* | | protocol generated calculationsChristian Mayer2010-01-113-17/+77
| |/ |/|
* | Merge branch 'master' of git://git.sugarlabs.org/rp/mainlineChristian Mayer2010-01-094-132/+135
|\ \ | |/
| * LV.7.Jan.10Walther Neuper2010-01-074-132/+135
[next]
generated by cgit v0.9.1 at 2024-05-02 06:50:50 (GMT)