Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* WIP for Engine with Resourcestotal_mergemike2009-11-175-18/+122
* Merge branch 'master' of ../mainline into total_mergemike2009-11-161-0/+15
|\
| * Merge branch 'master' of git://git.sugarlabs.org/tutorius/mainlinemike2009-11-161-0/+15
| |\
| | * Added a first implementation of a Future in dbustools, using the gtk mainloop...erick2009-11-161-0/+15
* | | Merge branch 'master' of ../mainline into total_mergemike2009-11-164-162/+133
|\ \ \ | |/ /
| * | Merge branch 'master' of git://git.sugarlabs.org/tutorius/mainlinemike2009-11-169-289/+610
| |\ \ | | |/
| | * creator adt migrationSimon Poirier2009-11-152-161/+131
| | * Added **kwargs to the do() for MockAddon used in probetests to follow to catc...erick2009-11-151-1/+1
| | * Removed @catch_unimplemented annotation for storetests now that the store is ...erick2009-11-151-12/+0
| | * Now skipping coretestserick2009-11-151-0/+1
| * | Merge branch 'master' of git://git.sugarlabs.org/tutorius/mainlinemike2009-11-1321-26/+470
| |\ \
* | | | Updating Engine, Vault and Tutorial to associate names with actionsmike2009-11-167-707/+100
* | | | Repairing ProbeManager interfacemike2009-11-153-21/+16
* | | | Merge branch 'engineADT' of ../mainline into total_mergemike2009-11-155-19/+87
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' of git://git.sugarlabs.org/tutorius/mainline into engin...erick2009-11-151-0/+1
| |\ \ \ | | | |/ | | |/|
| | * | Modified the tutorial parse function to also return the tutorial idBen Tremblay2009-11-121-0/+1
| * | | Added tests for the engine, added automatic transition supporterick2009-11-152-18/+84
| * | | Merge branch 'engine_tutorial_ADT_migration' into engineADTerick2009-11-122-2/+1
| |\ \ \
| | * | | Removed comment and fixed parameter docerick2009-11-122-2/+1
| * | | | add the engine test base skelettonVincent Vinet2009-11-121-0/+80
| * | | | Merge branch 'engine_tutorial_ADT_migration' of gitorious@git.sugarlabs.org:t...Vincent Vinet2009-11-110-0/+0
| |\ \ \ \ | | |/ / /
* | | | | ResourceTranslator : WIP (this code does not work)mike2009-11-143-15/+23
* | | | | Fixing tests (removing @catch_unimplemented, fixing paths, merging engine tests)mike2009-11-143-24/+59
* | | | | Merge branch 'engineADT' of ../mainlinemike2009-11-1222-72/+471
|\ \ \ \ \ | |/ / / /
| * | | | make the engine run adt tutorialsVincent Vinet2009-11-102-11/+102
| * | | | Fixed probe testserick2009-11-092-88/+86
| * | | | Changed the path name of probes on dbus to make them unique per activity, mad...erick2009-11-092-33/+56
| * | | | Making probe registration asynchronouserick2009-11-091-2/+2
| * | | | Added a ProbeManager to the service and added a minimal but working automatic...erick2009-11-092-8/+113
| | |/ / | |/| |
| * | | Merge branch 'master' of gitorious@git.sugarlabs.org:tutorius/BenTremblay-Dev...Ben Tremblay2009-11-062-10/+15
| |\ \ \
| | * | | minor fix to publish functionBen Tremblay2009-11-061-11/+1
| | * | | removed api binary filesBen Tremblay2009-11-065-0/+0
| | * | | publish now returns an id and tests updatedBen Tremblay2009-11-062-3/+10
| | |\ \ \
| | | * | | final version of the StoreProxy and its testsben2009-11-022-28/+35
| | | * | | StoreProxy ready for reviewben2009-10-308-42/+85
| | | * | | Changed to the store and added the api libraryBenoit Tremblay2009-10-2920-41/+3070
| | * | | | publish now returns the newly published tutorial idBen Tremblay2009-11-052-7/+15
| * | | | | removed api binary filesBen Tremblay2009-11-065-0/+0
| * | | | | Merge dave's commitsVincent Vinet2009-11-0511-11/+311
| * | | | | Added code review modifications to Valut ressource managing.JCTutorius2009-11-052-9/+15
| * | | | | Merge branch 'master' of gitorious@git.sugarlabs.org:tutorius/mainlineJCTutorius2009-11-053-329/+348
| |\ \ \ \ \
* | | | | | | Fixing import for some filesmike2009-11-122-5/+5
* | | | | | | Merge branch 'lp435984' of ../mainlineHEADmastermike2009-11-097-8/+1639
|\ \ \ \ \ \ \
| * | | | | | | apply code review induced fixes, fix a few discovered bugs, enjoy, rinse and ...Vincent Vinet2009-10-1912-113/+161
| * | | | | | | fix the bundle fix, duhVincent Vinet2009-10-181-2/+2
| * | | | | | | push of the bundle fix I used for the last weeksVincent Vinet2009-10-181-23/+38
| * | | | | | | Big commit! Everything to make Tutorial execution work through dbus.Vincent Vinet2009-10-1514-193/+873
| * | | | | | | add the readfile action, hack the constraints to make it workVincent Vinet2009-10-142-1/+59
* | | | | | | | Merge branch 'engine_tutorial_ADT_migration' of ../mainlinemike2009-11-083-104/+230
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Fixed probe testserick2009-11-062-88/+86